@catladder/pipeline 1.123.1 → 1.124.1

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 (40) hide show
  1. package/dist/build/custom/buildJob.js +1 -1
  2. package/dist/build/docker.d.ts +26 -6
  3. package/dist/build/docker.js +53 -8
  4. package/dist/build/node/buildJob.js +1 -1
  5. package/dist/build/node/meteor.js +1 -1
  6. package/dist/build/rails/build.js +12 -3
  7. package/dist/bundles/catladder-gitlab/index.js +3 -3
  8. package/dist/constants.js +1 -1
  9. package/dist/deploy/cloudRun/artifactsRegistry.d.ts +7 -4
  10. package/dist/deploy/cloudRun/artifactsRegistry.js +30 -23
  11. package/dist/deploy/cloudRun/deployJob.js +1 -1
  12. package/dist/deploy/dockerTag/deployJob.js +32 -1
  13. package/dist/tsconfig.tsbuildinfo +1 -1
  14. package/examples/__snapshots__/cloud-run-memory-limit.ts.snap +72 -76
  15. package/examples/__snapshots__/cloud-run-no-cpu-throttling.ts.snap +72 -76
  16. package/examples/__snapshots__/cloud-run-non-public.ts.snap +72 -76
  17. package/examples/__snapshots__/cloud-run-with-sql-reuse-db.ts.snap +144 -152
  18. package/examples/__snapshots__/cloud-run-with-sql.ts.snap +144 -152
  19. package/examples/__snapshots__/custom-build-job-with-tests.ts.snap +72 -76
  20. package/examples/__snapshots__/custom-build-job.ts.snap +72 -76
  21. package/examples/__snapshots__/custom-deploy.ts.snap +40 -28
  22. package/examples/__snapshots__/custom-sbom-java.ts.snap +72 -76
  23. package/examples/__snapshots__/kubernetes-application-customization.ts.snap +40 -28
  24. package/examples/__snapshots__/kubernetes-with-cloud-sql-legacy.ts.snap +40 -28
  25. package/examples/__snapshots__/kubernetes-with-cloud-sql.ts.snap +40 -28
  26. package/examples/__snapshots__/kubernetes-with-jobs.ts.snap +80 -56
  27. package/examples/__snapshots__/kubernetes-with-mongodb.ts.snap +40 -28
  28. package/examples/__snapshots__/meteor-kubernetes.ts.snap +40 -28
  29. package/examples/__snapshots__/native-app.ts.snap +72 -76
  30. package/examples/__snapshots__/node-build-with-custom-image.ts.snap +72 -76
  31. package/examples/__snapshots__/rails-k8s-with-worker.ts.snap +56 -52
  32. package/package.json +1 -1
  33. package/src/build/custom/buildJob.ts +1 -0
  34. package/src/build/docker.ts +56 -16
  35. package/src/build/node/buildJob.ts +1 -0
  36. package/src/build/node/meteor.ts +1 -1
  37. package/src/build/rails/build.ts +2 -2
  38. package/src/deploy/cloudRun/artifactsRegistry.ts +35 -32
  39. package/src/deploy/cloudRun/deployJob.ts +1 -8
  40. package/src/deploy/dockerTag/deployJob.ts +1 -1
package/examples/__snapshots__/native-app.ts.snap CHANGED
@@ -158,12 +158,20 @@ exports[`matches snapshot 1`] = `
158
158
  },
159
159
  "script": [
160
160
  "ensureNodeDockerfile",
161
- "docker login --username gitlab-ci-token --password $CI_JOB_TOKEN $CI_REGISTRY",
162
- "docker version",
161
+ "echo -e "\\e[0Ksection_start:$(date +%s):docker-login[collapsed=true]\\r\\e[0KDocker Login"",
162
+ "echo $CL_dev_api_GCLOUD_DEPLOY_credentialsKey > ./____keyfile.json
163
+ ",
164
+ "gcloud auth activate-service-account --key-file="./____keyfile.json"",
165
+ "gcloud auth configure-docker asia-east1-docker.pkg.dev",
166
+ "echo -e "\\e[0Ksection_end:$(date +%s):docker-login\\r\\e[0K"",
167
+ "echo -e "\\e[0Ksection_start:$(date +%s):docker-build[collapsed=true]\\r\\e[0KDocker build"",
163
168
  "docker build --network host --cache-from $DOCKER_CACHE_IMAGE --tag $DOCKER_IMAGE:$DOCKER_IMAGE_TAG -f $APP_DIR/Dockerfile . --build-arg BUILDKIT_INLINE_CACHE=1",
169
+ "echo -e "\\e[0Ksection_end:$(date +%s):docker-build\\r\\e[0K"",
170
+ "echo -e "\\e[0Ksection_start:$(date +%s):docker-push[collapsed=true]\\r\\e[0KDocker push and tag"",
164
171
  "docker push $DOCKER_IMAGE:$DOCKER_IMAGE_TAG",
165
172
  "docker tag $DOCKER_IMAGE:$DOCKER_IMAGE_TAG $DOCKER_CACHE_IMAGE",
166
173
  "docker push $DOCKER_CACHE_IMAGE",
174
+ "echo -e "\\e[0Ksection_end:$(date +%s):docker-push\\r\\e[0K"",
167
175
  ],
168
176
  "services": [
169
177
  {
@@ -179,7 +187,7 @@ exports[`matches snapshot 1`] = `
179
187
  "DOCKERFILE_ADDITIONS": undefined,
180
188
  "DOCKERFILE_ADDITIONS_END": undefined,
181
189
  "DOCKER_BUILDKIT": "1",
182
- "DOCKER_CACHE_IMAGE": "$DOCKER_REGISTRY_IMAGE_PATH/caches/api",
190
+ "DOCKER_CACHE_IMAGE": "asia-east1-docker.pkg.dev/asdf/catladder-deploy/pan-test-app/caches/api",
183
191
  "DOCKER_COPY_AND_INSTALL_APP": "COPY --chown=node:node $APP_DIR .
184
192
  RUN yarn plugin import workspace-tools
185
193
  RUN yarn workspaces focus --production && yarn rebuild",
