@catladder/pipeline 1.124.0 → 1.124.2

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 +20 -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 +48 -72
  15. package/examples/__snapshots__/cloud-run-no-cpu-throttling.ts.snap +48 -72
  16. package/examples/__snapshots__/cloud-run-non-public.ts.snap +48 -72
  17. package/examples/__snapshots__/cloud-run-with-sql-reuse-db.ts.snap +96 -144
  18. package/examples/__snapshots__/cloud-run-with-sql.ts.snap +96 -144
  19. package/examples/__snapshots__/custom-build-job-with-tests.ts.snap +48 -72
  20. package/examples/__snapshots__/custom-build-job.ts.snap +48 -72
  21. package/examples/__snapshots__/custom-deploy.ts.snap +16 -24
  22. package/examples/__snapshots__/custom-sbom-java.ts.snap +48 -72
  23. package/examples/__snapshots__/kubernetes-application-customization.ts.snap +16 -24
  24. package/examples/__snapshots__/kubernetes-with-cloud-sql-legacy.ts.snap +16 -24
  25. package/examples/__snapshots__/kubernetes-with-cloud-sql.ts.snap +16 -24
  26. package/examples/__snapshots__/kubernetes-with-jobs.ts.snap +32 -48
  27. package/examples/__snapshots__/kubernetes-with-mongodb.ts.snap +16 -24
  28. package/examples/__snapshots__/meteor-kubernetes.ts.snap +16 -24
  29. package/examples/__snapshots__/native-app.ts.snap +48 -72
  30. package/examples/__snapshots__/node-build-with-custom-image.ts.snap +48 -72
  31. package/examples/__snapshots__/rails-k8s-with-worker.ts.snap +32 -48
  32. package/package.json +1 -1
  33. package/src/build/custom/buildJob.ts +1 -0
  34. package/src/build/docker.ts +41 -11
  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__/meteor-kubernetes.ts.snap CHANGED
@@ -290,15 +290,14 @@ mongodb:
290
290
  "DOCKERFILE_ADDITIONS": undefined,
291
291
  "DOCKERFILE_ADDITIONS_END": undefined,
292
292
  "DOCKER_BUILDKIT": "1",
293
- "DOCKER_CACHE_IMAGE": "$DOCKER_REGISTRY_IMAGE_PATH/caches/web",
293
+ "DOCKER_CACHE_IMAGE": "$CI_REGISTRY_IMAGE/caches/web",
294
294
  "DOCKER_DIR": ".",
295
295
  "DOCKER_DRIVER": "overlay2",
296
296
  "DOCKER_HOST": "tcp://0.0.0.0:2375",
297
- "DOCKER_IMAGE": "$DOCKER_REGISTRY_IMAGE_PATH/$DOCKER_IMAGE_NAME",
297
+ "DOCKER_IMAGE": "$CI_REGISTRY_IMAGE/$DOCKER_IMAGE_NAME",
298
298
  "DOCKER_IMAGE_NAME": "dev/web",
299
299
  "DOCKER_IMAGE_TAG": "$CI_COMMIT_SHA",
300
300
  "DOCKER_REGISTRY": "$CI_REGISTRY",
301
- "DOCKER_REGISTRY_IMAGE_PATH": "$CI_REGISTRY_IMAGE",
302
301
  "DOCKER_TLS_CERTDIR": "",
303
302
  "KUBERNETES_CPU_LIMIT": "1",
304
303
  "KUBERNETES_CPU_REQUEST": "0.5",
@@ -374,12 +373,11 @@ mongodb:
374
373
  "BUILD_INFO_CURRENT_VERSION": "3.2.1",
375
374
  "BUILD_INFO_ID": "some-id",
376
375
  "COMPONENT_NAME": "web",
377
- "DOCKER_CACHE_IMAGE": "$DOCKER_REGISTRY_IMAGE_PATH/caches/web",
378
- "DOCKER_IMAGE": "$DOCKER_REGISTRY_IMAGE_PATH/$DOCKER_IMAGE_NAME",
376
+ "DOCKER_CACHE_IMAGE": "$CI_REGISTRY_IMAGE/caches/web",
377
+ "DOCKER_IMAGE": "$CI_REGISTRY_IMAGE/$DOCKER_IMAGE_NAME",
379
378
  "DOCKER_IMAGE_NAME": "dev/web",
380
379
  "DOCKER_IMAGE_TAG": "$CI_COMMIT_SHA",
381
380
  "DOCKER_REGISTRY": "$CI_REGISTRY",
382
- "DOCKER_REGISTRY_IMAGE_PATH": "$CI_REGISTRY_IMAGE",
383
381
  "ENV_SHORT": "dev",
384
382
  "ENV_TYPE": "dev",
385
383
  "HELM_ARGS": "",
@@ -1018,15 +1016,14 @@ mongodb:
1018
1016
  "DOCKERFILE_ADDITIONS": undefined,
1019
1017
  "DOCKERFILE_ADDITIONS_END": undefined,
1020
1018
  "DOCKER_BUILDKIT": "1",
