refacgtor: enhance docker build

README.md

@@ -48,7 +48,7 @@ bash shells/build.sh
 ### docker pattern
 
 ```bash
-bash shells/build.sh && docker build --no-cache -t <app-name>:<tag>
+docker build --no-cache -t <app-name>:<tag> .
 ```
 
 > find generated image via `docker image ls`

generators/app/templates/Dockerfile

@@ -1,8 +1,16 @@
+FROM node:13 AS compile-env
+
+WORKDIR /src
+
+COPY . /src
+
+RUN apt-get update -y && apt-get install zip && bash ./shells/build.sh
+
 FROM node:13-alpine
 
-COPY *-zip-dist/ /usr/src/app/
+WORKDIR /application
 
-WORKDIR /usr/src/app
+COPY --from=compile-env /src/*-zip-dist /application
 
 EXPOSE 3000
 

generators/app/templates/README.md

@@ -14,8 +14,14 @@ yarn
 yarn start
 ```
 
-## Packaging
+## Packaging in .zip
 
 ```bash
 bash shells/build.sh
 ```
+
+## Packaging in docker image
+
+```bash
+docker build --no-cache -t <app-name>:<tag> .
+```

generators/app/templates/dockerignore

@@ -2,4 +2,6 @@
 node_modules/
 
 # dist
-dist/
+dist/
+*-zip-dist/
+*.zip

generators/app/templates/shells/build.sh

@@ -22,7 +22,7 @@ mkdir ./${output}/bin
 
 rm -rf package-lock.json
 
-yarn
+yarn --registry <%= answers.registry %>
 
 if [ $? -ne 0 ]; then
   echo "Failed to install first depenedencies"
@@ -68,7 +68,7 @@ fi
 cd ./${output}
 
 # 安装运行时依赖
-npm i express replace-in-file --registry=https://registry.npm.taobao.org
+npm i express replace-in-file --registry=<%= answers.registry %>
 
 if [ $? -ne 0 ]; then
     echo "Install runtime dependencies failed, check network first!"

package.json

@@ -1,6 +1,6 @@
 {
   "name": "generator-umi",
-  "version": "3.1.0",
+  "version": "3.1.1",
   "description": "umi project generator",
   "files": [
     "generators"