@xfe-repo/web-app 1.3.0 → 1.3.2

package/deploy/.drone.yml

@@ -38,25 +38,21 @@ steps:
       - echo -n "$REACT_APP_RELEASE" > deploy/static/release
       - pnpm build
 
-  - name: docker-build
-    image: xhj-prod-registry-vpc.cn-hangzhou.cr.aliyuncs.com/xhj-image/deploy-cli-docker
-    privileged: true
-    environment:
-      SSH_KEY:
-        from_secret: ssh-key
-      DOCKER_KEY:
-        from_secret: docker-key
-      DEPLOY_GO_CONFIG:
-        from_secret: deploy-go-config
-    commands:
-      - /usr/local/bin/dockerd-entrypoint.sh 2>&1 >> /dev/null &
-      - sleep 5
-      - sh /data/scripts/builderInit.sh
-      - appName="`echo ${DRONE_REPO//\//-}`"
-      - sed -i "s/<<APP_NAME>>/$appName/g" deploy/helm/values.yaml
-      - docker build -f deploy/Dockerfile -t xhj-prod-registry-vpc.cn-hangzhou.cr.aliyuncs.com/xhj-image/$$appName:$$CI_COMMIT_SHA . --no-cache
-      - docker push xhj-prod-registry-vpc.cn-hangzhou.cr.aliyuncs.com/xhj-image/$$appName:$$CI_COMMIT_SHA
-      - docker rmi xhj-prod-registry-vpc.cn-hangzhou.cr.aliyuncs.com/xhj-image/$$appName:$$CI_COMMIT_SHA
+  - name: image-build
+    image: xhj-prod-registry-vpc.cn-hangzhou.cr.aliyuncs.com/image-common/kaniko:latest
+    pull: always
+    settings:
+      registry: xhj-prod-registry-vpc.cn-hangzhou.cr.aliyuncs.com
+      username:
+        from_secret: username
+      password:
+        from_secret: password
+      dockerfile: deploy/Dockerfile
+      repo_path: xhj-prod-registry-vpc.cn-hangzhou.cr.aliyuncs.com/xhj-image/
+      repo_name: ${DRONE_REPO}
+      tags:
+        - ${CI_COMMIT_SHA}
+        - latest
 
   - name: pre-deploy
     image: xhj-prod-registry-vpc.cn-hangzhou.cr.aliyuncs.com/xhj-image-common/deploy-helm:latest
@@ -79,17 +75,17 @@ steps:
   - name: deploy-to-test
     image: xhj-prod-registry-vpc.cn-hangzhou.cr.aliyuncs.com/xhj-image-common/deploy-helm:latest
     commands:
+      - export KUBECONFIG=$PWD/kube_config
       - cp deploy/helm/values.yaml deploy/helm/values.test.yaml
       - sed -i "s/<<ENV_TYPE>>/test/g" deploy/helm/values.test.yaml
       - sed -i "s/<<APP_SUFFIX>>/-$HOST_PREFIX/g" deploy/helm/values.test.yaml
       - sed -i "s/<<HOST_PREFIX>>/$HOST_PREFIX/g" deploy/helm/values.test.yaml
-      - sed -i "s/deployment/$appName-$HOST_PREFIX/g" deploy/helm/Chart.yaml
+      - appName="`echo ${DRONE_REPO//\//-}`"
+      - chartName="$appName-$HOST_PREFIX"
+      - echo "$chartName"
+      - sed -i "s/deployment/$chartName/g" deploy/helm/Chart.yaml
       - sed -i "s/1.0.0/0.0.0-$CI_COMMIT_SHA/g" deploy/helm/Chart.yaml
-      - helm upgrade --install "$appName-$HOST_PREFIX" deploy/helm/ \
-          -f deploy/helm/values.test.yaml  \
-          --namespace deployment-test \
-          --create-namespace \
-          --history-max 5 \
+      - helm upgrade --install "$chartName" deploy/helm -f deploy/helm/values.test.yaml --namespace deployment-test --create-namespace --history-max 5
     when:
       event:
         - custom
@@ -165,13 +161,19 @@ get:
   name: config
 ---
 kind: secret
-name: ssh-key
-get:
-  path: deployer-ssh-key
-  name: id_rsa
----
-kind: secret
 name: docker-key
 get:
   path: docker-key
   name: config
+---
+kind: secret
+name: username
+get:
+  path: docker-auth
+  name: username
+---
+kind: secret
+name: password
+get:
+  path: docker-auth
+  name: password

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@xfe-repo/web-app",
-  "version": "1.3.0",
+  "version": "1.3.2",
   "bin": {
     "xfe-web": "./bin/index.js"
   },