@@ -190,11 +198,9 @@ COPY --chown=node:node .yarn /app/.yarn",
190
198
  "DOCKER_DIR": ".",
191
199
  "DOCKER_DRIVER": "overlay2",
192
200
  "DOCKER_HOST": "tcp://0.0.0.0:2375",
193
- "DOCKER_IMAGE": "$DOCKER_REGISTRY_IMAGE_PATH/$DOCKER_IMAGE_NAME",
194
- "DOCKER_IMAGE_NAME": "dev/api",
201
+ "DOCKER_IMAGE": "asia-east1-docker.pkg.dev/asdf/catladder-deploy/pan-test-app/dev/api",
195
202
  "DOCKER_IMAGE_TAG": "$CI_COMMIT_SHA",
196
- "DOCKER_REGISTRY": "$CI_REGISTRY",
197
- "DOCKER_REGISTRY_IMAGE_PATH": "$CI_REGISTRY_IMAGE",
203
+ "DOCKER_REGISTRY": "asia-east1-docker.pkg.dev",
198
204
  "DOCKER_TLS_CERTDIR": "",
199
205
  "KUBERNETES_CPU_LIMIT": "1",
200
206
  "KUBERNETES_CPU_REQUEST": "0.5",
@@ -263,13 +269,6 @@ COPY --chown=node:node .yarn /app/.yarn",
263
269
  "export GCLOUD_PROJECT_NUMBER=$(gcloud projects describe asdf --format="value(projectNumber)")",
264
270
  "echo "GCLOUD_PROJECT_NUMBER: $GCLOUD_PROJECT_NUMBER"",