1021
- "DOCKER_CACHE_IMAGE": "$DOCKER_REGISTRY_IMAGE_PATH/caches/web",
1019
+ "DOCKER_CACHE_IMAGE": "$CI_REGISTRY_IMAGE/caches/web",
1022
1020
  "DOCKER_DIR": ".",
1023
1021
  "DOCKER_DRIVER": "overlay2",
1024
1022
  "DOCKER_HOST": "tcp://0.0.0.0:2375",
1025
- "DOCKER_IMAGE": "$DOCKER_REGISTRY_IMAGE_PATH/$DOCKER_IMAGE_NAME",
1023
+ "DOCKER_IMAGE": "$CI_REGISTRY_IMAGE/$DOCKER_IMAGE_NAME",
1026
1024
  "DOCKER_IMAGE_NAME": "review/web",
1027
1025
  "DOCKER_IMAGE_TAG": "$CI_COMMIT_SHA",
1028
1026
  "DOCKER_REGISTRY": "$CI_REGISTRY",
1029
- "DOCKER_REGISTRY_IMAGE_PATH": "$CI_REGISTRY_IMAGE",
1030
1027
  "DOCKER_TLS_CERTDIR": "",
1031
1028
  "KUBERNETES_CPU_LIMIT": "1",
1032
1029
  "KUBERNETES_CPU_REQUEST": "0.5",
@@ -1102,12 +1099,11 @@ mongodb:
1102
1099
  "BUILD_INFO_CURRENT_VERSION": "3.2.1",
1103
1100
  "BUILD_INFO_ID": "some-id",
1104
1101
  "COMPONENT_NAME": "web",
1105
- "DOCKER_CACHE_IMAGE": "$DOCKER_REGISTRY_IMAGE_PATH/caches/web",
1106
- "DOCKER_IMAGE": "$DOCKER_REGISTRY_IMAGE_PATH/$DOCKER_IMAGE_NAME",
1102
+ "DOCKER_CACHE_IMAGE": "$CI_REGISTRY_IMAGE/caches/web",
1103
+ "DOCKER_IMAGE": "$CI_REGISTRY_IMAGE/$DOCKER_IMAGE_NAME",
1107
1104
  "DOCKER_IMAGE_NAME": "review/web",
1108
1105
  "DOCKER_IMAGE_TAG": "$CI_COMMIT_SHA",
1109
1106
  "DOCKER_REGISTRY": "$CI_REGISTRY",
1110
- "DOCKER_REGISTRY_IMAGE_PATH": "$CI_REGISTRY_IMAGE",
1111
1107
  "ENV_SHORT": "review",
1112
1108
  "ENV_TYPE": "review",
1113
1109
  "HELM_ARGS": "",
@@ -1909,15 +1905,14 @@ mongodb:
1909
1905
  "DOCKERFILE_ADDITIONS": undefined,
1910
1906
  "DOCKERFILE_ADDITIONS_END": undefined,
1911
1907
  "DOCKER_BUILDKIT": "1",
1912
- "DOCKER_CACHE_IMAGE": "$DOCKER_REGISTRY_IMAGE_PATH/caches/web",
1908
+ "DOCKER_CACHE_IMAGE": "$CI_REGISTRY_IMAGE/caches/web",
1913
1909
  "DOCKER_DIR": ".",
1914
1910
  "DOCKER_DRIVER": "overlay2",
1915
1911
  "DOCKER_HOST": "tcp://0.0.0.0:2375",
1916
- "DOCKER_IMAGE": "$DOCKER_REGISTRY_IMAGE_PATH/$DOCKER_IMAGE_NAME",
1912
+ "DOCKER_IMAGE": "$CI_REGISTRY_IMAGE/$DOCKER_IMAGE_NAME",
1917
1913
  "DOCKER_IMAGE_NAME": "prod/web",
1918
1914
  "DOCKER_IMAGE_TAG": "$CI_COMMIT_SHA",
1919
1915
  "DOCKER_REGISTRY": "$CI_REGISTRY",
1920
- "DOCKER_REGISTRY_IMAGE_PATH": "$CI_REGISTRY_IMAGE",
1921
1916
  "DOCKER_TLS_CERTDIR": "",
1922
1917
  "KUBERNETES_CPU_LIMIT": "1",
1923
1918
  "KUBERNETES_CPU_REQUEST": "0.5",
@@ -1967,15 +1962,14 @@ mongodb:
1967
1962
  "DOCKERFILE_ADDITIONS": undefined,
1968
1963
  "DOCKERFILE_ADDITIONS_END": undefined,
1969
1964
  "DOCKER_BUILDKIT": "1",
1970
- "DOCKER_CACHE_IMAGE": "$DOCKER_REGISTRY_IMAGE_PATH/caches/web",
1965
+ "DOCKER_CACHE_IMAGE": "$CI_REGISTRY_IMAGE/caches/web",
1971
1966
  "DOCKER_DIR": ".",
1972
1967
  "DOCKER_DRIVER": "overlay2",
1973
1968
  "DOCKER_HOST": "tcp://0.0.0.0:2375",
1974
- "DOCKER_IMAGE": "$DOCKER_REGISTRY_IMAGE_PATH/$DOCKER_IMAGE_NAME",
1969
+ "DOCKER_IMAGE": "$CI_REGISTRY_IMAGE/$DOCKER_IMAGE_NAME",
1975
1970
  "DOCKER_IMAGE_NAME": "stage/web",
