Merge remote-tracking branch 'origin/develop' into develop

Dockerfile

@@ -11,6 +11,7 @@ RUN npm run build
 # nginx
 FROM nginx:alpine as production
 VOLUME ["/var/log/nginx/"]
+RUN ln -sf /usr/share/zoneinfo/Asia/Shanghai /etc/localtime && echo 'Asia/Shanghai' >/etc/timezone
 ENV NODE_ENV production
 # Set working directory to nginx asset directory
 COPY --from=builder /app/dist /usr/share/nginx/html

kustomization/base/deployment.yaml

@@ -4,7 +4,7 @@ metadata:
   name: admin-deployment
   namespace: default
 spec:
-  #  minReadySeconds: 120
+  minReadySeconds: 5
   revisionHistoryLimit: 2
   replicas: 1
   selector:
@@ -21,9 +21,6 @@ spec:
           volumeMounts:
             - name: log-of-nginx
               mountPath: /var/log/nginx
-            - name: localtime
-              mountPath: /etc/localtime
-              readOnly: true
           resources:
             limits:
               memory: 512Mi
@@ -34,6 +31,3 @@ spec:
         - name: log-of-nginx
           hostPath:
             path: /var/log/nginx
-        - name: localtime
-          hostPath:
-            path: /etc/localtime

kustomization/overlays/dev/kustomization.yaml

@@ -14,4 +14,4 @@ patches:
 images:
 - name: REGISTRY/NAMESPACE/IMAGE:TAG
   newName: mmc-registry.cn-shenzhen.cr.aliyuncs.com/sharefly-dev/admin
-  newTag: 8cd9b0f5e4c0883b49c9e7e975f02a5c302878b0
+  newTag: b288cd44e454bacbf5e49016c84b791ba1d7f086