@xfe-repo/web-app 1.3.1 → 1.3.3

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (2) hide show
  1. package/deploy/.drone.yml +29 -27
  2. package/package.json +3 -3
package/deploy/.drone.yml CHANGED
@@ -27,8 +27,8 @@ steps:
27
27
  image: xhj-prod-registry-vpc.cn-hangzhou.cr.aliyuncs.com/xhj-image-common/node-base:20.17.0-pnpm
28
28
  resources:
29
29
  limits:
30
- cpu: 2000
31
- memory: 4000MiB
30
+ cpu: 4000
31
+ memory: 8000MiB
32
32
  volumes:
33
33
  - name: node-modules
34
34
  path: /drone/src/node_modules
@@ -38,25 +38,21 @@ steps:
38
38
  - echo -n "$REACT_APP_RELEASE" > deploy/static/release
39
39
  - pnpm build
40
40
 
41
- - name: docker-build
42
- image: xhj-prod-registry-vpc.cn-hangzhou.cr.aliyuncs.com/xhj-image/deploy-cli-docker
43
- privileged: true
44
- environment:
45
- SSH_KEY:
46
- from_secret: ssh-key
47
- DOCKER_KEY:
48
- from_secret: docker-key
49
- DEPLOY_GO_CONFIG:
50
- from_secret: deploy-go-config
51
- commands:
52
- - /usr/local/bin/dockerd-entrypoint.sh 2>&1 >> /dev/null &
53
- - sleep 5
54
- - sh /data/scripts/builderInit.sh
55
- - appName="`echo ${DRONE_REPO//\//-}`"
56
- - sed -i "s/<<APP_NAME>>/$appName/g" deploy/helm/values.yaml
57
- - docker build -f deploy/Dockerfile -t xhj-prod-registry-vpc.cn-hangzhou.cr.aliyuncs.com/xhj-image/$$appName:$$CI_COMMIT_SHA . --no-cache
58
- - docker push xhj-prod-registry-vpc.cn-hangzhou.cr.aliyuncs.com/xhj-image/$$appName:$$CI_COMMIT_SHA
59
- - docker rmi xhj-prod-registry-vpc.cn-hangzhou.cr.aliyuncs.com/xhj-image/$$appName:$$CI_COMMIT_SHA
41
+ - name: image-build
42
+ image: xhj-prod-registry-vpc.cn-hangzhou.cr.aliyuncs.com/image-common/kaniko:latest
43
+ pull: always
44
+ settings:
45
+ registry: xhj-prod-registry-vpc.cn-hangzhou.cr.aliyuncs.com
46
+ username:
47
+ from_secret: username
48
+ password:
49
+ from_secret: password
50
+ dockerfile: deploy/Dockerfile
51
+ repo_path: xhj-prod-registry-vpc.cn-hangzhou.cr.aliyuncs.com/xhj-image/
52
+ repo_name: ${DRONE_REPO}
53
+ tags:
54
+ - ${CI_COMMIT_SHA}
55
+ - latest
60
56
 
61
57
  - name: pre-deploy
62
58
  image: xhj-prod-registry-vpc.cn-hangzhou.cr.aliyuncs.com/xhj-image-common/deploy-helm:latest
@@ -165,13 +161,19 @@ get:
165
161
  name: config
166
162
  ---
167
163
  kind: secret
168
- name: ssh-key
169
- get:
170
- path: deployer-ssh-key
171
- name: id_rsa
172
- ---
173
- kind: secret
174
164
  name: docker-key
175
165
  get:
176
166
  path: docker-key
177
167
  name: config
168
+ ---
169
+ kind: secret
170
+ name: username
171
+ get:
172
+ path: docker-auth
173
+ name: username
174
+ ---
175
+ kind: secret
176
+ name: password
177
+ get:
178
+ path: docker-auth
179
+ name: password
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@xfe-repo/web-app",
3
- "version": "1.3.1",
3
+ "version": "1.3.3",
4
4
  "bin": {
5
5
  "xfe-web": "./bin/index.js"
6
6
  },
@@ -78,8 +78,8 @@
78
78
  "webpack-manifest-plugin": "^4.0.2",
79
79
  "workbox-webpack-plugin": "^7.0.0",
80
80
  "yaml": "^2.3.4",
81
- "@xfe-repo/typescript-config": "0.0.6",
82
- "@xfe-repo/eslint-config": "0.0.5"
81
+ "@xfe-repo/eslint-config": "0.0.5",
82
+ "@xfe-repo/typescript-config": "0.0.6"
83
83
  },
84
84
  "peerDependencies": {
85
85
  "react": "18.2.0",