1976
1971
  "DOCKER_IMAGE_TAG": "$CI_COMMIT_SHA",
1977
1972
  "DOCKER_REGISTRY": "$CI_REGISTRY",
1978
- "DOCKER_REGISTRY_IMAGE_PATH": "$CI_REGISTRY_IMAGE",
1979
1973
  "DOCKER_TLS_CERTDIR": "",
1980
1974
  "KUBERNETES_CPU_LIMIT": "1",
1981
1975
  "KUBERNETES_CPU_REQUEST": "0.5",
@@ -2039,12 +2033,11 @@ mongodb:
2039
2033
  "BUILD_INFO_CURRENT_VERSION": "3.2.1",
2040
2034
  "BUILD_INFO_ID": "some-id",
2041
2035
  "COMPONENT_NAME": "web",
2042
- "DOCKER_CACHE_IMAGE": "$DOCKER_REGISTRY_IMAGE_PATH/caches/web",
2043
- "DOCKER_IMAGE": "$DOCKER_REGISTRY_IMAGE_PATH/$DOCKER_IMAGE_NAME",
2036
+ "DOCKER_CACHE_IMAGE": "$CI_REGISTRY_IMAGE/caches/web",
2037
+ "DOCKER_IMAGE": "$CI_REGISTRY_IMAGE/$DOCKER_IMAGE_NAME",
2044
2038
  "DOCKER_IMAGE_NAME": "prod/web",
2045
2039
  "DOCKER_IMAGE_TAG": "$CI_COMMIT_SHA",
2046
2040
  "DOCKER_REGISTRY": "$CI_REGISTRY",
2047
- "DOCKER_REGISTRY_IMAGE_PATH": "$CI_REGISTRY_IMAGE",
2048
2041
  "ENV_SHORT": "prod",
2049
2042
  "ENV_TYPE": "prod",
2050
2043
  "HELM_ARGS": "",
@@ -2182,12 +2175,11 @@ mongodb:
2182
2175
  "BUILD_INFO_CURRENT_VERSION": "3.2.1",
2183
2176
  "BUILD_INFO_ID": "some-id",
2184
2177
  "COMPONENT_NAME": "web",
2185
- "DOCKER_CACHE_IMAGE": "$DOCKER_REGISTRY_IMAGE_PATH/caches/web",
2186
- "DOCKER_IMAGE": "$DOCKER_REGISTRY_IMAGE_PATH/$DOCKER_IMAGE_NAME",
2178
+ "DOCKER_CACHE_IMAGE": "$CI_REGISTRY_IMAGE/caches/web",
2179
+ "DOCKER_IMAGE": "$CI_REGISTRY_IMAGE/$DOCKER_IMAGE_NAME",
2187
2180
  "DOCKER_IMAGE_NAME": "stage/web",
2188
2181
  "DOCKER_IMAGE_TAG": "$CI_COMMIT_SHA",
2189
2182
  "DOCKER_REGISTRY": "$CI_REGISTRY",
2190
- "DOCKER_REGISTRY_IMAGE_PATH": "$CI_REGISTRY_IMAGE",
2191
2183
  "ENV_SHORT": "stage",
2192
2184
  "ENV_TYPE": "stage",
2193
2185
  "HELM_ARGS": "",
package/examples/__snapshots__/native-app.ts.snap CHANGED
@@ -159,7 +159,10 @@ exports[`matches snapshot 1`] = `
159
159
  "script": [
160
160
  "ensureNodeDockerfile",
161
161
  "echo -e "\\e[0Ksection_start:$(date +%s):docker-login[collapsed=true]\\r\\e[0KDocker Login"",
162
- "docker login --username gitlab-ci-token --password $CI_JOB_TOKEN $CI_REGISTRY",
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",
163
166
  "echo -e "\\e[0Ksection_end:$(date +%s):docker-login\\r\\e[0K"",
164
167
  "echo -e "\\e[0Ksection_start:$(date +%s):docker-build[collapsed=true]\\r\\e[0KDocker build"",
165
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",
@@ -184,7 +187,7 @@ exports[`matches snapshot 1`] = `
184
187
  "DOCKERFILE_ADDITIONS": undefined,
185
188
  "DOCKERFILE_ADDITIONS_END": undefined,
186
189
  "DOCKER_BUILDKIT": "1",
187
- "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",
188
191
  "DOCKER_COPY_AND_INSTALL_APP": "COPY --chown=node:node $APP_DIR .
189
192
  RUN yarn plugin import workspace-tools
190
193
  RUN yarn workspaces focus --production && yarn rebuild",
@@ -195,11 +198,9 @@ COPY --chown=node:node .yarn /app/.yarn",
195
198
  "DOCKER_DIR": ".",
196
199
  "DOCKER_DRIVER": "overlay2",
197
200
  "DOCKER_HOST": "tcp://0.0.0.0:2375",
