Browse Source

add preview use docker (#2890)

陈帅 7 years atrás
parent
commit
8d57acc886
5 changed files with 33 additions and 10 deletions
  1. 0 1
      .dockerignore
  2. 11 0
      Dockerfile.hub
  3. 9 4
      README.md
  4. 8 3
      README.zh-CN.md
  5. 5 2
      package.json

+ 0 - 1
.dockerignore

@@ -5,7 +5,6 @@
 /src/utils/request-temp.js
 
 # production
-/dist
 /.vscode
 
 # misc

+ 11 - 0
Dockerfile.hub

@@ -0,0 +1,11 @@
+FROM nginx
+
+WORKDIR /usr/src/app/
+
+COPY ./docker/nginx.conf /etc/nginx/conf.d/default.conf
+
+COPY ./dist  /usr/share/nginx/html/
+
+EXPOSE 80
+
+CMD ["nginx", "-g", "daemon off;"]

+ 9 - 4
README.md

@@ -93,17 +93,22 @@ $ npm start         # visit http://localhost:8000
 ### Use by docker
 
 ```bash
-// dev 
+# preview 
+$ docker pull chenshuai2144/ant-design-pro
+$ docker run -p 80:80 chenshuai2144/ant-design-pro
+# open http://localhost
+
+# dev 
 $ npm run docker:dev
 
-// build 
+# build 
 $ npm run docker:build
 
 
-// production dev 
+# production dev 
 $ npm run docker-prod:dev
 
-// production build 
+# production build 
 $ npm run docker-prod:build
 ```
 

+ 8 - 3
README.zh-CN.md

@@ -83,14 +83,19 @@ $ npm start         # 访问 http://localhost:8000
 ### 使用 docker
 
 ```bash
-// dev 
+# preview 
+$ docker pull chenshuai2144/ant-design-pro
+$ docker run -p 80:80 chenshuai2144/ant-design-pro
+# open http://localhost
+
+# dev 
 $ npm run docker:dev
 
-// build 
+# build 
 $ npm run docker:build
 
 
-// production dev 
+# production dev 
 $ npm run docker-prod:dev
 
 // production build 

+ 5 - 2
package.json

@@ -8,7 +8,7 @@
     "start": "cross-env APP_TYPE=site umi dev",
     "start:no-mock": "cross-env MOCK=none umi dev",
     "build": "umi build",
-    "site": "npm run presite && cross-env APP_TYPE=site npm run build && firebase deploy",
+    "site": "npm run presite && cross-env APP_TYPE=site npm run build && firebase deploy && npm run docker:push",
     "analyze": "cross-env ANALYZE=1 umi build",
     "lint:style": "stylelint \"src/**/*.less\" --syntax less",
     "lint": "eslint --ext .js src mock tests && npm run lint:style",
@@ -24,7 +24,10 @@
     "docker:dev": "docker-compose -f ./docker/docker-compose.dev.yml up",
     "docker:build": "docker-compose -f ./docker/docker-compose.dev.yml build",
     "docker-prod:dev": "docker-compose -f ./docker/docker-compose.yml up",
-    "docker-prod:build": "docker-compose -f ./docker/docker-compose.yml build"
+    "docker-prod:build": "docker-compose -f ./docker/docker-compose.yml build",
+    "docker-hub:build":"docker build  -f Dockerfile.hub -t  ant-design-pro ./",
+    "docker:tag":"docker tag ant-design-pro chenshuai2144/ant-design-pro",
+    "docker:push":"npm run docker-hub:build && npm run docker:tag && docker push chenshuai2144/ant-design-pro"
   },
   "dependencies": {
     "@babel/runtime": "^7.1.5",