265
271
  "echo -e "\\e[0Ksection_end:$(date +%s):prepare\\r\\e[0K"",
266
- "echo -e "\\e[0Ksection_start:$(date +%s):pushToArtifactRegistry[collapsed=true]\\r\\e[0KPushing image to artifacts registry"",
267
- "docker login --username gitlab-ci-token --password $CI_JOB_TOKEN $CI_REGISTRY",
268
- "gcloud auth configure-docker asia-east1-docker.pkg.dev",
269
- "docker pull $DOCKER_IMAGE:$DOCKER_IMAGE_TAG",
270
- "docker tag $DOCKER_IMAGE:$DOCKER_IMAGE_TAG asia-east1-docker.pkg.dev/asdf/catladder-deploy/pan-test-app/dev/api:$DOCKER_IMAGE_TAG",
271
- "docker push asia-east1-docker.pkg.dev/asdf/catladder-deploy/pan-test-app/dev/api:$DOCKER_IMAGE_TAG",
272
- "echo -e "\\e[0Ksection_end:$(date +%s):pushToArtifactRegistry\\r\\e[0K"",
273
272
  "echo -e "\\e[0Ksection_start:$(date +%s):deploy[collapsed=true]\\r\\e[0KDeploy to cloud run"",
274
273
  "echo "$ENV_VARS" > ____envvars.yaml",
275
274
  "gcloud run deploy pan-test-app-dev-api --command="yarn,start" --image=asia-east1-docker.pkg.dev/asdf/catladder-deploy/pan-test-app/dev/api:$DOCKER_IMAGE_TAG --project=asdf --region=asia-east1 --labels=customer-name=pan,component-name=api,app-name=test-app,env-type=dev,env-name=dev,build-type=node --env-vars-file=____envvars.yaml --min-instances=0 --max-instances=100 --cpu-throttling --allow-unauthenticated --ingress=all --cpu-boost",
@@ -277,6 +276,7 @@ COPY --chown=node:node .yarn /app/.yarn",
277
276
  "echo -e "\\e[0Ksection_start:$(date +%s):cleanup[collapsed=true]\\r\\e[0KCleanup"",
278
277
  "gcloud run revisions list --project=asdf --region=asia-east1 --service=pan-test-app-dev-api --limit=unlimited --sort-by=metadata.creationTimestamp --format="value(name)" --filter='(status.conditions.status=False OR status.conditions.status=Unknown)' | while read -r revisionname; do gcloud run revisions delete --project=asdf --region=asia-east1 --quiet $revisionname ; done",
279
278
  "gcloud artifacts docker images list asia-east1-docker.pkg.dev/asdf/catladder-deploy/pan-test-app/dev/api --sort-by=~CREATE_TIME --format="value(version)" | tail -n +2 | while read -r version; do gcloud artifacts docker images delete asia-east1-docker.pkg.dev/asdf/catladder-deploy/pan-test-app/dev/api@$version --quiet --delete-tags; done",
279
+ "gcloud artifacts docker images list asia-east1-docker.pkg.dev/asdf/catladder-deploy/pan-test-app/caches/api --sort-by=~CREATE_TIME --format="value(version)" | tail -n +2 | while read -r version; do gcloud artifacts docker images delete asia-east1-docker.pkg.dev/asdf/catladder-deploy/pan-test-app/caches/api@$version --quiet --delete-tags; done",
280
280
  "echo -e "\\e[0Ksection_end:$(date +%s):cleanup\\r\\e[0K"",
281
281
  "echo Uploading SBOM to Dependency Track",
282
282
  "/dtrackuploader https://dep.panter.swiss/ "$DT_KEY_PROD" upload "pan-test-app/api" "https://pan-test-app-dev-api-unknown-host.example.com" "__sbom.json" vex.json || true",
@@ -297,14 +297,12 @@ COPY --chown=node:node .yarn /app/.yarn",
297
297
  "BUILD_INFO_ID": "some-id",
298
298
  "CLOUDSDK_CORE_DISABLE_PROMPTS": "1",
299
299
  "DOCKER_BUILDKIT": "1",
300
- "DOCKER_CACHE_IMAGE": "$DOCKER_REGISTRY_IMAGE_PATH/caches/api",
300
+ "DOCKER_CACHE_IMAGE": "asia-east1-docker.pkg.dev/asdf/catladder-deploy/pan-test-app/caches/api",
301
301
  "DOCKER_DRIVER": "overlay2",
302
302
  "DOCKER_HOST": "tcp://0.0.0.0:2375",
303
- "DOCKER_IMAGE": "$DOCKER_REGISTRY_IMAGE_PATH/$DOCKER_IMAGE_NAME",
304
- "DOCKER_IMAGE_NAME": "dev/api",
303
+ "DOCKER_IMAGE": "asia-east1-docker.pkg.dev/asdf/catladder-deploy/pan-test-app/dev/api",
305
304
  "DOCKER_IMAGE_TAG": "$CI_COMMIT_SHA",
306
- "DOCKER_REGISTRY": "$CI_REGISTRY",
307
- "DOCKER_REGISTRY_IMAGE_PATH": "$CI_REGISTRY_IMAGE",
305
+ "DOCKER_REGISTRY": "asia-east1-docker.pkg.dev",
308
306
  "DOCKER_TLS_CERTDIR": "",
309
307
  "ENV_SHORT": "dev",
310
308
  "ENV_TYPE": "dev",
@@ -366,6 +364,7 @@ _ALL_ENV_VAR_KEYS: '["ENV_SHORT","APP_DIR","ENV_TYPE","BUILD_INFO_ID","BUILD_INF
366
364
  "gcloud auth activate-service-account --key-file="./____keyfile.json"",
367
365
  "gcloud run services delete pan-test-app-dev-api --project=asdf --region=asia-east1",
368
366
  "gcloud artifacts docker images delete asia-east1-docker.pkg.dev/asdf/catladder-deploy/pan-test-app/dev/api --quiet --delete-tags",
367
+ "gcloud artifacts docker images list asia-east1-docker.pkg.dev/asdf/catladder-deploy/pan-test-app/caches/api --sort-by=~CREATE_TIME --format="value(version)" | tail -n +2 | while read -r version; do gcloud artifacts docker images delete asia-east1-docker.pkg.dev/asdf/catladder-deploy/pan-test-app/caches/api@$version --quiet --delete-tags; done",
369
368
  "echo Disabling component in Dependency Track",
370
369
  "/dtrackuploader https://dep.panter.swiss/ "$DT_KEY_PROD" disable "pan-test-app/api" "https://pan-test-app-dev-api-unknown-host.example.com" || true",
371
370
  "set -e",
@@ -1055,12 +1054,20 @@ EOF",
1055
1054
  },
1056
1055
  "script": [
1057
1056
  "ensureNodeDockerfile",
1058
- "docker login --username gitlab-ci-token --password $CI_JOB_TOKEN $CI_REGISTRY",
1059
- "docker version",
1057
+ "echo -e "\\e[0Ksection_start:$(date +%s):docker-login[collapsed=true]\\r\\e[0KDocker Login"",
1058
+ "echo $CL_review_api_GCLOUD_DEPLOY_credentialsKey > ./____keyfile.json
1059
+ ",
1060
+ "gcloud auth activate-service-account --key-file="./____keyfile.json"",
1061
+ "gcloud auth configure-docker asia-east1-docker.pkg.dev",
1062
+ "echo -e "\\e[0Ksection_end:$(date +%s):docker-login\\r\\e[0K"",
1063
+ "echo -e "\\e[0Ksection_start:$(date +%s):docker-build[collapsed=true]\\r\\e[0KDocker build"",
1060
1064
  "docker build --network host --cache-from $DOCKER_CACHE_IMAGE --tag $DOCKER_IMAGE:$DOCKER_IMAGE_TAG -f $APP_DIR/Dockerfile . --build-arg BUILDKIT_INLINE_CACHE=1",
1065
+ "echo -e "\\e[0Ksection_end:$(date +%s):docker-build\\r\\e[0K"",
1066
+ "echo -e "\\e[0Ksection_start:$(date +%s):docker-push[collapsed=true]\\r\\e[0KDocker push and tag"",
1061
1067
  "docker push $DOCKER_IMAGE:$DOCKER_IMAGE_TAG",
1062
1068
  "docker tag $DOCKER_IMAGE:$DOCKER_IMAGE_TAG $DOCKER_CACHE_IMAGE",
1063
1069
  "docker push $DOCKER_CACHE_IMAGE",
1070
+ "echo -e "\\e[0Ksection_end:$(date +%s):docker-push\\r\\e[0K"",
1064
1071
  ],
1065
1072
  "services": [
1066
1073
  {
@@ -1076,7 +1083,7 @@ EOF",
1076
1083
  "DOCKERFILE_ADDITIONS": undefined,
1077
1084
  "DOCKERFILE_ADDITIONS_END": undefined,
1078
1085
  "DOCKER_BUILDKIT": "1",
1079
- "DOCKER_CACHE_IMAGE": "$DOCKER_REGISTRY_IMAGE_PATH/caches/api",
1086
+ "DOCKER_CACHE_IMAGE": "asia-east1-docker.pkg.dev/asdf/catladder-deploy/pan-test-app/caches/api",
1080
1087
  "DOCKER_COPY_AND_INSTALL_APP": "COPY --chown=node:node $APP_DIR .
1081
1088
  RUN yarn plugin import workspace-tools
1082
1089
  RUN yarn workspaces focus --production && yarn rebuild",
@@ -1087,11 +1094,9 @@ COPY --chown=node:node .yarn /app/.yarn",
1087
1094
  "DOCKER_DIR": ".",
1088
1095
  "DOCKER_DRIVER": "overlay2",
1089
1096
  "DOCKER_HOST": "tcp://0.0.0.0:2375",
1090
- "DOCKER_IMAGE": "$DOCKER_REGISTRY_IMAGE_PATH/$DOCKER_IMAGE_NAME",
1091
- "DOCKER_IMAGE_NAME": "review/api",
1097
+ "DOCKER_IMAGE": "asia-east1-docker.pkg.dev/asdf/catladder-deploy/pan-test-app/review/api/mr1234",
1092
1098
  "DOCKER_IMAGE_TAG": "$CI_COMMIT_SHA",
1093
- "DOCKER_REGISTRY": "$CI_REGISTRY",
1094
- "DOCKER_REGISTRY_IMAGE_PATH": "$CI_REGISTRY_IMAGE",
1099
+ "DOCKER_REGISTRY": "asia-east1-docker.pkg.dev",
1095
1100
  "DOCKER_TLS_CERTDIR": "",
1096
1101
  "KUBERNETES_CPU_LIMIT": "1",
1097
1102
  "KUBERNETES_CPU_REQUEST": "0.5",
@@ -1160,13 +1165,6 @@ COPY --chown=node:node .yarn /app/.yarn",
1160
1165
  "export GCLOUD_PROJECT_NUMBER=$(gcloud projects describe asdf --format="value(projectNumber)")",
1161
1166
  "echo "GCLOUD_PROJECT_NUMBER: $GCLOUD_PROJECT_NUMBER"",
1162
1167
  "echo -e "\\e[0Ksection_end:$(date +%s):prepare\\r\\e[0K"",
1163
- "echo -e "\\e[0Ksection_start:$(date +%s):pushToArtifactRegistry[collapsed=true]\\r\\e[0KPushing image to artifacts registry"",
1164
- "docker login --username gitlab-ci-token --password $CI_JOB_TOKEN $CI_REGISTRY",
1165
- "gcloud auth configure-docker asia-east1-docker.pkg.dev",
1166
- "docker pull $DOCKER_IMAGE:$DOCKER_IMAGE_TAG",
1167
- "docker tag $DOCKER_IMAGE:$DOCKER_IMAGE_TAG asia-east1-docker.pkg.dev/asdf/catladder-deploy/pan-test-app/review/api/mr1234:$DOCKER_IMAGE_TAG",
1168
- "docker push asia-east1-docker.pkg.dev/asdf/catladder-deploy/pan-test-app/review/api/mr1234:$DOCKER_IMAGE_TAG",
1169
- "echo -e "\\e[0Ksection_end:$(date +%s):pushToArtifactRegistry\\r\\e[0K"",
1170
1168
  "echo -e "\\e[0Ksection_start:$(date +%s):deploy[collapsed=true]\\r\\e[0KDeploy to cloud run"",
1171
1169
  "echo "$ENV_VARS" > ____envvars.yaml",
1172
1170
  "gcloud run deploy pan-test-app-review-mr1234-api --command="yarn,start" --image=asia-east1-docker.pkg.dev/asdf/catladder-deploy/pan-test-app/review/api/mr1234:$DOCKER_IMAGE_TAG --project=asdf --region=asia-east1 --labels=customer-name=pan,component-name=api,app-name=test-app,env-type=review,env-name=review,build-type=node --env-vars-file=____envvars.yaml --min-instances=0 --max-instances=100 --cpu-throttling --allow-unauthenticated --ingress=all --cpu-boost",
@@ -1174,6 +1172,7 @@ COPY --chown=node:node .yarn /app/.yarn",
1174
1172
  "echo -e "\\e[0Ksection_start:$(date +%s):cleanup[collapsed=true]\\r\\e[0KCleanup"",
1175
1173
  "gcloud run revisions list --project=asdf --region=asia-east1 --service=pan-test-app-review-mr1234-api --limit=unlimited --sort-by=metadata.creationTimestamp --format="value(name)" --filter='(status.conditions.status=False OR status.conditions.status=Unknown)' | while read -r revisionname; do gcloud run revisions delete --project=asdf --region=asia-east1 --quiet $revisionname ; done",
1176
1174
  "gcloud artifacts docker images list asia-east1-docker.pkg.dev/asdf/catladder-deploy/pan-test-app/review/api/mr1234 --sort-by=~CREATE_TIME --format="value(version)" | tail -n +2 | while read -r version; do gcloud artifacts docker images delete asia-east1-docker.pkg.dev/asdf/catladder-deploy/pan-test-app/review/api/mr1234@$version --quiet --delete-tags; done",
1175
+ "gcloud artifacts docker images list asia-east1-docker.pkg.dev/asdf/catladder-deploy/pan-test-app/caches/api --sort-by=~CREATE_TIME --format="value(version)" | tail -n +2 | while read -r version; do gcloud artifacts docker images delete asia-east1-docker.pkg.dev/asdf/catladder-deploy/pan-test-app/caches/api@$version --quiet --delete-tags; done",
1177
1176
  "set +e",
1178
1177
  "gcloud artifacts docker images delete asia-east1-docker.pkg.dev/asdf/catladder-deploy/pan-test-app/review/api --quiet --delete-tags",
1179
1178
  "set -e",
@@ -1197,14 +1196,12 @@ COPY --chown=node:node .yarn /app/.yarn",
1197
1196
  "BUILD_INFO_ID": "some-id",
1198
1197
  "CLOUDSDK_CORE_DISABLE_PROMPTS": "1",
1199
1198
  "DOCKER_BUILDKIT": "1",
1200
- "DOCKER_CACHE_IMAGE": "$DOCKER_REGISTRY_IMAGE_PATH/caches/api",
1199
+ "DOCKER_CACHE_IMAGE": "asia-east1-docker.pkg.dev/asdf/catladder-deploy/pan-test-app/caches/api",
1201
1200
  "DOCKER_DRIVER": "overlay2",
1202
1201
  "DOCKER_HOST": "tcp://0.0.0.0:2375",
1203
- "DOCKER_IMAGE": "$DOCKER_REGISTRY_IMAGE_PATH/$DOCKER_IMAGE_NAME",
1204
- "DOCKER_IMAGE_NAME": "review/api",
1202
+ "DOCKER_IMAGE": "asia-east1-docker.pkg.dev/asdf/catladder-deploy/pan-test-app/review/api/mr1234",
1205
1203
  "DOCKER_IMAGE_TAG": "$CI_COMMIT_SHA",
1206
- "DOCKER_REGISTRY": "$CI_REGISTRY",
1207
- "DOCKER_REGISTRY_IMAGE_PATH": "$CI_REGISTRY_IMAGE",
1204
+ "DOCKER_REGISTRY": "asia-east1-docker.pkg.dev",
1208
1205
  "DOCKER_TLS_CERTDIR": "",
1209
1206
  "ENV_SHORT": "review",
1210
1207
  "ENV_TYPE": "review",
@@ -1266,6 +1263,7 @@ _ALL_ENV_VAR_KEYS: '["ENV_SHORT","APP_DIR","ENV_TYPE","BUILD_INFO_ID","BUILD_INF
1266
1263
  "gcloud auth activate-service-account --key-file="./____keyfile.json"",
1267
1264
  "gcloud run services delete pan-test-app-review-mr1234-api --project=asdf --region=asia-east1",
1268
1265
  "gcloud artifacts docker images delete asia-east1-docker.pkg.dev/asdf/catladder-deploy/pan-test-app/review/api/mr1234 --quiet --delete-tags",
1266
+ "gcloud artifacts docker images list asia-east1-docker.pkg.dev/asdf/catladder-deploy/pan-test-app/caches/api --sort-by=~CREATE_TIME --format="value(version)" | tail -n +2 | while read -r version; do gcloud artifacts docker images delete asia-east1-docker.pkg.dev/asdf/catladder-deploy/pan-test-app/caches/api@$version --quiet --delete-tags; done",
1269
1267
  "set +e",
1270
1268
  "gcloud artifacts docker images delete asia-east1-docker.pkg.dev/asdf/catladder-deploy/pan-test-app/review/api --quiet --delete-tags",
1271
1269
  "set -e",
@@ -1993,12 +1991,20 @@ EOF",
1993
1991
  },
1994
1992
  "script": [
1995
1993
  "ensureNodeDockerfile",
1996
- "docker login --username gitlab-ci-token --password $CI_JOB_TOKEN $CI_REGISTRY",
1997
- "docker version",
1994
+ "echo -e "\\e[0Ksection_start:$(date +%s):docker-login[collapsed=true]\\r\\e[0KDocker Login"",
1995
+ "echo $CL_prod_api_GCLOUD_DEPLOY_credentialsKey > ./____keyfile.json
1996
+ ",
1997
+ "gcloud auth activate-service-account --key-file="./____keyfile.json"",
1998
+ "gcloud auth configure-docker asia-east1-docker.pkg.dev",
1999
+ "echo -e "\\e[0Ksection_end:$(date +%s):docker-login\\r\\e[0K"",
2000
+ "echo -e "\\e[0Ksection_start:$(date +%s):docker-build[collapsed=true]\\r\\e[0KDocker build"",
1998
2001
  "docker build --network host --cache-from $DOCKER_CACHE_IMAGE --tag $DOCKER_IMAGE:$DOCKER_IMAGE_TAG -f $APP_DIR/Dockerfile . --build-arg BUILDKIT_INLINE_CACHE=1",
2002
+ "echo -e "\\e[0Ksection_end:$(date +%s):docker-build\\r\\e[0K"",
2003
+ "echo -e "\\e[0Ksection_start:$(date +%s):docker-push[collapsed=true]\\r\\e[0KDocker push and tag"",
1999
2004
  "docker push $DOCKER_IMAGE:$DOCKER_IMAGE_TAG",
2000
2005
  "docker tag $DOCKER_IMAGE:$DOCKER_IMAGE_TAG $DOCKER_CACHE_IMAGE",
2001
2006
  "docker push $DOCKER_CACHE_IMAGE",
2007
+ "echo -e "\\e[0Ksection_end:$(date +%s):docker-push\\r\\e[0K"",
2002
2008
  ],
2003
2009
  "services": [
2004
2010
  {
@@ -2014,7 +2020,7 @@ EOF",
2014
2020
  "DOCKERFILE_ADDITIONS": undefined,
2015
2021
  "DOCKERFILE_ADDITIONS_END": undefined,
2016
2022
  "DOCKER_BUILDKIT": "1",
2017
- "DOCKER_CACHE_IMAGE": "$DOCKER_REGISTRY_IMAGE_PATH/caches/api",
2023
+ "DOCKER_CACHE_IMAGE": "asia-east1-docker.pkg.dev/asdf/catladder-deploy/pan-test-app/caches/api",
2018
2024
  "DOCKER_COPY_AND_INSTALL_APP": "COPY --chown=node:node $APP_DIR .
2019
2025
  RUN yarn plugin import workspace-tools
2020
2026
  RUN yarn workspaces focus --production && yarn rebuild",
@@ -2025,11 +2031,9 @@ COPY --chown=node:node .yarn /app/.yarn",
2025
2031
  "DOCKER_DIR": ".",
2026
2032
  "DOCKER_DRIVER": "overlay2",
2027
2033
  "DOCKER_HOST": "tcp://0.0.0.0:2375",
2028
- "DOCKER_IMAGE": "$DOCKER_REGISTRY_IMAGE_PATH/$DOCKER_IMAGE_NAME",
2029
- "DOCKER_IMAGE_NAME": "prod/api",
2034
+ "DOCKER_IMAGE": "asia-east1-docker.pkg.dev/asdf/catladder-deploy/pan-test-app/prod/api",
2030
2035
  "DOCKER_IMAGE_TAG": "$CI_COMMIT_SHA",
2031
- "DOCKER_REGISTRY": "$CI_REGISTRY",
2032
- "DOCKER_REGISTRY_IMAGE_PATH": "$CI_REGISTRY_IMAGE",
2036
+ "DOCKER_REGISTRY": "asia-east1-docker.pkg.dev",
2033
2037
  "DOCKER_TLS_CERTDIR": "",
2034
2038
  "KUBERNETES_CPU_LIMIT": "1",
2035
2039
  "KUBERNETES_CPU_REQUEST": "0.5",
@@ -2061,12 +2065,20 @@ COPY --chown=node:node .yarn /app/.yarn",
2061
2065
  },
2062
2066
  "script": [
2063
2067
  "ensureNodeDockerfile",
2064
- "docker login --username gitlab-ci-token --password $CI_JOB_TOKEN $CI_REGISTRY",
2065
- "docker version",
2068
+ "echo -e "\\e[0Ksection_start:$(date +%s):docker-login[collapsed=true]\\r\\e[0KDocker Login"",
2069
+ "echo $CL_stage_api_GCLOUD_DEPLOY_credentialsKey > ./____keyfile.json
2070
+ ",
2071
+ "gcloud auth activate-service-account --key-file="./____keyfile.json"",
2072
+ "gcloud auth configure-docker asia-east1-docker.pkg.dev",
2073
+ "echo -e "\\e[0Ksection_end:$(date +%s):docker-login\\r\\e[0K"",
2074
+ "echo -e "\\e[0Ksection_start:$(date +%s):docker-build[collapsed=true]\\r\\e[0KDocker build"",
2066
2075
  "docker build --network host --cache-from $DOCKER_CACHE_IMAGE --tag $DOCKER_IMAGE:$DOCKER_IMAGE_TAG -f $APP_DIR/Dockerfile . --build-arg BUILDKIT_INLINE_CACHE=1",
2076
+ "echo -e "\\e[0Ksection_end:$(date +%s):docker-build\\r\\e[0K"",
2077
+ "echo -e "\\e[0Ksection_start:$(date +%s):docker-push[collapsed=true]\\r\\e[0KDocker push and tag"",
2067
2078
  "docker push $DOCKER_IMAGE:$DOCKER_IMAGE_TAG",
2068
2079
  "docker tag $DOCKER_IMAGE:$DOCKER_IMAGE_TAG $DOCKER_CACHE_IMAGE",
2069
2080
  "docker push $DOCKER_CACHE_IMAGE",
2081
+ "echo -e "\\e[0Ksection_end:$(date +%s):docker-push\\r\\e[0K"",
2070
2082
  ],
2071
2083
  "services": [
2072
2084
  {
@@ -2082,7 +2094,7 @@ COPY --chown=node:node .yarn /app/.yarn",
2082
2094
  "DOCKERFILE_ADDITIONS": undefined,
2083
2095
  "DOCKERFILE_ADDITIONS_END": undefined,
2084
2096
  "DOCKER_BUILDKIT": "1",
2085
- "DOCKER_CACHE_IMAGE": "$DOCKER_REGISTRY_IMAGE_PATH/caches/api",
2097
+ "DOCKER_CACHE_IMAGE": "asia-east1-docker.pkg.dev/asdf/catladder-deploy/pan-test-app/caches/api",
2086
2098
  "DOCKER_COPY_AND_INSTALL_APP": "COPY --chown=node:node $APP_DIR .
2087
2099
  RUN yarn plugin import workspace-tools
2088
2100
  RUN yarn workspaces focus --production && yarn rebuild",
@@ -2093,11 +2105,9 @@ COPY --chown=node:node .yarn /app/.yarn",
2093
2105
  "DOCKER_DIR": ".",
2094
2106
  "DOCKER_DRIVER": "overlay2",
2095
2107
  "DOCKER_HOST": "tcp://0.0.0.0:2375",
2096
- "DOCKER_IMAGE": "$DOCKER_REGISTRY_IMAGE_PATH/$DOCKER_IMAGE_NAME",
2097
- "DOCKER_IMAGE_NAME": "stage/api",
2108
+ "DOCKER_IMAGE": "asia-east1-docker.pkg.dev/asdf/catladder-deploy/pan-test-app/stage/api",
2098
2109
  "DOCKER_IMAGE_TAG": "$CI_COMMIT_SHA",
2099
- "DOCKER_REGISTRY": "$CI_REGISTRY",
2100
- "DOCKER_REGISTRY_IMAGE_PATH": "$CI_REGISTRY_IMAGE",
2110
+ "DOCKER_REGISTRY": "asia-east1-docker.pkg.dev",
2101
2111
  "DOCKER_TLS_CERTDIR": "",
2102
2112
  "KUBERNETES_CPU_LIMIT": "1",
2103
2113
  "KUBERNETES_CPU_REQUEST": "0.5",
@@ -2154,13 +2164,6 @@ COPY --chown=node:node .yarn /app/.yarn",
2154
2164
  "export GCLOUD_PROJECT_NUMBER=$(gcloud projects describe asdf --format="value(projectNumber)")",
2155
2165
  "echo "GCLOUD_PROJECT_NUMBER: $GCLOUD_PROJECT_NUMBER"",
2156
2166
  "echo -e "\\e[0Ksection_end:$(date +%s):prepare\\r\\e[0K"",
2157
- "echo -e "\\e[0Ksection_start:$(date +%s):pushToArtifactRegistry[collapsed=true]\\r\\e[0KPushing image to artifacts registry"",
2158
- "docker login --username gitlab-ci-token --password $CI_JOB_TOKEN $CI_REGISTRY",
2159
- "gcloud auth configure-docker asia-east1-docker.pkg.dev",
2160
- "docker pull $DOCKER_IMAGE:$DOCKER_IMAGE_TAG",
2161
- "docker tag $DOCKER_IMAGE:$DOCKER_IMAGE_TAG asia-east1-docker.pkg.dev/asdf/catladder-deploy/pan-test-app/prod/api:$DOCKER_IMAGE_TAG",
2162
- "docker push asia-east1-docker.pkg.dev/asdf/catladder-deploy/pan-test-app/prod/api:$DOCKER_IMAGE_TAG",
2163
- "echo -e "\\e[0Ksection_end:$(date +%s):pushToArtifactRegistry\\r\\e[0K"",
2164
2167
  "echo -e "\\e[0Ksection_start:$(date +%s):deploy[collapsed=true]\\r\\e[0KDeploy to cloud run"",
2165
2168
  "echo "$ENV_VARS" > ____envvars.yaml",
2166
2169
  "gcloud run deploy pan-test-app-prod-api --command="yarn,start" --image=asia-east1-docker.pkg.dev/asdf/catladder-deploy/pan-test-app/prod/api:$DOCKER_IMAGE_TAG --project=asdf --region=asia-east1 --labels=customer-name=pan,component-name=api,app-name=test-app,env-type=prod,env-name=prod,build-type=node --env-vars-file=____envvars.yaml --min-instances=0 --max-instances=100 --cpu-throttling --allow-unauthenticated --ingress=all --cpu-boost",
@@ -2168,6 +2171,7 @@ COPY --chown=node:node .yarn /app/.yarn",
2168
2171
  "echo -e "\\e[0Ksection_start:$(date +%s):cleanup[collapsed=true]\\r\\e[0KCleanup"",
2169
2172
  "gcloud run revisions list --project=asdf --region=asia-east1 --service=pan-test-app-prod-api --limit=unlimited --sort-by=metadata.creationTimestamp --format="value(name)" --filter='(status.conditions.status=False OR status.conditions.status=Unknown)' | tail -n +6 | while read -r revisionname; do gcloud run revisions delete --project=asdf --region=asia-east1 --quiet $revisionname ; done",
2170
2173
  "gcloud artifacts docker images list asia-east1-docker.pkg.dev/asdf/catladder-deploy/pan-test-app/prod/api --sort-by=~CREATE_TIME --format="value(version)" | tail -n +7 | while read -r version; do gcloud artifacts docker images delete asia-east1-docker.pkg.dev/asdf/catladder-deploy/pan-test-app/prod/api@$version --quiet --delete-tags; done",
2174
+ "gcloud artifacts docker images list asia-east1-docker.pkg.dev/asdf/catladder-deploy/pan-test-app/caches/api --sort-by=~CREATE_TIME --format="value(version)" | tail -n +2 | while read -r version; do gcloud artifacts docker images delete asia-east1-docker.pkg.dev/asdf/catladder-deploy/pan-test-app/caches/api@$version --quiet --delete-tags; done",
2171
2175
  "echo -e "\\e[0Ksection_end:$(date +%s):cleanup\\r\\e[0K"",
2172
2176
  "echo Uploading SBOM to Dependency Track",
2173
2177
  "/dtrackuploader https://dep.panter.swiss/ "$DT_KEY_PROD" upload "pan-test-app/api" "https://pan-test-app-prod-api-unknown-host.example.com" "__sbom.json" vex.json || true",
@@ -2188,14 +2192,12 @@ COPY --chown=node:node .yarn /app/.yarn",
2188
2192
  "BUILD_INFO_ID": "some-id",
2189
2193
  "CLOUDSDK_CORE_DISABLE_PROMPTS": "1",
2190
2194
  "DOCKER_BUILDKIT": "1",
2191
- "DOCKER_CACHE_IMAGE": "$DOCKER_REGISTRY_IMAGE_PATH/caches/api",
2195
+ "DOCKER_CACHE_IMAGE": "asia-east1-docker.pkg.dev/asdf/catladder-deploy/pan-test-app/caches/api",
2192
2196
  "DOCKER_DRIVER": "overlay2",
2193
2197
  "DOCKER_HOST": "tcp://0.0.0.0:2375",
2194
- "DOCKER_IMAGE": "$DOCKER_REGISTRY_IMAGE_PATH/$DOCKER_IMAGE_NAME",
2195
- "DOCKER_IMAGE_NAME": "prod/api",
2198
+ "DOCKER_IMAGE": "asia-east1-docker.pkg.dev/asdf/catladder-deploy/pan-test-app/prod/api",
2196
2199
  "DOCKER_IMAGE_TAG": "$CI_COMMIT_SHA",
2197
- "DOCKER_REGISTRY": "$CI_REGISTRY",
2198
- "DOCKER_REGISTRY_IMAGE_PATH": "$CI_REGISTRY_IMAGE",
2200
+ "DOCKER_REGISTRY": "asia-east1-docker.pkg.dev",
2199
2201
  "DOCKER_TLS_CERTDIR": "",
2200
2202
  "ENV_SHORT": "prod",
2201
2203
  "ENV_TYPE": "prod",
@@ -2272,13 +2274,6 @@ _ALL_ENV_VAR_KEYS: '["ENV_SHORT","APP_DIR","ENV_TYPE","BUILD_INFO_ID","BUILD_INF
2272
2274
  "export GCLOUD_PROJECT_NUMBER=$(gcloud projects describe asdf --format="value(projectNumber)")",
2273
2275
  "echo "GCLOUD_PROJECT_NUMBER: $GCLOUD_PROJECT_NUMBER"",
2274
2276
  "echo -e "\\e[0Ksection_end:$(date +%s):prepare\\r\\e[0K"",
2275
- "echo -e "\\e[0Ksection_start:$(date +%s):pushToArtifactRegistry[collapsed=true]\\r\\e[0KPushing image to artifacts registry"",
2276
- "docker login --username gitlab-ci-token --password $CI_JOB_TOKEN $CI_REGISTRY",
2277
- "gcloud auth configure-docker asia-east1-docker.pkg.dev",
2278
- "docker pull $DOCKER_IMAGE:$DOCKER_IMAGE_TAG",
2279
- "docker tag $DOCKER_IMAGE:$DOCKER_IMAGE_TAG asia-east1-docker.pkg.dev/asdf/catladder-deploy/pan-test-app/stage/api:$DOCKER_IMAGE_TAG",
2280
- "docker push asia-east1-docker.pkg.dev/asdf/catladder-deploy/pan-test-app/stage/api:$DOCKER_IMAGE_TAG",
2281
- "echo -e "\\e[0Ksection_end:$(date +%s):pushToArtifactRegistry\\r\\e[0K"",
2282
2277
  "echo -e "\\e[0Ksection_start:$(date +%s):deploy[collapsed=true]\\r\\e[0KDeploy to cloud run"",
2283
2278
  "echo "$ENV_VARS" > ____envvars.yaml",
2284
2279
  "gcloud run deploy pan-test-app-stage-api --command="yarn,start" --image=asia-east1-docker.pkg.dev/asdf/catladder-deploy/pan-test-app/stage/api:$DOCKER_IMAGE_TAG --project=asdf --region=asia-east1 --labels=customer-name=pan,component-name=api,app-name=test-app,env-type=stage,env-name=stage,build-type=node --env-vars-file=____envvars.yaml --min-instances=0 --max-instances=100 --cpu-throttling --allow-unauthenticated --ingress=all --cpu-boost",
@@ -2286,6 +2281,7 @@ _ALL_ENV_VAR_KEYS: '["ENV_SHORT","APP_DIR","ENV_TYPE","BUILD_INFO_ID","BUILD_INF
2286
2281
  "echo -e "\\e[0Ksection_start:$(date +%s):cleanup[collapsed=true]\\r\\e[0KCleanup"",
2287
2282
  "gcloud run revisions list --project=asdf --region=asia-east1 --service=pan-test-app-stage-api --limit=unlimited --sort-by=metadata.creationTimestamp --format="value(name)" --filter='(status.conditions.status=False OR status.conditions.status=Unknown)' | while read -r revisionname; do gcloud run revisions delete --project=asdf --region=asia-east1 --quiet $revisionname ; done",
2288
2283
  "gcloud artifacts docker images list asia-east1-docker.pkg.dev/asdf/catladder-deploy/pan-test-app/stage/api --sort-by=~CREATE_TIME --format="value(version)" | tail -n +2 | while read -r version; do gcloud artifacts docker images delete asia-east1-docker.pkg.dev/asdf/catladder-deploy/pan-test-app/stage/api@$version --quiet --delete-tags; done",
2284
+ "gcloud artifacts docker images list asia-east1-docker.pkg.dev/asdf/catladder-deploy/pan-test-app/caches/api --sort-by=~CREATE_TIME --format="value(version)" | tail -n +2 | while read -r version; do gcloud artifacts docker images delete asia-east1-docker.pkg.dev/asdf/catladder-deploy/pan-test-app/caches/api@$version --quiet --delete-tags; done",
2289
2285
  "echo -e "\\e[0Ksection_end:$(date +%s):cleanup\\r\\e[0K"",
2290
2286
  "echo Uploading SBOM to Dependency Track",
2291
2287
  "/dtrackuploader https://dep.panter.swiss/ "$DT_KEY_PROD" upload "pan-test-app/api" "https://pan-test-app-stage-api-unknown-host.example.com" "__sbom.json" vex.json || true",
@@ -2306,14 +2302,12 @@ _ALL_ENV_VAR_KEYS: '["ENV_SHORT","APP_DIR","ENV_TYPE","BUILD_INFO_ID","BUILD_INF
2306
2302
  "BUILD_INFO_ID": "some-id",
2307
2303
  "CLOUDSDK_CORE_DISABLE_PROMPTS": "1",
2308
2304
  "DOCKER_BUILDKIT": "1",
2309
- "DOCKER_CACHE_IMAGE": "$DOCKER_REGISTRY_IMAGE_PATH/caches/api",
2305
+ "DOCKER_CACHE_IMAGE": "asia-east1-docker.pkg.dev/asdf/catladder-deploy/pan-test-app/caches/api",
2310
2306
  "DOCKER_DRIVER": "overlay2",
2311
2307
  "DOCKER_HOST": "tcp://0.0.0.0:2375",
2312
- "DOCKER_IMAGE": "$DOCKER_REGISTRY_IMAGE_PATH/$DOCKER_IMAGE_NAME",
2313
- "DOCKER_IMAGE_NAME": "stage/api",
2308
+ "DOCKER_IMAGE": "asia-east1-docker.pkg.dev/asdf/catladder-deploy/pan-test-app/stage/api",
2314
2309
  "DOCKER_IMAGE_TAG": "$CI_COMMIT_SHA",
2315
- "DOCKER_REGISTRY": "$CI_REGISTRY",
2316
- "DOCKER_REGISTRY_IMAGE_PATH": "$CI_REGISTRY_IMAGE",
2310
+ "DOCKER_REGISTRY": "asia-east1-docker.pkg.dev",
2317
2311
  "DOCKER_TLS_CERTDIR": "",
2318
2312
  "ENV_SHORT": "stage",
2319
2313
  "ENV_TYPE": "stage",
@@ -2375,6 +2369,7 @@ _ALL_ENV_VAR_KEYS: '["ENV_SHORT","APP_DIR","ENV_TYPE","BUILD_INFO_ID","BUILD_INF
2375
2369
  "gcloud auth activate-service-account --key-file="./____keyfile.json"",
2376
2370
  "gcloud run services delete pan-test-app-prod-api --project=asdf --region=asia-east1",
2377
2371
  "gcloud artifacts docker images delete asia-east1-docker.pkg.dev/asdf/catladder-deploy/pan-test-app/prod/api --quiet --delete-tags",
2372
+ "gcloud artifacts docker images list asia-east1-docker.pkg.dev/asdf/catladder-deploy/pan-test-app/caches/api --sort-by=~CREATE_TIME --format="value(version)" | tail -n +2 | while read -r version; do gcloud artifacts docker images delete asia-east1-docker.pkg.dev/asdf/catladder-deploy/pan-test-app/caches/api@$version --quiet --delete-tags; done",
2378
2373
  "echo Disabling component in Dependency Track",
2379
2374
  "/dtrackuploader https://dep.panter.swiss/ "$DT_KEY_PROD" disable "pan-test-app/api" "https://pan-test-app-prod-api-unknown-host.example.com" || true",
2380
2375
  "set -e",
@@ -2423,6 +2418,7 @@ _ALL_ENV_VAR_KEYS: '["ENV_SHORT","APP_DIR","ENV_TYPE","BUILD_INFO_ID","BUILD_INF
2423
2418
  "gcloud auth activate-service-account --key-file="./____keyfile.json"",
2424
2419
  "gcloud run services delete pan-test-app-stage-api --project=asdf --region=asia-east1",
2425
2420
  "gcloud artifacts docker images delete asia-east1-docker.pkg.dev/asdf/catladder-deploy/pan-test-app/stage/api --quiet --delete-tags",
2421
+ "gcloud artifacts docker images list asia-east1-docker.pkg.dev/asdf/catladder-deploy/pan-test-app/caches/api --sort-by=~CREATE_TIME --format="value(version)" | tail -n +2 | while read -r version; do gcloud artifacts docker images delete asia-east1-docker.pkg.dev/asdf/catladder-deploy/pan-test-app/caches/api@$version --quiet --delete-tags; done",
2426
2422
  "echo Disabling component in Dependency Track",
2427
2423
  "/dtrackuploader https://dep.panter.swiss/ "$DT_KEY_PROD" disable "pan-test-app/api" "https://pan-test-app-stage-api-unknown-host.example.com" || true",
2428
2424
  "set -e",