198
- "DOCKER_IMAGE": "$DOCKER_REGISTRY_IMAGE_PATH/$DOCKER_IMAGE_NAME",
199
- "DOCKER_IMAGE_NAME": "dev/api",
201
+ "DOCKER_IMAGE": "asia-east1-docker.pkg.dev/asdf/catladder-deploy/pan-test-app/dev/api",
200
202
  "DOCKER_IMAGE_TAG": "$CI_COMMIT_SHA",
201
- "DOCKER_REGISTRY": "$CI_REGISTRY",
202
- "DOCKER_REGISTRY_IMAGE_PATH": "$CI_REGISTRY_IMAGE",
203
+ "DOCKER_REGISTRY": "asia-east1-docker.pkg.dev",
203
204
  "DOCKER_TLS_CERTDIR": "",
204
205
  "KUBERNETES_CPU_LIMIT": "1",
205
206
  "KUBERNETES_CPU_REQUEST": "0.5",
@@ -268,13 +269,6 @@ COPY --chown=node:node .yarn /app/.yarn",
268
269
  "export GCLOUD_PROJECT_NUMBER=$(gcloud projects describe asdf --format="value(projectNumber)")",
269
270
  "echo "GCLOUD_PROJECT_NUMBER: $GCLOUD_PROJECT_NUMBER"",
270
271
  "echo -e "\\e[0Ksection_end:$(date +%s):prepare\\r\\e[0K"",
271
- "echo -e "\\e[0Ksection_start:$(date +%s):pushToArtifactRegistry[collapsed=true]\\r\\e[0KPushing image to artifacts registry"",
272
- "docker login --username gitlab-ci-token --password $CI_JOB_TOKEN $CI_REGISTRY",
273
- "gcloud auth configure-docker asia-east1-docker.pkg.dev",
274
- "docker pull $DOCKER_IMAGE:$DOCKER_IMAGE_TAG",
275
- "docker tag $DOCKER_IMAGE:$DOCKER_IMAGE_TAG asia-east1-docker.pkg.dev/asdf/catladder-deploy/pan-test-app/dev/api:$DOCKER_IMAGE_TAG",
276
- "docker push asia-east1-docker.pkg.dev/asdf/catladder-deploy/pan-test-app/dev/api:$DOCKER_IMAGE_TAG",
277
- "echo -e "\\e[0Ksection_end:$(date +%s):pushToArtifactRegistry\\r\\e[0K"",
278
272
  "echo -e "\\e[0Ksection_start:$(date +%s):deploy[collapsed=true]\\r\\e[0KDeploy to cloud run"",
279
273
  "echo "$ENV_VARS" > ____envvars.yaml",
280
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",
@@ -282,6 +276,7 @@ COPY --chown=node:node .yarn /app/.yarn",
282
276
  "echo -e "\\e[0Ksection_start:$(date +%s):cleanup[collapsed=true]\\r\\e[0KCleanup"",
283
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",
284
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",
285
280
  "echo -e "\\e[0Ksection_end:$(date +%s):cleanup\\r\\e[0K"",
286
281
  "echo Uploading SBOM to Dependency Track",
287
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",
@@ -302,14 +297,12 @@ COPY --chown=node:node .yarn /app/.yarn",
302
297
  "BUILD_INFO_ID": "some-id",
303
298
  "CLOUDSDK_CORE_DISABLE_PROMPTS": "1",
304
299
  "DOCKER_BUILDKIT": "1",
305
- "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",
306
301
  "DOCKER_DRIVER": "overlay2",
307
302
  "DOCKER_HOST": "tcp://0.0.0.0:2375",
308
- "DOCKER_IMAGE": "$DOCKER_REGISTRY_IMAGE_PATH/$DOCKER_IMAGE_NAME",
309
- "DOCKER_IMAGE_NAME": "dev/api",
303
+ "DOCKER_IMAGE": "asia-east1-docker.pkg.dev/asdf/catladder-deploy/pan-test-app/dev/api",
310
304
  "DOCKER_IMAGE_TAG": "$CI_COMMIT_SHA",
311
- "DOCKER_REGISTRY": "$CI_REGISTRY",
312
- "DOCKER_REGISTRY_IMAGE_PATH": "$CI_REGISTRY_IMAGE",
305
+ "DOCKER_REGISTRY": "asia-east1-docker.pkg.dev",
313
306
  "DOCKER_TLS_CERTDIR": "",
314
307
  "ENV_SHORT": "dev",
315
308
  "ENV_TYPE": "dev",
@@ -371,6 +364,7 @@ _ALL_ENV_VAR_KEYS: '["ENV_SHORT","APP_DIR","ENV_TYPE","BUILD_INFO_ID","BUILD_INF
371
364
  "gcloud auth activate-service-account --key-file="./____keyfile.json"",
372
365
  "gcloud run services delete pan-test-app-dev-api --project=asdf --region=asia-east1",
373
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",
374
368
  "echo Disabling component in Dependency Track",
375
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",
376
370
  "set -e",
@@ -1061,7 +1055,10 @@ EOF",
1061
1055
  "script": [
1062
1056
  "ensureNodeDockerfile",
1063
1057
  "echo -e "\\e[0Ksection_start:$(date +%s):docker-login[collapsed=true]\\r\\e[0KDocker Login"",
1064
- "docker login --username gitlab-ci-token --password $CI_JOB_TOKEN $CI_REGISTRY",
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",
1065
1062
  "echo -e "\\e[0Ksection_end:$(date +%s):docker-login\\r\\e[0K"",
1066
1063
  "echo -e "\\e[0Ksection_start:$(date +%s):docker-build[collapsed=true]\\r\\e[0KDocker build"",
1067
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",
@@ -1086,7 +1083,7 @@ EOF",
1086
1083
  "DOCKERFILE_ADDITIONS": undefined,
1087
1084
  "DOCKERFILE_ADDITIONS_END": undefined,
1088
1085
  "DOCKER_BUILDKIT": "1",
1089
- "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",
1090
1087
  "DOCKER_COPY_AND_INSTALL_APP": "COPY --chown=node:node $APP_DIR .
1091
1088
  RUN yarn plugin import workspace-tools
1092
1089
  RUN yarn workspaces focus --production && yarn rebuild",
@@ -1097,11 +1094,9 @@ COPY --chown=node:node .yarn /app/.yarn",
1097
1094
  "DOCKER_DIR": ".",
1098
1095
  "DOCKER_DRIVER": "overlay2",
1099
1096
  "DOCKER_HOST": "tcp://0.0.0.0:2375",
1100
- "DOCKER_IMAGE": "$DOCKER_REGISTRY_IMAGE_PATH/$DOCKER_IMAGE_NAME",
1101
- "DOCKER_IMAGE_NAME": "review/api",
1097
+ "DOCKER_IMAGE": "asia-east1-docker.pkg.dev/asdf/catladder-deploy/pan-test-app/review/api/mr1234",
1102
1098
  "DOCKER_IMAGE_TAG": "$CI_COMMIT_SHA",
1103
- "DOCKER_REGISTRY": "$CI_REGISTRY",
1104
- "DOCKER_REGISTRY_IMAGE_PATH": "$CI_REGISTRY_IMAGE",
1099
+ "DOCKER_REGISTRY": "asia-east1-docker.pkg.dev",
1105
1100
  "DOCKER_TLS_CERTDIR": "",
1106
1101
  "KUBERNETES_CPU_LIMIT": "1",
1107
1102
  "KUBERNETES_CPU_REQUEST": "0.5",
@@ -1170,13 +1165,6 @@ COPY --chown=node:node .yarn /app/.yarn",
1170
1165
  "export GCLOUD_PROJECT_NUMBER=$(gcloud projects describe asdf --format="value(projectNumber)")",
1171
1166
  "echo "GCLOUD_PROJECT_NUMBER: $GCLOUD_PROJECT_NUMBER"",
1172
1167
  "echo -e "\\e[0Ksection_end:$(date +%s):prepare\\r\\e[0K"",
1173
- "echo -e "\\e[0Ksection_start:$(date +%s):pushToArtifactRegistry[collapsed=true]\\r\\e[0KPushing image to artifacts registry"",
1174
- "docker login --username gitlab-ci-token --password $CI_JOB_TOKEN $CI_REGISTRY",
1175
- "gcloud auth configure-docker asia-east1-docker.pkg.dev",
1176
- "docker pull $DOCKER_IMAGE:$DOCKER_IMAGE_TAG",
1177
- "docker tag $DOCKER_IMAGE:$DOCKER_IMAGE_TAG asia-east1-docker.pkg.dev/asdf/catladder-deploy/pan-test-app/review/api/mr1234:$DOCKER_IMAGE_TAG",
1178
- "docker push asia-east1-docker.pkg.dev/asdf/catladder-deploy/pan-test-app/review/api/mr1234:$DOCKER_IMAGE_TAG",
1179
- "echo -e "\\e[0Ksection_end:$(date +%s):pushToArtifactRegistry\\r\\e[0K"",
1180
1168
  "echo -e "\\e[0Ksection_start:$(date +%s):deploy[collapsed=true]\\r\\e[0KDeploy to cloud run"",
1181
1169
  "echo "$ENV_VARS" > ____envvars.yaml",
1182
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",
@@ -1184,6 +1172,7 @@ COPY --chown=node:node .yarn /app/.yarn",
1184
1172
  "echo -e "\\e[0Ksection_start:$(date +%s):cleanup[collapsed=true]\\r\\e[0KCleanup"",
1185
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",
1186
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",
1187
1176
  "set +e",
1188
1177
  "gcloud artifacts docker images delete asia-east1-docker.pkg.dev/asdf/catladder-deploy/pan-test-app/review/api --quiet --delete-tags",
1189
1178
  "set -e",
@@ -1207,14 +1196,12 @@ COPY --chown=node:node .yarn /app/.yarn",
1207
1196
  "BUILD_INFO_ID": "some-id",
1208
1197
  "CLOUDSDK_CORE_DISABLE_PROMPTS": "1",
1209
1198
  "DOCKER_BUILDKIT": "1",
1210
- "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",
1211
1200
  "DOCKER_DRIVER": "overlay2",
1212
1201
  "DOCKER_HOST": "tcp://0.0.0.0:2375",
1213
- "DOCKER_IMAGE": "$DOCKER_REGISTRY_IMAGE_PATH/$DOCKER_IMAGE_NAME",
1214
- "DOCKER_IMAGE_NAME": "review/api",
1202
+ "DOCKER_IMAGE": "asia-east1-docker.pkg.dev/asdf/catladder-deploy/pan-test-app/review/api/mr1234",
1215
1203
  "DOCKER_IMAGE_TAG": "$CI_COMMIT_SHA",
1216
- "DOCKER_REGISTRY": "$CI_REGISTRY",
1217
- "DOCKER_REGISTRY_IMAGE_PATH": "$CI_REGISTRY_IMAGE",
1204
+ "DOCKER_REGISTRY": "asia-east1-docker.pkg.dev",
1218
1205
  "DOCKER_TLS_CERTDIR": "",
1219
1206
  "ENV_SHORT": "review",
1220
1207
  "ENV_TYPE": "review",
@@ -1276,6 +1263,7 @@ _ALL_ENV_VAR_KEYS: '["ENV_SHORT","APP_DIR","ENV_TYPE","BUILD_INFO_ID","BUILD_INF
1276
1263
  "gcloud auth activate-service-account --key-file="./____keyfile.json"",
1277
1264
  "gcloud run services delete pan-test-app-review-mr1234-api --project=asdf --region=asia-east1",
1278
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",
1279
1267
  "set +e",
1280
1268
  "gcloud artifacts docker images delete asia-east1-docker.pkg.dev/asdf/catladder-deploy/pan-test-app/review/api --quiet --delete-tags",
1281
1269
  "set -e",
@@ -2004,7 +1992,10 @@ EOF",
2004
1992
  "script": [
2005
1993
  "ensureNodeDockerfile",
2006
1994
  "echo -e "\\e[0Ksection_start:$(date +%s):docker-login[collapsed=true]\\r\\e[0KDocker Login"",
2007
- "docker login --username gitlab-ci-token --password $CI_JOB_TOKEN $CI_REGISTRY",
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",
2008
1999
  "echo -e "\\e[0Ksection_end:$(date +%s):docker-login\\r\\e[0K"",
2009
2000
  "echo -e "\\e[0Ksection_start:$(date +%s):docker-build[collapsed=true]\\r\\e[0KDocker build"",
2010
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",
@@ -2029,7 +2020,7 @@ EOF",
2029
2020
  "DOCKERFILE_ADDITIONS": undefined,
2030
2021
  "DOCKERFILE_ADDITIONS_END": undefined,
2031
2022
  "DOCKER_BUILDKIT": "1",
2032
- "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",
2033
2024
  "DOCKER_COPY_AND_INSTALL_APP": "COPY --chown=node:node $APP_DIR .
2034
2025
  RUN yarn plugin import workspace-tools
2035
2026
  RUN yarn workspaces focus --production && yarn rebuild",
@@ -2040,11 +2031,9 @@ COPY --chown=node:node .yarn /app/.yarn",
2040
2031
  "DOCKER_DIR": ".",
2041
2032
  "DOCKER_DRIVER": "overlay2",
2042
2033
  "DOCKER_HOST": "tcp://0.0.0.0:2375",
2043
- "DOCKER_IMAGE": "$DOCKER_REGISTRY_IMAGE_PATH/$DOCKER_IMAGE_NAME",
2044
- "DOCKER_IMAGE_NAME": "prod/api",
2034
+ "DOCKER_IMAGE": "asia-east1-docker.pkg.dev/asdf/catladder-deploy/pan-test-app/prod/api",
2045
2035
  "DOCKER_IMAGE_TAG": "$CI_COMMIT_SHA",
2046
- "DOCKER_REGISTRY": "$CI_REGISTRY",
2047
- "DOCKER_REGISTRY_IMAGE_PATH": "$CI_REGISTRY_IMAGE",
2036
+ "DOCKER_REGISTRY": "asia-east1-docker.pkg.dev",
2048
2037
  "DOCKER_TLS_CERTDIR": "",
2049
2038
  "KUBERNETES_CPU_LIMIT": "1",
2050
2039
  "KUBERNETES_CPU_REQUEST": "0.5",
@@ -2077,7 +2066,10 @@ COPY --chown=node:node .yarn /app/.yarn",
2077
2066
  "script": [
2078
2067
  "ensureNodeDockerfile",
2079
2068
  "echo -e "\\e[0Ksection_start:$(date +%s):docker-login[collapsed=true]\\r\\e[0KDocker Login"",
2080
- "docker login --username gitlab-ci-token --password $CI_JOB_TOKEN $CI_REGISTRY",
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",
2081
2073
  "echo -e "\\e[0Ksection_end:$(date +%s):docker-login\\r\\e[0K"",
2082
2074
  "echo -e "\\e[0Ksection_start:$(date +%s):docker-build[collapsed=true]\\r\\e[0KDocker build"",
2083
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",
@@ -2102,7 +2094,7 @@ COPY --chown=node:node .yarn /app/.yarn",
2102
2094
  "DOCKERFILE_ADDITIONS": undefined,
2103
2095
  "DOCKERFILE_ADDITIONS_END": undefined,
2104
2096
  "DOCKER_BUILDKIT": "1",
2105
- "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",
2106
2098
  "DOCKER_COPY_AND_INSTALL_APP": "COPY --chown=node:node $APP_DIR .
2107
2099
  RUN yarn plugin import workspace-tools
2108
2100
  RUN yarn workspaces focus --production && yarn rebuild",
@@ -2113,11 +2105,9 @@ COPY --chown=node:node .yarn /app/.yarn",
2113
2105
  "DOCKER_DIR": ".",
2114
2106
  "DOCKER_DRIVER": "overlay2",
2115
2107
  "DOCKER_HOST": "tcp://0.0.0.0:2375",
2116
- "DOCKER_IMAGE": "$DOCKER_REGISTRY_IMAGE_PATH/$DOCKER_IMAGE_NAME",
2117
- "DOCKER_IMAGE_NAME": "stage/api",
2108
+ "DOCKER_IMAGE": "asia-east1-docker.pkg.dev/asdf/catladder-deploy/pan-test-app/stage/api",
2118
2109
  "DOCKER_IMAGE_TAG": "$CI_COMMIT_SHA",
2119
- "DOCKER_REGISTRY": "$CI_REGISTRY",
2120
- "DOCKER_REGISTRY_IMAGE_PATH": "$CI_REGISTRY_IMAGE",
2110
+ "DOCKER_REGISTRY": "asia-east1-docker.pkg.dev",
2121
2111
  "DOCKER_TLS_CERTDIR": "",
2122
2112
  "KUBERNETES_CPU_LIMIT": "1",
2123
2113
  "KUBERNETES_CPU_REQUEST": "0.5",
@@ -2174,13 +2164,6 @@ COPY --chown=node:node .yarn /app/.yarn",
2174
2164
  "export GCLOUD_PROJECT_NUMBER=$(gcloud projects describe asdf --format="value(projectNumber)")",
2175
2165
  "echo "GCLOUD_PROJECT_NUMBER: $GCLOUD_PROJECT_NUMBER"",
2176
2166
  "echo -e "\\e[0Ksection_end:$(date +%s):prepare\\r\\e[0K"",
2177
- "echo -e "\\e[0Ksection_start:$(date +%s):pushToArtifactRegistry[collapsed=true]\\r\\e[0KPushing image to artifacts registry"",
2178
- "docker login --username gitlab-ci-token --password $CI_JOB_TOKEN $CI_REGISTRY",
2179
- "gcloud auth configure-docker asia-east1-docker.pkg.dev",
2180
- "docker pull $DOCKER_IMAGE:$DOCKER_IMAGE_TAG",
2181
- "docker tag $DOCKER_IMAGE:$DOCKER_IMAGE_TAG asia-east1-docker.pkg.dev/asdf/catladder-deploy/pan-test-app/prod/api:$DOCKER_IMAGE_TAG",
2182
- "docker push asia-east1-docker.pkg.dev/asdf/catladder-deploy/pan-test-app/prod/api:$DOCKER_IMAGE_TAG",
2183
- "echo -e "\\e[0Ksection_end:$(date +%s):pushToArtifactRegistry\\r\\e[0K"",
2184
2167
  "echo -e "\\e[0Ksection_start:$(date +%s):deploy[collapsed=true]\\r\\e[0KDeploy to cloud run"",
2185
2168
  "echo "$ENV_VARS" > ____envvars.yaml",
2186
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",
@@ -2188,6 +2171,7 @@ COPY --chown=node:node .yarn /app/.yarn",
2188
2171
  "echo -e "\\e[0Ksection_start:$(date +%s):cleanup[collapsed=true]\\r\\e[0KCleanup"",
2189
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",
2190
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",
2191
2175
  "echo -e "\\e[0Ksection_end:$(date +%s):cleanup\\r\\e[0K"",
2192
2176
  "echo Uploading SBOM to Dependency Track",
2193
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",
@@ -2208,14 +2192,12 @@ COPY --chown=node:node .yarn /app/.yarn",
2208
2192
  "BUILD_INFO_ID": "some-id",
2209
2193
  "CLOUDSDK_CORE_DISABLE_PROMPTS": "1",
2210
2194
  "DOCKER_BUILDKIT": "1",
2211
- "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",
2212
2196
  "DOCKER_DRIVER": "overlay2",
2213
2197
  "DOCKER_HOST": "tcp://0.0.0.0:2375",
2214
- "DOCKER_IMAGE": "$DOCKER_REGISTRY_IMAGE_PATH/$DOCKER_IMAGE_NAME",
2215
- "DOCKER_IMAGE_NAME": "prod/api",
2198
+ "DOCKER_IMAGE": "asia-east1-docker.pkg.dev/asdf/catladder-deploy/pan-test-app/prod/api",
2216
2199
  "DOCKER_IMAGE_TAG": "$CI_COMMIT_SHA",
2217
- "DOCKER_REGISTRY": "$CI_REGISTRY",
2218
- "DOCKER_REGISTRY_IMAGE_PATH": "$CI_REGISTRY_IMAGE",
2200
+ "DOCKER_REGISTRY": "asia-east1-docker.pkg.dev",
2219
2201
  "DOCKER_TLS_CERTDIR": "",
2220
2202
  "ENV_SHORT": "prod",
2221
2203
  "ENV_TYPE": "prod",
@@ -2292,13 +2274,6 @@ _ALL_ENV_VAR_KEYS: '["ENV_SHORT","APP_DIR","ENV_TYPE","BUILD_INFO_ID","BUILD_INF
2292
2274
  "export GCLOUD_PROJECT_NUMBER=$(gcloud projects describe asdf --format="value(projectNumber)")",
2293
2275
  "echo "GCLOUD_PROJECT_NUMBER: $GCLOUD_PROJECT_NUMBER"",
2294
2276
  "echo -e "\\e[0Ksection_end:$(date +%s):prepare\\r\\e[0K"",
2295
- "echo -e "\\e[0Ksection_start:$(date +%s):pushToArtifactRegistry[collapsed=true]\\r\\e[0KPushing image to artifacts registry"",
2296
- "docker login --username gitlab-ci-token --password $CI_JOB_TOKEN $CI_REGISTRY",
2297
- "gcloud auth configure-docker asia-east1-docker.pkg.dev",
2298
- "docker pull $DOCKER_IMAGE:$DOCKER_IMAGE_TAG",
2299
- "docker tag $DOCKER_IMAGE:$DOCKER_IMAGE_TAG asia-east1-docker.pkg.dev/asdf/catladder-deploy/pan-test-app/stage/api:$DOCKER_IMAGE_TAG",
2300
- "docker push asia-east1-docker.pkg.dev/asdf/catladder-deploy/pan-test-app/stage/api:$DOCKER_IMAGE_TAG",
2301
- "echo -e "\\e[0Ksection_end:$(date +%s):pushToArtifactRegistry\\r\\e[0K"",
2302
2277
  "echo -e "\\e[0Ksection_start:$(date +%s):deploy[collapsed=true]\\r\\e[0KDeploy to cloud run"",
2303
2278
  "echo "$ENV_VARS" > ____envvars.yaml",
2304
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",
@@ -2306,6 +2281,7 @@ _ALL_ENV_VAR_KEYS: '["ENV_SHORT","APP_DIR","ENV_TYPE","BUILD_INFO_ID","BUILD_INF
2306
2281
  "echo -e "\\e[0Ksection_start:$(date +%s):cleanup[collapsed=true]\\r\\e[0KCleanup"",
2307
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",
2308
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",
2309
2285
  "echo -e "\\e[0Ksection_end:$(date +%s):cleanup\\r\\e[0K"",
2310
2286
  "echo Uploading SBOM to Dependency Track",
2311
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",
@@ -2326,14 +2302,12 @@ _ALL_ENV_VAR_KEYS: '["ENV_SHORT","APP_DIR","ENV_TYPE","BUILD_INFO_ID","BUILD_INF
2326
2302
  "BUILD_INFO_ID": "some-id",
2327
2303
  "CLOUDSDK_CORE_DISABLE_PROMPTS": "1",
2328
2304
  "DOCKER_BUILDKIT": "1",
2329
- "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",
2330
2306
  "DOCKER_DRIVER": "overlay2",
2331
2307
  "DOCKER_HOST": "tcp://0.0.0.0:2375",
2332
- "DOCKER_IMAGE": "$DOCKER_REGISTRY_IMAGE_PATH/$DOCKER_IMAGE_NAME",
2333
- "DOCKER_IMAGE_NAME": "stage/api",
2308
+ "DOCKER_IMAGE": "asia-east1-docker.pkg.dev/asdf/catladder-deploy/pan-test-app/stage/api",
2334
2309
  "DOCKER_IMAGE_TAG": "$CI_COMMIT_SHA",
2335
- "DOCKER_REGISTRY": "$CI_REGISTRY",
2336
- "DOCKER_REGISTRY_IMAGE_PATH": "$CI_REGISTRY_IMAGE",
2310
+ "DOCKER_REGISTRY": "asia-east1-docker.pkg.dev",
2337
2311
  "DOCKER_TLS_CERTDIR": "",
2338
2312
  "ENV_SHORT": "stage",
2339
2313
  "ENV_TYPE": "stage",
@@ -2395,6 +2369,7 @@ _ALL_ENV_VAR_KEYS: '["ENV_SHORT","APP_DIR","ENV_TYPE","BUILD_INFO_ID","BUILD_INF
2395
2369
  "gcloud auth activate-service-account --key-file="./____keyfile.json"",
2396
2370
  "gcloud run services delete pan-test-app-prod-api --project=asdf --region=asia-east1",
2397
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",
2398
2373
  "echo Disabling component in Dependency Track",
2399
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",
2400
2375
  "set -e",
@@ -2443,6 +2418,7 @@ _ALL_ENV_VAR_KEYS: '["ENV_SHORT","APP_DIR","ENV_TYPE","BUILD_INFO_ID","BUILD_INF
2443
2418
  "gcloud auth activate-service-account --key-file="./____keyfile.json"",
2444
2419
  "gcloud run services delete pan-test-app-stage-api --project=asdf --region=asia-east1",
2445
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",
2446
2422
  "echo Disabling component in Dependency Track",
2447
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",
2448
2424
  "set -e",