@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__/cloud-run-with-sql-reuse-db.ts.snap CHANGED
@@ -165,7 +165,10 @@ exports[`matches snapshot 1`] = `
165
165
  "script": [
166
166
  "ensureNodeDockerfile",
167
167
  "echo -e "\\e[0Ksection_start:$(date +%s):docker-login[collapsed=true]\\r\\e[0KDocker Login"",
168
- "docker login --username gitlab-ci-token --password $CI_JOB_TOKEN $CI_REGISTRY",
168
+ "echo $CL_dev_api_GCLOUD_DEPLOY_credentialsKey > ./____keyfile.json
169
+ ",
170
+ "gcloud auth activate-service-account --key-file="./____keyfile.json"",
171
+ "gcloud auth configure-docker europe-west6-docker.pkg.dev",
169
172
  "echo -e "\\e[0Ksection_end:$(date +%s):docker-login\\r\\e[0K"",
170
173
  "echo -e "\\e[0Ksection_start:$(date +%s):docker-build[collapsed=true]\\r\\e[0KDocker build"",
171
174
  "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",
@@ -190,7 +193,7 @@ exports[`matches snapshot 1`] = `
190
193
  "DOCKERFILE_ADDITIONS": undefined,
191
194
  "DOCKERFILE_ADDITIONS_END": undefined,
192
195
  "DOCKER_BUILDKIT": "1",
193
- "DOCKER_CACHE_IMAGE": "$DOCKER_REGISTRY_IMAGE_PATH/caches/api",
196
+ "DOCKER_CACHE_IMAGE": "europe-west6-docker.pkg.dev/google-project-id/catladder-deploy/pan-test-app/caches/api",
194
197
  "DOCKER_COPY_AND_INSTALL_APP": "COPY --chown=node:node $APP_DIR .
195
198
  RUN yarn plugin import workspace-tools
196
199
  RUN yarn workspaces focus --production && yarn rebuild",
@@ -201,11 +204,9 @@ COPY --chown=node:node .yarn /app/.yarn",
201
204
  "DOCKER_DIR": ".",
202
205
  "DOCKER_DRIVER": "overlay2",
203
206
  "DOCKER_HOST": "tcp://0.0.0.0:2375",
204
- "DOCKER_IMAGE": "$DOCKER_REGISTRY_IMAGE_PATH/$DOCKER_IMAGE_NAME",
205
- "DOCKER_IMAGE_NAME": "dev/api",
207
+ "DOCKER_IMAGE": "europe-west6-docker.pkg.dev/google-project-id/catladder-deploy/pan-test-app/dev/api",
206
208
  "DOCKER_IMAGE_TAG": "$CI_COMMIT_SHA",
207
- "DOCKER_REGISTRY": "$CI_REGISTRY",
208
- "DOCKER_REGISTRY_IMAGE_PATH": "$CI_REGISTRY_IMAGE",
209
+ "DOCKER_REGISTRY": "europe-west6-docker.pkg.dev",
209
210
  "DOCKER_TLS_CERTDIR": "",
210
211
  "KUBERNETES_CPU_LIMIT": "1",
211
212
  "KUBERNETES_CPU_REQUEST": "0.5",
@@ -274,13 +275,6 @@ COPY --chown=node:node .yarn /app/.yarn",
274
275
  "export GCLOUD_PROJECT_NUMBER=$(gcloud projects describe google-project-id --format="value(projectNumber)")",
275
276
  "echo "GCLOUD_PROJECT_NUMBER: $GCLOUD_PROJECT_NUMBER"",
276
277
  "echo -e "\\e[0Ksection_end:$(date +%s):prepare\\r\\e[0K"",
277
- "echo -e "\\e[0Ksection_start:$(date +%s):pushToArtifactRegistry[collapsed=true]\\r\\e[0KPushing image to artifacts registry"",
278
- "docker login --username gitlab-ci-token --password $CI_JOB_TOKEN $CI_REGISTRY",
279
- "gcloud auth configure-docker europe-west6-docker.pkg.dev",
280
- "docker pull $DOCKER_IMAGE:$DOCKER_IMAGE_TAG",
281
- "docker tag $DOCKER_IMAGE:$DOCKER_IMAGE_TAG europe-west6-docker.pkg.dev/google-project-id/catladder-deploy/pan-test-app/dev/api:$DOCKER_IMAGE_TAG",
282
- "docker push europe-west6-docker.pkg.dev/google-project-id/catladder-deploy/pan-test-app/dev/api:$DOCKER_IMAGE_TAG",
283
- "echo -e "\\e[0Ksection_end:$(date +%s):pushToArtifactRegistry\\r\\e[0K"",
284
278
  "echo -e "\\e[0Ksection_start:$(date +%s):deploy[collapsed=true]\\r\\e[0KDeploy to cloud run"",
285
279
  "echo "$ENV_VARS" > ____envvars.yaml",
286
280
  "set +e",
@@ -292,6 +286,7 @@ COPY --chown=node:node .yarn /app/.yarn",
292
286
  "echo -e "\\e[0Ksection_start:$(date +%s):cleanup[collapsed=true]\\r\\e[0KCleanup"",
293
287
  "gcloud run revisions list --project=google-project-id --region=europe-west6 --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=google-project-id --region=europe-west6 --quiet $revisionname ; done",
294
288
  "gcloud artifacts docker images list europe-west6-docker.pkg.dev/google-project-id/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 europe-west6-docker.pkg.dev/google-project-id/catladder-deploy/pan-test-app/dev/api@$version --quiet --delete-tags; done",
289
+ "gcloud artifacts docker images list europe-west6-docker.pkg.dev/google-project-id/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 europe-west6-docker.pkg.dev/google-project-id/catladder-deploy/pan-test-app/caches/api@$version --quiet --delete-tags; done",
295
290
  "echo -e "\\e[0Ksection_end:$(date +%s):cleanup\\r\\e[0K"",
296
291
  "echo Uploading SBOM to Dependency Track",
297
292
  "/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",
@@ -318,14 +313,12 @@ COPY --chown=node:node .yarn /app/.yarn",
318
313
  "DB_PASSWORD": "$CL_dev_api_DB_PASSWORD",
319
314
  "DB_USER": "my-user",
320
315
  "DOCKER_BUILDKIT": "1",
321
- "DOCKER_CACHE_IMAGE": "$DOCKER_REGISTRY_IMAGE_PATH/caches/api",
316
+ "DOCKER_CACHE_IMAGE": "europe-west6-docker.pkg.dev/google-project-id/catladder-deploy/pan-test-app/caches/api",
322
317
  "DOCKER_DRIVER": "overlay2",
323
318
  "DOCKER_HOST": "tcp://0.0.0.0:2375",
324
- "DOCKER_IMAGE": "$DOCKER_REGISTRY_IMAGE_PATH/$DOCKER_IMAGE_NAME",
325
- "DOCKER_IMAGE_NAME": "dev/api",
319
+ "DOCKER_IMAGE": "europe-west6-docker.pkg.dev/google-project-id/catladder-deploy/pan-test-app/dev/api",
326
320
  "DOCKER_IMAGE_TAG": "$CI_COMMIT_SHA",
327
- "DOCKER_REGISTRY": "$CI_REGISTRY",
328
- "DOCKER_REGISTRY_IMAGE_PATH": "$CI_REGISTRY_IMAGE",
321
+ "DOCKER_REGISTRY": "europe-west6-docker.pkg.dev",
329
322
  "DOCKER_TLS_CERTDIR": "",
330
323
  "ENV_SHORT": "dev",
331
324
  "ENV_TYPE": "dev",
@@ -393,6 +386,7 @@ _ALL_ENV_VAR_KEYS: '["ENV_SHORT","APP_DIR","ENV_TYPE","BUILD_INFO_ID","BUILD_INF
393
386
  "gcloud auth activate-service-account --key-file="./____keyfile.json"",
394
387
  "gcloud run services delete pan-test-app-dev-api --project=google-project-id --region=europe-west6",
395
388
  "gcloud artifacts docker images delete europe-west6-docker.pkg.dev/google-project-id/catladder-deploy/pan-test-app/dev/api --quiet --delete-tags",
389
+ "gcloud artifacts docker images list europe-west6-docker.pkg.dev/google-project-id/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 europe-west6-docker.pkg.dev/google-project-id/catladder-deploy/pan-test-app/caches/api@$version --quiet --delete-tags; done",
396
390
  "echo Disabling component in Dependency Track",
397
391
  "/dtrackuploader https://dep.panter.swiss/ "$DT_KEY_PROD" disable "pan-test-app/api" "https://pan-test-app-dev-api-unknown-host.example.com" || true",
398
392
  "set -e",
@@ -662,7 +656,10 @@ _ALL_ENV_VAR_KEYS: '["ENV_SHORT","APP_DIR","ENV_TYPE","BUILD_INFO_ID","BUILD_INF
662
656
  "script": [
663
657
  "ensureNodeDockerfile",
664
658
  "echo -e "\\e[0Ksection_start:$(date +%s):docker-login[collapsed=true]\\r\\e[0KDocker Login"",
665
- "docker login --username gitlab-ci-token --password $CI_JOB_TOKEN $CI_REGISTRY",
659
+ "echo $CL_dev_worker_GCLOUD_DEPLOY_credentialsKey > ./____keyfile.json
660
+ ",
661
+ "gcloud auth activate-service-account --key-file="./____keyfile.json"",
662
+ "gcloud auth configure-docker europe-west6-docker.pkg.dev",
666
663
  "echo -e "\\e[0Ksection_end:$(date +%s):docker-login\\r\\e[0K"",
667
664
  "echo -e "\\e[0Ksection_start:$(date +%s):docker-build[collapsed=true]\\r\\e[0KDocker build"",
668
665
  "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",
@@ -687,7 +684,7 @@ _ALL_ENV_VAR_KEYS: '["ENV_SHORT","APP_DIR","ENV_TYPE","BUILD_INFO_ID","BUILD_INF
687
684
  "DOCKERFILE_ADDITIONS": undefined,
688
685
  "DOCKERFILE_ADDITIONS_END": undefined,
689
686
  "DOCKER_BUILDKIT": "1",
690
- "DOCKER_CACHE_IMAGE": "$DOCKER_REGISTRY_IMAGE_PATH/caches/worker",
687
+ "DOCKER_CACHE_IMAGE": "europe-west6-docker.pkg.dev/google-project-id/catladder-deploy/pan-test-app/caches/worker",
691
688
  "DOCKER_COPY_AND_INSTALL_APP": "COPY --chown=node:node $APP_DIR .
692
689
  RUN yarn plugin import workspace-tools
693
690
  RUN yarn workspaces focus --production && yarn rebuild",
@@ -698,11 +695,9 @@ COPY --chown=node:node .yarn /app/.yarn",
698
695
  "DOCKER_DIR": ".",
699
696
  "DOCKER_DRIVER": "overlay2",
700
697
  "DOCKER_HOST": "tcp://0.0.0.0:2375",
701
- "DOCKER_IMAGE": "$DOCKER_REGISTRY_IMAGE_PATH/$DOCKER_IMAGE_NAME",
702
- "DOCKER_IMAGE_NAME": "dev/worker",
698
+ "DOCKER_IMAGE": "europe-west6-docker.pkg.dev/google-project-id/catladder-deploy/pan-test-app/dev/worker",
703
699
  "DOCKER_IMAGE_TAG": "$CI_COMMIT_SHA",
704
- "DOCKER_REGISTRY": "$CI_REGISTRY",
705
- "DOCKER_REGISTRY_IMAGE_PATH": "$CI_REGISTRY_IMAGE",
700
+ "DOCKER_REGISTRY": "europe-west6-docker.pkg.dev",
706
701
  "DOCKER_TLS_CERTDIR": "",
707
702
  "KUBERNETES_CPU_LIMIT": "1",
708
703
  "KUBERNETES_CPU_REQUEST": "0.5",
@@ -771,13 +766,6 @@ COPY --chown=node:node .yarn /app/.yarn",
771
766
  "export GCLOUD_PROJECT_NUMBER=$(gcloud projects describe google-project-id --format="value(projectNumber)")",
772
767
  "echo "GCLOUD_PROJECT_NUMBER: $GCLOUD_PROJECT_NUMBER"",
773
768
  "echo -e "\\e[0Ksection_end:$(date +%s):prepare\\r\\e[0K"",
774
- "echo -e "\\e[0Ksection_start:$(date +%s):pushToArtifactRegistry[collapsed=true]\\r\\e[0KPushing image to artifacts registry"",
775
- "docker login --username gitlab-ci-token --password $CI_JOB_TOKEN $CI_REGISTRY",
776
- "gcloud auth configure-docker europe-west6-docker.pkg.dev",
777
- "docker pull $DOCKER_IMAGE:$DOCKER_IMAGE_TAG",
778
- "docker tag $DOCKER_IMAGE:$DOCKER_IMAGE_TAG europe-west6-docker.pkg.dev/google-project-id/catladder-deploy/pan-test-app/dev/worker:$DOCKER_IMAGE_TAG",
779
- "docker push europe-west6-docker.pkg.dev/google-project-id/catladder-deploy/pan-test-app/dev/worker:$DOCKER_IMAGE_TAG",
780
- "echo -e "\\e[0Ksection_end:$(date +%s):pushToArtifactRegistry\\r\\e[0K"",
781
769
  "echo -e "\\e[0Ksection_start:$(date +%s):deploy[collapsed=true]\\r\\e[0KDeploy to cloud run"",
782
770
  "echo "$ENV_VARS" > ____envvars.yaml",
783
771
  "set +e",
@@ -789,6 +777,7 @@ COPY --chown=node:node .yarn /app/.yarn",
789
777
  "echo -e "\\e[0Ksection_start:$(date +%s):cleanup[collapsed=true]\\r\\e[0KCleanup"",
790
778
  "gcloud run revisions list --project=google-project-id --region=europe-west6 --service=pan-test-app-dev-worker --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=google-project-id --region=europe-west6 --quiet $revisionname ; done",
791
779
  "gcloud artifacts docker images list europe-west6-docker.pkg.dev/google-project-id/catladder-deploy/pan-test-app/dev/worker --sort-by=~CREATE_TIME --format="value(version)" | tail -n +2 | while read -r version; do gcloud artifacts docker images delete europe-west6-docker.pkg.dev/google-project-id/catladder-deploy/pan-test-app/dev/worker@$version --quiet --delete-tags; done",
780
+ "gcloud artifacts docker images list europe-west6-docker.pkg.dev/google-project-id/catladder-deploy/pan-test-app/caches/worker --sort-by=~CREATE_TIME --format="value(version)" | tail -n +2 | while read -r version; do gcloud artifacts docker images delete europe-west6-docker.pkg.dev/google-project-id/catladder-deploy/pan-test-app/caches/worker@$version --quiet --delete-tags; done",
792
781
  "echo -e "\\e[0Ksection_end:$(date +%s):cleanup\\r\\e[0K"",
793
782
  "echo Uploading SBOM to Dependency Track",
794
783
  "/dtrackuploader https://dep.panter.swiss/ "$DT_KEY_PROD" upload "pan-test-app/worker" "https://pan-test-app-dev-worker-unknown-host.example.com" "__sbom.json" vex.json || true",
@@ -815,14 +804,12 @@ COPY --chown=node:node .yarn /app/.yarn",
815
804
  "DB_PASSWORD": "$CL_dev_api_DB_PASSWORD",
816
805
  "DB_USER": "my-user",
817
806
  "DOCKER_BUILDKIT": "1",
818
- "DOCKER_CACHE_IMAGE": "$DOCKER_REGISTRY_IMAGE_PATH/caches/worker",
807
+ "DOCKER_CACHE_IMAGE": "europe-west6-docker.pkg.dev/google-project-id/catladder-deploy/pan-test-app/caches/worker",
819
808
  "DOCKER_DRIVER": "overlay2",
820
809
  "DOCKER_HOST": "tcp://0.0.0.0:2375",
821
- "DOCKER_IMAGE": "$DOCKER_REGISTRY_IMAGE_PATH/$DOCKER_IMAGE_NAME",
822
- "DOCKER_IMAGE_NAME": "dev/worker",
810
+ "DOCKER_IMAGE": "europe-west6-docker.pkg.dev/google-project-id/catladder-deploy/pan-test-app/dev/worker",
823
811
  "DOCKER_IMAGE_TAG": "$CI_COMMIT_SHA",
824
- "DOCKER_REGISTRY": "$CI_REGISTRY",
825
- "DOCKER_REGISTRY_IMAGE_PATH": "$CI_REGISTRY_IMAGE",
812
+ "DOCKER_REGISTRY": "europe-west6-docker.pkg.dev",
826
813
  "DOCKER_TLS_CERTDIR": "",
827
814
  "ENV_SHORT": "dev",
828
815
  "ENV_TYPE": "dev",
@@ -890,6 +877,7 @@ _ALL_ENV_VAR_KEYS: '["ENV_SHORT","APP_DIR","ENV_TYPE","BUILD_INFO_ID","BUILD_INF
890
877
  "gcloud auth activate-service-account --key-file="./____keyfile.json"",
891
878
  "gcloud run services delete pan-test-app-dev-worker --project=google-project-id --region=europe-west6",
892
879
  "gcloud artifacts docker images delete europe-west6-docker.pkg.dev/google-project-id/catladder-deploy/pan-test-app/dev/worker --quiet --delete-tags",
880
+ "gcloud artifacts docker images list europe-west6-docker.pkg.dev/google-project-id/catladder-deploy/pan-test-app/caches/worker --sort-by=~CREATE_TIME --format="value(version)" | tail -n +2 | while read -r version; do gcloud artifacts docker images delete europe-west6-docker.pkg.dev/google-project-id/catladder-deploy/pan-test-app/caches/worker@$version --quiet --delete-tags; done",
893
881
  "echo Disabling component in Dependency Track",
894
882
  "/dtrackuploader https://dep.panter.swiss/ "$DT_KEY_PROD" disable "pan-test-app/worker" "https://pan-test-app-dev-worker-unknown-host.example.com" || true",
895
883
  "set -e",
@@ -1232,7 +1220,10 @@ _ALL_ENV_VAR_KEYS: '["ENV_SHORT","APP_DIR","ENV_TYPE","BUILD_INFO_ID","BUILD_INF
1232
1220
  "script": [
1233
1221
  "ensureNodeDockerfile",
1234
1222
  "echo -e "\\e[0Ksection_start:$(date +%s):docker-login[collapsed=true]\\r\\e[0KDocker Login"",
1235
- "docker login --username gitlab-ci-token --password $CI_JOB_TOKEN $CI_REGISTRY",
1223
+ "echo $CL_review_api_GCLOUD_DEPLOY_credentialsKey > ./____keyfile.json
1224
+ ",
1225
+ "gcloud auth activate-service-account --key-file="./____keyfile.json"",
1226
+ "gcloud auth configure-docker europe-west6-docker.pkg.dev",
1236
1227
  "echo -e "\\e[0Ksection_end:$(date +%s):docker-login\\r\\e[0K"",
1237
1228
  "echo -e "\\e[0Ksection_start:$(date +%s):docker-build[collapsed=true]\\r\\e[0KDocker build"",
1238
1229
  "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",
@@ -1257,7 +1248,7 @@ _ALL_ENV_VAR_KEYS: '["ENV_SHORT","APP_DIR","ENV_TYPE","BUILD_INFO_ID","BUILD_INF
1257
1248
  "DOCKERFILE_ADDITIONS": undefined,
1258
1249
  "DOCKERFILE_ADDITIONS_END": undefined,
1259
1250
  "DOCKER_BUILDKIT": "1",
1260
- "DOCKER_CACHE_IMAGE": "$DOCKER_REGISTRY_IMAGE_PATH/caches/api",
1251
+ "DOCKER_CACHE_IMAGE": "europe-west6-docker.pkg.dev/google-project-id/catladder-deploy/pan-test-app/caches/api",
1261
1252
  "DOCKER_COPY_AND_INSTALL_APP": "COPY --chown=node:node $APP_DIR .
1262
1253
  RUN yarn plugin import workspace-tools
1263
1254
  RUN yarn workspaces focus --production && yarn rebuild",
@@ -1268,11 +1259,9 @@ COPY --chown=node:node .yarn /app/.yarn",
1268
1259
  "DOCKER_DIR": ".",
1269
1260
  "DOCKER_DRIVER": "overlay2",
1270
1261
  "DOCKER_HOST": "tcp://0.0.0.0:2375",
1271
- "DOCKER_IMAGE": "$DOCKER_REGISTRY_IMAGE_PATH/$DOCKER_IMAGE_NAME",
1272
- "DOCKER_IMAGE_NAME": "review/api",
1262
+ "DOCKER_IMAGE": "europe-west6-docker.pkg.dev/google-project-id/catladder-deploy/pan-test-app/review/api/mr1234",
1273
1263
  "DOCKER_IMAGE_TAG": "$CI_COMMIT_SHA",
1274
- "DOCKER_REGISTRY": "$CI_REGISTRY",
1275
- "DOCKER_REGISTRY_IMAGE_PATH": "$CI_REGISTRY_IMAGE",
1264
+ "DOCKER_REGISTRY": "europe-west6-docker.pkg.dev",
1276
1265
  "DOCKER_TLS_CERTDIR": "",
1277
1266
  "KUBERNETES_CPU_LIMIT": "1",
1278
1267
  "KUBERNETES_CPU_REQUEST": "0.5",
@@ -1341,13 +1330,6 @@ COPY --chown=node:node .yarn /app/.yarn",
1341
1330
  "export GCLOUD_PROJECT_NUMBER=$(gcloud projects describe google-project-id --format="value(projectNumber)")",
1342
1331
  "echo "GCLOUD_PROJECT_NUMBER: $GCLOUD_PROJECT_NUMBER"",
1343
1332
  "echo -e "\\e[0Ksection_end:$(date +%s):prepare\\r\\e[0K"",
1344
- "echo -e "\\e[0Ksection_start:$(date +%s):pushToArtifactRegistry[collapsed=true]\\r\\e[0KPushing image to artifacts registry"",
1345
- "docker login --username gitlab-ci-token --password $CI_JOB_TOKEN $CI_REGISTRY",
1346
- "gcloud auth configure-docker europe-west6-docker.pkg.dev",
1347
- "docker pull $DOCKER_IMAGE:$DOCKER_IMAGE_TAG",
1348
- "docker tag $DOCKER_IMAGE:$DOCKER_IMAGE_TAG europe-west6-docker.pkg.dev/google-project-id/catladder-deploy/pan-test-app/review/api/mr1234:$DOCKER_IMAGE_TAG",
1349
- "docker push europe-west6-docker.pkg.dev/google-project-id/catladder-deploy/pan-test-app/review/api/mr1234:$DOCKER_IMAGE_TAG",
1350
- "echo -e "\\e[0Ksection_end:$(date +%s):pushToArtifactRegistry\\r\\e[0K"",
1351
1333
  "echo -e "\\e[0Ksection_start:$(date +%s):deploy[collapsed=true]\\r\\e[0KDeploy to cloud run"",
1352
1334
  "echo "$ENV_VARS" > ____envvars.yaml",
1353
1335
  "set +e",
@@ -1359,6 +1341,7 @@ COPY --chown=node:node .yarn /app/.yarn",
1359
1341
  "echo -e "\\e[0Ksection_start:$(date +%s):cleanup[collapsed=true]\\r\\e[0KCleanup"",
1360
1342
  "gcloud run revisions list --project=google-project-id --region=europe-west6 --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=google-project-id --region=europe-west6 --quiet $revisionname ; done",
1361
1343
  "gcloud artifacts docker images list europe-west6-docker.pkg.dev/google-project-id/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 europe-west6-docker.pkg.dev/google-project-id/catladder-deploy/pan-test-app/review/api/mr1234@$version --quiet --delete-tags; done",
1344
+ "gcloud artifacts docker images list europe-west6-docker.pkg.dev/google-project-id/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 europe-west6-docker.pkg.dev/google-project-id/catladder-deploy/pan-test-app/caches/api@$version --quiet --delete-tags; done",
1362
1345
  "set +e",
1363
1346
  "gcloud artifacts docker images delete europe-west6-docker.pkg.dev/google-project-id/catladder-deploy/pan-test-app/review/api --quiet --delete-tags",
1364
1347
  "set -e",
@@ -1388,14 +1371,12 @@ COPY --chown=node:node .yarn /app/.yarn",
1388
1371
  "DB_PASSWORD": "$CL_review_api_DB_PASSWORD",
1389
1372
  "DB_USER": "my-user",
1390
1373
  "DOCKER_BUILDKIT": "1",
1391
- "DOCKER_CACHE_IMAGE": "$DOCKER_REGISTRY_IMAGE_PATH/caches/api",
1374
+ "DOCKER_CACHE_IMAGE": "europe-west6-docker.pkg.dev/google-project-id/catladder-deploy/pan-test-app/caches/api",
1392
1375
  "DOCKER_DRIVER": "overlay2",
1393
1376
  "DOCKER_HOST": "tcp://0.0.0.0:2375",
1394
- "DOCKER_IMAGE": "$DOCKER_REGISTRY_IMAGE_PATH/$DOCKER_IMAGE_NAME",
1395
- "DOCKER_IMAGE_NAME": "review/api",
1377
+ "DOCKER_IMAGE": "europe-west6-docker.pkg.dev/google-project-id/catladder-deploy/pan-test-app/review/api/mr1234",
1396
1378
  "DOCKER_IMAGE_TAG": "$CI_COMMIT_SHA",
1397
- "DOCKER_REGISTRY": "$CI_REGISTRY",
1398
- "DOCKER_REGISTRY_IMAGE_PATH": "$CI_REGISTRY_IMAGE",
1379
+ "DOCKER_REGISTRY": "europe-west6-docker.pkg.dev",
1399
1380
  "DOCKER_TLS_CERTDIR": "",
1400
1381
  "ENV_SHORT": "review",
1401
1382
  "ENV_TYPE": "review",
@@ -1472,6 +1453,7 @@ _ALL_ENV_VAR_KEYS: '["ENV_SHORT","APP_DIR","ENV_TYPE","BUILD_INFO_ID","BUILD_INF
1472
1453
  done
1473
1454
  ",
1474
1455
  "gcloud artifacts docker images delete europe-west6-docker.pkg.dev/google-project-id/catladder-deploy/pan-test-app/review/api/mr1234 --quiet --delete-tags",
1456
+ "gcloud artifacts docker images list europe-west6-docker.pkg.dev/google-project-id/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 europe-west6-docker.pkg.dev/google-project-id/catladder-deploy/pan-test-app/caches/api@$version --quiet --delete-tags; done",
1475
1457
  "set +e",
1476
1458
  "gcloud artifacts docker images delete europe-west6-docker.pkg.dev/google-project-id/catladder-deploy/pan-test-app/review/api --quiet --delete-tags",
1477
1459
  "set -e",
@@ -1744,7 +1726,10 @@ _ALL_ENV_VAR_KEYS: '["ENV_SHORT","APP_DIR","ENV_TYPE","BUILD_INFO_ID","BUILD_INF
1744
1726
  "script": [
1745
1727
  "ensureNodeDockerfile",
1746
1728
  "echo -e "\\e[0Ksection_start:$(date +%s):docker-login[collapsed=true]\\r\\e[0KDocker Login"",
1747
- "docker login --username gitlab-ci-token --password $CI_JOB_TOKEN $CI_REGISTRY",
1729
+ "echo $CL_review_worker_GCLOUD_DEPLOY_credentialsKey > ./____keyfile.json
1730
+ ",
1731
+ "gcloud auth activate-service-account --key-file="./____keyfile.json"",
1732
+ "gcloud auth configure-docker europe-west6-docker.pkg.dev",
1748
1733
  "echo -e "\\e[0Ksection_end:$(date +%s):docker-login\\r\\e[0K"",
1749
1734
  "echo -e "\\e[0Ksection_start:$(date +%s):docker-build[collapsed=true]\\r\\e[0KDocker build"",
1750
1735
  "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",
@@ -1769,7 +1754,7 @@ _ALL_ENV_VAR_KEYS: '["ENV_SHORT","APP_DIR","ENV_TYPE","BUILD_INFO_ID","BUILD_INF
1769
1754
  "DOCKERFILE_ADDITIONS": undefined,
1770
1755
  "DOCKERFILE_ADDITIONS_END": undefined,
1771
1756
  "DOCKER_BUILDKIT": "1",
1772
- "DOCKER_CACHE_IMAGE": "$DOCKER_REGISTRY_IMAGE_PATH/caches/worker",
1757
+ "DOCKER_CACHE_IMAGE": "europe-west6-docker.pkg.dev/google-project-id/catladder-deploy/pan-test-app/caches/worker",
1773
1758
  "DOCKER_COPY_AND_INSTALL_APP": "COPY --chown=node:node $APP_DIR .
1774
1759
  RUN yarn plugin import workspace-tools
1775
1760
  RUN yarn workspaces focus --production && yarn rebuild",
@@ -1780,11 +1765,9 @@ COPY --chown=node:node .yarn /app/.yarn",
1780
1765
  "DOCKER_DIR": ".",
1781
1766
  "DOCKER_DRIVER": "overlay2",
1782
1767
  "DOCKER_HOST": "tcp://0.0.0.0:2375",
1783
- "DOCKER_IMAGE": "$DOCKER_REGISTRY_IMAGE_PATH/$DOCKER_IMAGE_NAME",
1784
- "DOCKER_IMAGE_NAME": "review/worker",
1768
+ "DOCKER_IMAGE": "europe-west6-docker.pkg.dev/google-project-id/catladder-deploy/pan-test-app/review/worker/mr1234",
1785
1769
  "DOCKER_IMAGE_TAG": "$CI_COMMIT_SHA",
1786
- "DOCKER_REGISTRY": "$CI_REGISTRY",
1787
- "DOCKER_REGISTRY_IMAGE_PATH": "$CI_REGISTRY_IMAGE",
1770
+ "DOCKER_REGISTRY": "europe-west6-docker.pkg.dev",
1788
1771
  "DOCKER_TLS_CERTDIR": "",
1789
1772
  "KUBERNETES_CPU_LIMIT": "1",
1790
1773
  "KUBERNETES_CPU_REQUEST": "0.5",
@@ -1853,13 +1836,6 @@ COPY --chown=node:node .yarn /app/.yarn",
1853
1836
  "export GCLOUD_PROJECT_NUMBER=$(gcloud projects describe google-project-id --format="value(projectNumber)")",
1854
1837
  "echo "GCLOUD_PROJECT_NUMBER: $GCLOUD_PROJECT_NUMBER"",
1855
1838
  "echo -e "\\e[0Ksection_end:$(date +%s):prepare\\r\\e[0K"",
1856
- "echo -e "\\e[0Ksection_start:$(date +%s):pushToArtifactRegistry[collapsed=true]\\r\\e[0KPushing image to artifacts registry"",
1857
- "docker login --username gitlab-ci-token --password $CI_JOB_TOKEN $CI_REGISTRY",
1858
- "gcloud auth configure-docker europe-west6-docker.pkg.dev",
1859
- "docker pull $DOCKER_IMAGE:$DOCKER_IMAGE_TAG",
1860
- "docker tag $DOCKER_IMAGE:$DOCKER_IMAGE_TAG europe-west6-docker.pkg.dev/google-project-id/catladder-deploy/pan-test-app/review/worker/mr1234:$DOCKER_IMAGE_TAG",
1861
- "docker push europe-west6-docker.pkg.dev/google-project-id/catladder-deploy/pan-test-app/review/worker/mr1234:$DOCKER_IMAGE_TAG",
1862
- "echo -e "\\e[0Ksection_end:$(date +%s):pushToArtifactRegistry\\r\\e[0K"",
1863
1839
  "echo -e "\\e[0Ksection_start:$(date +%s):deploy[collapsed=true]\\r\\e[0KDeploy to cloud run"",
1864
1840
  "echo "$ENV_VARS" > ____envvars.yaml",
1865
1841
  "set +e",
@@ -1871,6 +1847,7 @@ COPY --chown=node:node .yarn /app/.yarn",
1871
1847
  "echo -e "\\e[0Ksection_start:$(date +%s):cleanup[collapsed=true]\\r\\e[0KCleanup"",
1872
1848
  "gcloud run revisions list --project=google-project-id --region=europe-west6 --service=pan-test-app-review-mr1234-worker --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=google-project-id --region=europe-west6 --quiet $revisionname ; done",
1873
1849
  "gcloud artifacts docker images list europe-west6-docker.pkg.dev/google-project-id/catladder-deploy/pan-test-app/review/worker/mr1234 --sort-by=~CREATE_TIME --format="value(version)" | tail -n +2 | while read -r version; do gcloud artifacts docker images delete europe-west6-docker.pkg.dev/google-project-id/catladder-deploy/pan-test-app/review/worker/mr1234@$version --quiet --delete-tags; done",
1850
+ "gcloud artifacts docker images list europe-west6-docker.pkg.dev/google-project-id/catladder-deploy/pan-test-app/caches/worker --sort-by=~CREATE_TIME --format="value(version)" | tail -n +2 | while read -r version; do gcloud artifacts docker images delete europe-west6-docker.pkg.dev/google-project-id/catladder-deploy/pan-test-app/caches/worker@$version --quiet --delete-tags; done",
1874
1851
  "set +e",
1875
1852
  "gcloud artifacts docker images delete europe-west6-docker.pkg.dev/google-project-id/catladder-deploy/pan-test-app/review/worker --quiet --delete-tags",
1876
1853
  "set -e",
@@ -1900,14 +1877,12 @@ COPY --chown=node:node .yarn /app/.yarn",
1900
1877
  "DB_PASSWORD": "$CL_review_api_DB_PASSWORD",
1901
1878
  "DB_USER": "my-user",
1902
1879
  "DOCKER_BUILDKIT": "1",
1903
- "DOCKER_CACHE_IMAGE": "$DOCKER_REGISTRY_IMAGE_PATH/caches/worker",
1880
+ "DOCKER_CACHE_IMAGE": "europe-west6-docker.pkg.dev/google-project-id/catladder-deploy/pan-test-app/caches/worker",
1904
1881
  "DOCKER_DRIVER": "overlay2",
1905
1882
  "DOCKER_HOST": "tcp://0.0.0.0:2375",
1906
- "DOCKER_IMAGE": "$DOCKER_REGISTRY_IMAGE_PATH/$DOCKER_IMAGE_NAME",
1907
- "DOCKER_IMAGE_NAME": "review/worker",
1883
+ "DOCKER_IMAGE": "europe-west6-docker.pkg.dev/google-project-id/catladder-deploy/pan-test-app/review/worker/mr1234",
1908
1884
  "DOCKER_IMAGE_TAG": "$CI_COMMIT_SHA",
1909
- "DOCKER_REGISTRY": "$CI_REGISTRY",
1910
- "DOCKER_REGISTRY_IMAGE_PATH": "$CI_REGISTRY_IMAGE",
1885
+ "DOCKER_REGISTRY": "europe-west6-docker.pkg.dev",
1911
1886
  "DOCKER_TLS_CERTDIR": "",
1912
1887
  "ENV_SHORT": "review",
1913
1888
  "ENV_TYPE": "review",
@@ -1984,6 +1959,7 @@ _ALL_ENV_VAR_KEYS: '["ENV_SHORT","APP_DIR","ENV_TYPE","BUILD_INFO_ID","BUILD_INF
1984
1959
  done
1985
1960
  ",
1986
1961
  "gcloud artifacts docker images delete europe-west6-docker.pkg.dev/google-project-id/catladder-deploy/pan-test-app/review/worker/mr1234 --quiet --delete-tags",
1962
+ "gcloud artifacts docker images list europe-west6-docker.pkg.dev/google-project-id/catladder-deploy/pan-test-app/caches/worker --sort-by=~CREATE_TIME --format="value(version)" | tail -n +2 | while read -r version; do gcloud artifacts docker images delete europe-west6-docker.pkg.dev/google-project-id/catladder-deploy/pan-test-app/caches/worker@$version --quiet --delete-tags; done",
1987
1963
  "set +e",
1988
1964
  "gcloud artifacts docker images delete europe-west6-docker.pkg.dev/google-project-id/catladder-deploy/pan-test-app/review/worker --quiet --delete-tags",
1989
1965
  "set -e",
@@ -2370,7 +2346,10 @@ _ALL_ENV_VAR_KEYS: '["ENV_SHORT","APP_DIR","ENV_TYPE","BUILD_INFO_ID","BUILD_INF
2370
2346
  "script": [
2371
2347
  "ensureNodeDockerfile",
2372
2348
  "echo -e "\\e[0Ksection_start:$(date +%s):docker-login[collapsed=true]\\r\\e[0KDocker Login"",
2373
- "docker login --username gitlab-ci-token --password $CI_JOB_TOKEN $CI_REGISTRY",
2349
+ "echo $CL_prod_api_GCLOUD_DEPLOY_credentialsKey > ./____keyfile.json
2350
+ ",
2351
+ "gcloud auth activate-service-account --key-file="./____keyfile.json"",
2352
+ "gcloud auth configure-docker europe-west6-docker.pkg.dev",
2374
2353
  "echo -e "\\e[0Ksection_end:$(date +%s):docker-login\\r\\e[0K"",
2375
2354
  "echo -e "\\e[0Ksection_start:$(date +%s):docker-build[collapsed=true]\\r\\e[0KDocker build"",
2376
2355
  "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",
@@ -2395,7 +2374,7 @@ _ALL_ENV_VAR_KEYS: '["ENV_SHORT","APP_DIR","ENV_TYPE","BUILD_INFO_ID","BUILD_INF
2395
2374
  "DOCKERFILE_ADDITIONS": undefined,
2396
2375
  "DOCKERFILE_ADDITIONS_END": undefined,
2397
2376
  "DOCKER_BUILDKIT": "1",
2398
- "DOCKER_CACHE_IMAGE": "$DOCKER_REGISTRY_IMAGE_PATH/caches/api",
2377
+ "DOCKER_CACHE_IMAGE": "europe-west6-docker.pkg.dev/google-project-id/catladder-deploy/pan-test-app/caches/api",
2399
2378
  "DOCKER_COPY_AND_INSTALL_APP": "COPY --chown=node:node $APP_DIR .
2400
2379
  RUN yarn plugin import workspace-tools
2401
2380
  RUN yarn workspaces focus --production && yarn rebuild",
@@ -2406,11 +2385,9 @@ COPY --chown=node:node .yarn /app/.yarn",
2406
2385
  "DOCKER_DIR": ".",
2407
2386
  "DOCKER_DRIVER": "overlay2",
2408
2387
  "DOCKER_HOST": "tcp://0.0.0.0:2375",
2409
- "DOCKER_IMAGE": "$DOCKER_REGISTRY_IMAGE_PATH/$DOCKER_IMAGE_NAME",
2410
- "DOCKER_IMAGE_NAME": "prod/api",
2388
+ "DOCKER_IMAGE": "europe-west6-docker.pkg.dev/google-project-id/catladder-deploy/pan-test-app/prod/api",
2411
2389
  "DOCKER_IMAGE_TAG": "$CI_COMMIT_SHA",
2412
- "DOCKER_REGISTRY": "$CI_REGISTRY",
2413
- "DOCKER_REGISTRY_IMAGE_PATH": "$CI_REGISTRY_IMAGE",
2390
+ "DOCKER_REGISTRY": "europe-west6-docker.pkg.dev",
2414
2391
  "DOCKER_TLS_CERTDIR": "",
2415
2392
  "KUBERNETES_CPU_LIMIT": "1",
2416
2393
  "KUBERNETES_CPU_REQUEST": "0.5",
@@ -2443,7 +2420,10 @@ COPY --chown=node:node .yarn /app/.yarn",
2443
2420
  "script": [
2444
2421
  "ensureNodeDockerfile",
2445
2422
  "echo -e "\\e[0Ksection_start:$(date +%s):docker-login[collapsed=true]\\r\\e[0KDocker Login"",
2446
- "docker login --username gitlab-ci-token --password $CI_JOB_TOKEN $CI_REGISTRY",
2423
+ "echo $CL_stage_api_GCLOUD_DEPLOY_credentialsKey > ./____keyfile.json
2424
+ ",
2425
+ "gcloud auth activate-service-account --key-file="./____keyfile.json"",
2426
+ "gcloud auth configure-docker europe-west6-docker.pkg.dev",
2447
2427
  "echo -e "\\e[0Ksection_end:$(date +%s):docker-login\\r\\e[0K"",
2448
2428
  "echo -e "\\e[0Ksection_start:$(date +%s):docker-build[collapsed=true]\\r\\e[0KDocker build"",
2449
2429
  "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",
@@ -2468,7 +2448,7 @@ COPY --chown=node:node .yarn /app/.yarn",
2468
2448
  "DOCKERFILE_ADDITIONS": undefined,
2469
2449
  "DOCKERFILE_ADDITIONS_END": undefined,
2470
2450
  "DOCKER_BUILDKIT": "1",
2471
- "DOCKER_CACHE_IMAGE": "$DOCKER_REGISTRY_IMAGE_PATH/caches/api",
2451
+ "DOCKER_CACHE_IMAGE": "europe-west6-docker.pkg.dev/google-project-id/catladder-deploy/pan-test-app/caches/api",
2472
2452
  "DOCKER_COPY_AND_INSTALL_APP": "COPY --chown=node:node $APP_DIR .
2473
2453
  RUN yarn plugin import workspace-tools
2474
2454
  RUN yarn workspaces focus --production && yarn rebuild",
@@ -2479,11 +2459,9 @@ COPY --chown=node:node .yarn /app/.yarn",
2479
2459
  "DOCKER_DIR": ".",
2480
2460
  "DOCKER_DRIVER": "overlay2",
2481
2461
  "DOCKER_HOST": "tcp://0.0.0.0:2375",
2482
- "DOCKER_IMAGE": "$DOCKER_REGISTRY_IMAGE_PATH/$DOCKER_IMAGE_NAME",
2483
- "DOCKER_IMAGE_NAME": "stage/api",
2462
+ "DOCKER_IMAGE": "europe-west6-docker.pkg.dev/google-project-id/catladder-deploy/pan-test-app/stage/api",
2484
2463
  "DOCKER_IMAGE_TAG": "$CI_COMMIT_SHA",
2485
- "DOCKER_REGISTRY": "$CI_REGISTRY",
2486
- "DOCKER_REGISTRY_IMAGE_PATH": "$CI_REGISTRY_IMAGE",
2464
+ "DOCKER_REGISTRY": "europe-west6-docker.pkg.dev",
2487
2465
  "DOCKER_TLS_CERTDIR": "",
2488
2466
  "KUBERNETES_CPU_LIMIT": "1",
2489
2467
  "KUBERNETES_CPU_REQUEST": "0.5",
@@ -2540,13 +2518,6 @@ COPY --chown=node:node .yarn /app/.yarn",
2540
2518
  "export GCLOUD_PROJECT_NUMBER=$(gcloud projects describe google-project-id --format="value(projectNumber)")",
2541
2519
  "echo "GCLOUD_PROJECT_NUMBER: $GCLOUD_PROJECT_NUMBER"",
2542
2520
  "echo -e "\\e[0Ksection_end:$(date +%s):prepare\\r\\e[0K"",
2543
- "echo -e "\\e[0Ksection_start:$(date +%s):pushToArtifactRegistry[collapsed=true]\\r\\e[0KPushing image to artifacts registry"",
2544
- "docker login --username gitlab-ci-token --password $CI_JOB_TOKEN $CI_REGISTRY",
2545
- "gcloud auth configure-docker europe-west6-docker.pkg.dev",
2546
- "docker pull $DOCKER_IMAGE:$DOCKER_IMAGE_TAG",
2547
- "docker tag $DOCKER_IMAGE:$DOCKER_IMAGE_TAG europe-west6-docker.pkg.dev/google-project-id/catladder-deploy/pan-test-app/prod/api:$DOCKER_IMAGE_TAG",
2548
- "docker push europe-west6-docker.pkg.dev/google-project-id/catladder-deploy/pan-test-app/prod/api:$DOCKER_IMAGE_TAG",
2549
- "echo -e "\\e[0Ksection_end:$(date +%s):pushToArtifactRegistry\\r\\e[0K"",
2550
2521
  "echo -e "\\e[0Ksection_start:$(date +%s):deploy[collapsed=true]\\r\\e[0KDeploy to cloud run"",
2551
2522
  "echo "$ENV_VARS" > ____envvars.yaml",
2552
2523
  "set +e",
@@ -2558,6 +2529,7 @@ COPY --chown=node:node .yarn /app/.yarn",
2558
2529
  "echo -e "\\e[0Ksection_start:$(date +%s):cleanup[collapsed=true]\\r\\e[0KCleanup"",
2559
2530
  "gcloud run revisions list --project=google-project-id --region=europe-west6 --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=google-project-id --region=europe-west6 --quiet $revisionname ; done",
2560
2531
  "gcloud artifacts docker images list europe-west6-docker.pkg.dev/google-project-id/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 europe-west6-docker.pkg.dev/google-project-id/catladder-deploy/pan-test-app/prod/api@$version --quiet --delete-tags; done",
2532
+ "gcloud artifacts docker images list europe-west6-docker.pkg.dev/google-project-id/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 europe-west6-docker.pkg.dev/google-project-id/catladder-deploy/pan-test-app/caches/api@$version --quiet --delete-tags; done",
2561
2533
  "echo -e "\\e[0Ksection_end:$(date +%s):cleanup\\r\\e[0K"",
2562
2534
  "echo Uploading SBOM to Dependency Track",
2563
2535
  "/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",
@@ -2584,14 +2556,12 @@ COPY --chown=node:node .yarn /app/.yarn",
2584
2556
  "DB_PASSWORD": "$CL_prod_api_DB_PASSWORD",
2585
2557
  "DB_USER": "my-user",
2586
2558
  "DOCKER_BUILDKIT": "1",
2587
- "DOCKER_CACHE_IMAGE": "$DOCKER_REGISTRY_IMAGE_PATH/caches/api",
2559
+ "DOCKER_CACHE_IMAGE": "europe-west6-docker.pkg.dev/google-project-id/catladder-deploy/pan-test-app/caches/api",
2588
2560
  "DOCKER_DRIVER": "overlay2",
2589
2561
  "DOCKER_HOST": "tcp://0.0.0.0:2375",
2590
- "DOCKER_IMAGE": "$DOCKER_REGISTRY_IMAGE_PATH/$DOCKER_IMAGE_NAME",
2591
- "DOCKER_IMAGE_NAME": "prod/api",
2562
+ "DOCKER_IMAGE": "europe-west6-docker.pkg.dev/google-project-id/catladder-deploy/pan-test-app/prod/api",
2592
2563
  "DOCKER_IMAGE_TAG": "$CI_COMMIT_SHA",
2593
- "DOCKER_REGISTRY": "$CI_REGISTRY",
2594
- "DOCKER_REGISTRY_IMAGE_PATH": "$CI_REGISTRY_IMAGE",
2564
+ "DOCKER_REGISTRY": "europe-west6-docker.pkg.dev",
2595
2565
  "DOCKER_TLS_CERTDIR": "",
2596
2566
  "ENV_SHORT": "prod",
2597
2567
  "ENV_TYPE": "prod",
@@ -2674,13 +2644,6 @@ _ALL_ENV_VAR_KEYS: '["ENV_SHORT","APP_DIR","ENV_TYPE","BUILD_INFO_ID","BUILD_INF
2674
2644
  "export GCLOUD_PROJECT_NUMBER=$(gcloud projects describe google-project-id --format="value(projectNumber)")",
2675
2645
  "echo "GCLOUD_PROJECT_NUMBER: $GCLOUD_PROJECT_NUMBER"",
2676
2646
  "echo -e "\\e[0Ksection_end:$(date +%s):prepare\\r\\e[0K"",
2677
- "echo -e "\\e[0Ksection_start:$(date +%s):pushToArtifactRegistry[collapsed=true]\\r\\e[0KPushing image to artifacts registry"",
2678
- "docker login --username gitlab-ci-token --password $CI_JOB_TOKEN $CI_REGISTRY",
2679
- "gcloud auth configure-docker europe-west6-docker.pkg.dev",
2680
- "docker pull $DOCKER_IMAGE:$DOCKER_IMAGE_TAG",
2681
- "docker tag $DOCKER_IMAGE:$DOCKER_IMAGE_TAG europe-west6-docker.pkg.dev/google-project-id/catladder-deploy/pan-test-app/stage/api:$DOCKER_IMAGE_TAG",
2682
- "docker push europe-west6-docker.pkg.dev/google-project-id/catladder-deploy/pan-test-app/stage/api:$DOCKER_IMAGE_TAG",
2683
- "echo -e "\\e[0Ksection_end:$(date +%s):pushToArtifactRegistry\\r\\e[0K"",
2684
2647
  "echo -e "\\e[0Ksection_start:$(date +%s):deploy[collapsed=true]\\r\\e[0KDeploy to cloud run"",
2685
2648
  "echo "$ENV_VARS" > ____envvars.yaml",
2686
2649
  "set +e",
@@ -2692,6 +2655,7 @@ _ALL_ENV_VAR_KEYS: '["ENV_SHORT","APP_DIR","ENV_TYPE","BUILD_INFO_ID","BUILD_INF
2692
2655
  "echo -e "\\e[0Ksection_start:$(date +%s):cleanup[collapsed=true]\\r\\e[0KCleanup"",
2693
2656
  "gcloud run revisions list --project=google-project-id --region=europe-west6 --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=google-project-id --region=europe-west6 --quiet $revisionname ; done",
2694
2657
  "gcloud artifacts docker images list europe-west6-docker.pkg.dev/google-project-id/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 europe-west6-docker.pkg.dev/google-project-id/catladder-deploy/pan-test-app/stage/api@$version --quiet --delete-tags; done",
2658
+ "gcloud artifacts docker images list europe-west6-docker.pkg.dev/google-project-id/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 europe-west6-docker.pkg.dev/google-project-id/catladder-deploy/pan-test-app/caches/api@$version --quiet --delete-tags; done",
2695
2659
  "echo -e "\\e[0Ksection_end:$(date +%s):cleanup\\r\\e[0K"",
2696
2660
  "echo Uploading SBOM to Dependency Track",
2697
2661
  "/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",
@@ -2718,14 +2682,12 @@ _ALL_ENV_VAR_KEYS: '["ENV_SHORT","APP_DIR","ENV_TYPE","BUILD_INFO_ID","BUILD_INF
2718
2682
  "DB_PASSWORD": "$CL_stage_api_DB_PASSWORD",
2719
2683
  "DB_USER": "my-user",
2720
2684
  "DOCKER_BUILDKIT": "1",
2721
- "DOCKER_CACHE_IMAGE": "$DOCKER_REGISTRY_IMAGE_PATH/caches/api",
2685
+ "DOCKER_CACHE_IMAGE": "europe-west6-docker.pkg.dev/google-project-id/catladder-deploy/pan-test-app/caches/api",
2722
2686
  "DOCKER_DRIVER": "overlay2",
2723
2687
  "DOCKER_HOST": "tcp://0.0.0.0:2375",
2724
- "DOCKER_IMAGE": "$DOCKER_REGISTRY_IMAGE_PATH/$DOCKER_IMAGE_NAME",
2725
- "DOCKER_IMAGE_NAME": "stage/api",
2688
+ "DOCKER_IMAGE": "europe-west6-docker.pkg.dev/google-project-id/catladder-deploy/pan-test-app/stage/api",
2726
2689
  "DOCKER_IMAGE_TAG": "$CI_COMMIT_SHA",
2727
- "DOCKER_REGISTRY": "$CI_REGISTRY",
2728
- "DOCKER_REGISTRY_IMAGE_PATH": "$CI_REGISTRY_IMAGE",
2690
+ "DOCKER_REGISTRY": "europe-west6-docker.pkg.dev",
2729
2691
  "DOCKER_TLS_CERTDIR": "",
2730
2692
  "ENV_SHORT": "stage",
2731
2693
  "ENV_TYPE": "stage",
@@ -2793,6 +2755,7 @@ _ALL_ENV_VAR_KEYS: '["ENV_SHORT","APP_DIR","ENV_TYPE","BUILD_INFO_ID","BUILD_INF
2793
2755
  "gcloud auth activate-service-account --key-file="./____keyfile.json"",
2794
2756
  "gcloud run services delete pan-test-app-prod-api --project=google-project-id --region=europe-west6",
2795
2757
  "gcloud artifacts docker images delete europe-west6-docker.pkg.dev/google-project-id/catladder-deploy/pan-test-app/prod/api --quiet --delete-tags",
2758
+ "gcloud artifacts docker images list europe-west6-docker.pkg.dev/google-project-id/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 europe-west6-docker.pkg.dev/google-project-id/catladder-deploy/pan-test-app/caches/api@$version --quiet --delete-tags; done",
2796
2759
  "echo Disabling component in Dependency Track",
2797
2760
  "/dtrackuploader https://dep.panter.swiss/ "$DT_KEY_PROD" disable "pan-test-app/api" "https://pan-test-app-prod-api-unknown-host.example.com" || true",
2798
2761
  "set -e",
@@ -2841,6 +2804,7 @@ _ALL_ENV_VAR_KEYS: '["ENV_SHORT","APP_DIR","ENV_TYPE","BUILD_INFO_ID","BUILD_INF
2841
2804
  "gcloud auth activate-service-account --key-file="./____keyfile.json"",
2842
2805
  "gcloud run services delete pan-test-app-stage-api --project=google-project-id --region=europe-west6",
2843
2806
  "gcloud artifacts docker images delete europe-west6-docker.pkg.dev/google-project-id/catladder-deploy/pan-test-app/stage/api --quiet --delete-tags",
2807
+ "gcloud artifacts docker images list europe-west6-docker.pkg.dev/google-project-id/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 europe-west6-docker.pkg.dev/google-project-id/catladder-deploy/pan-test-app/caches/api@$version --quiet --delete-tags; done",
2844
2808
  "echo Disabling component in Dependency Track",
2845
2809
  "/dtrackuploader https://dep.panter.swiss/ "$DT_KEY_PROD" disable "pan-test-app/api" "https://pan-test-app-stage-api-unknown-host.example.com" || true",
2846
2810
  "set -e",
@@ -3102,7 +3066,10 @@ _ALL_ENV_VAR_KEYS: '["ENV_SHORT","APP_DIR","ENV_TYPE","BUILD_INFO_ID","BUILD_INF
3102
3066
  "script": [
3103
3067
  "ensureNodeDockerfile",
3104
3068
  "echo -e "\\e[0Ksection_start:$(date +%s):docker-login[collapsed=true]\\r\\e[0KDocker Login"",
3105
- "docker login --username gitlab-ci-token --password $CI_JOB_TOKEN $CI_REGISTRY",
3069
+ "echo $CL_prod_worker_GCLOUD_DEPLOY_credentialsKey > ./____keyfile.json
3070
+ ",
3071
+ "gcloud auth activate-service-account --key-file="./____keyfile.json"",
3072
+ "gcloud auth configure-docker europe-west6-docker.pkg.dev",
3106
3073
  "echo -e "\\e[0Ksection_end:$(date +%s):docker-login\\r\\e[0K"",
3107
3074
  "echo -e "\\e[0Ksection_start:$(date +%s):docker-build[collapsed=true]\\r\\e[0KDocker build"",
3108
3075
  "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",
@@ -3127,7 +3094,7 @@ _ALL_ENV_VAR_KEYS: '["ENV_SHORT","APP_DIR","ENV_TYPE","BUILD_INFO_ID","BUILD_INF
3127
3094
  "DOCKERFILE_ADDITIONS": undefined,
3128
3095
  "DOCKERFILE_ADDITIONS_END": undefined,
3129
3096
  "DOCKER_BUILDKIT": "1",
3130
- "DOCKER_CACHE_IMAGE": "$DOCKER_REGISTRY_IMAGE_PATH/caches/worker",
3097
+ "DOCKER_CACHE_IMAGE": "europe-west6-docker.pkg.dev/google-project-id/catladder-deploy/pan-test-app/caches/worker",
3131
3098
  "DOCKER_COPY_AND_INSTALL_APP": "COPY --chown=node:node $APP_DIR .
3132
3099
  RUN yarn plugin import workspace-tools
3133
3100
  RUN yarn workspaces focus --production && yarn rebuild",
@@ -3138,11 +3105,9 @@ COPY --chown=node:node .yarn /app/.yarn",
3138
3105
  "DOCKER_DIR": ".",
3139
3106
  "DOCKER_DRIVER": "overlay2",
3140
3107
  "DOCKER_HOST": "tcp://0.0.0.0:2375",
3141
- "DOCKER_IMAGE": "$DOCKER_REGISTRY_IMAGE_PATH/$DOCKER_IMAGE_NAME",
3142
- "DOCKER_IMAGE_NAME": "prod/worker",
3108
+ "DOCKER_IMAGE": "europe-west6-docker.pkg.dev/google-project-id/catladder-deploy/pan-test-app/prod/worker",
3143
3109
  "DOCKER_IMAGE_TAG": "$CI_COMMIT_SHA",
3144
- "DOCKER_REGISTRY": "$CI_REGISTRY",
3145
- "DOCKER_REGISTRY_IMAGE_PATH": "$CI_REGISTRY_IMAGE",
3110
+ "DOCKER_REGISTRY": "europe-west6-docker.pkg.dev",
3146
3111
  "DOCKER_TLS_CERTDIR": "",
3147
3112
  "KUBERNETES_CPU_LIMIT": "1",
3148
3113
  "KUBERNETES_CPU_REQUEST": "0.5",
@@ -3175,7 +3140,10 @@ COPY --chown=node:node .yarn /app/.yarn",
3175
3140
  "script": [
3176
3141
  "ensureNodeDockerfile",
3177
3142
  "echo -e "\\e[0Ksection_start:$(date +%s):docker-login[collapsed=true]\\r\\e[0KDocker Login"",
3178
- "docker login --username gitlab-ci-token --password $CI_JOB_TOKEN $CI_REGISTRY",
3143
+ "echo $CL_stage_worker_GCLOUD_DEPLOY_credentialsKey > ./____keyfile.json
3144
+ ",
3145
+ "gcloud auth activate-service-account --key-file="./____keyfile.json"",
3146
+ "gcloud auth configure-docker europe-west6-docker.pkg.dev",
3179
3147
  "echo -e "\\e[0Ksection_end:$(date +%s):docker-login\\r\\e[0K"",
3180
3148
  "echo -e "\\e[0Ksection_start:$(date +%s):docker-build[collapsed=true]\\r\\e[0KDocker build"",
3181
3149
  "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",
@@ -3200,7 +3168,7 @@ COPY --chown=node:node .yarn /app/.yarn",
3200
3168
  "DOCKERFILE_ADDITIONS": undefined,
3201
3169
  "DOCKERFILE_ADDITIONS_END": undefined,
3202
3170
  "DOCKER_BUILDKIT": "1",
3203
- "DOCKER_CACHE_IMAGE": "$DOCKER_REGISTRY_IMAGE_PATH/caches/worker",
3171
+ "DOCKER_CACHE_IMAGE": "europe-west6-docker.pkg.dev/google-project-id/catladder-deploy/pan-test-app/caches/worker",
3204
3172
  "DOCKER_COPY_AND_INSTALL_APP": "COPY --chown=node:node $APP_DIR .
3205
3173
  RUN yarn plugin import workspace-tools
3206
3174
  RUN yarn workspaces focus --production && yarn rebuild",
@@ -3211,11 +3179,9 @@ COPY --chown=node:node .yarn /app/.yarn",
3211
3179
  "DOCKER_DIR": ".",
3212
3180
  "DOCKER_DRIVER": "overlay2",
3213
3181
  "DOCKER_HOST": "tcp://0.0.0.0:2375",
3214
- "DOCKER_IMAGE": "$DOCKER_REGISTRY_IMAGE_PATH/$DOCKER_IMAGE_NAME",
3215
- "DOCKER_IMAGE_NAME": "stage/worker",
3182
+ "DOCKER_IMAGE": "europe-west6-docker.pkg.dev/google-project-id/catladder-deploy/pan-test-app/stage/worker",
3216
3183
  "DOCKER_IMAGE_TAG": "$CI_COMMIT_SHA",
3217
- "DOCKER_REGISTRY": "$CI_REGISTRY",
3218
- "DOCKER_REGISTRY_IMAGE_PATH": "$CI_REGISTRY_IMAGE",
3184
+ "DOCKER_REGISTRY": "europe-west6-docker.pkg.dev",
3219
3185
  "DOCKER_TLS_CERTDIR": "",
3220
3186
  "KUBERNETES_CPU_LIMIT": "1",
3221
3187
  "KUBERNETES_CPU_REQUEST": "0.5",
@@ -3272,13 +3238,6 @@ COPY --chown=node:node .yarn /app/.yarn",
3272
3238
  "export GCLOUD_PROJECT_NUMBER=$(gcloud projects describe google-project-id --format="value(projectNumber)")",
3273
3239
  "echo "GCLOUD_PROJECT_NUMBER: $GCLOUD_PROJECT_NUMBER"",
3274
3240
  "echo -e "\\e[0Ksection_end:$(date +%s):prepare\\r\\e[0K"",
3275
- "echo -e "\\e[0Ksection_start:$(date +%s):pushToArtifactRegistry[collapsed=true]\\r\\e[0KPushing image to artifacts registry"",
3276
- "docker login --username gitlab-ci-token --password $CI_JOB_TOKEN $CI_REGISTRY",
3277
- "gcloud auth configure-docker europe-west6-docker.pkg.dev",
3278
- "docker pull $DOCKER_IMAGE:$DOCKER_IMAGE_TAG",
3279
- "docker tag $DOCKER_IMAGE:$DOCKER_IMAGE_TAG europe-west6-docker.pkg.dev/google-project-id/catladder-deploy/pan-test-app/prod/worker:$DOCKER_IMAGE_TAG",
3280
- "docker push europe-west6-docker.pkg.dev/google-project-id/catladder-deploy/pan-test-app/prod/worker:$DOCKER_IMAGE_TAG",
3281
- "echo -e "\\e[0Ksection_end:$(date +%s):pushToArtifactRegistry\\r\\e[0K"",
3282
3241
  "echo -e "\\e[0Ksection_start:$(date +%s):deploy[collapsed=true]\\r\\e[0KDeploy to cloud run"",
3283
3242
  "echo "$ENV_VARS" > ____envvars.yaml",
3284
3243
  "set +e",
@@ -3290,6 +3249,7 @@ COPY --chown=node:node .yarn /app/.yarn",
3290
3249
  "echo -e "\\e[0Ksection_start:$(date +%s):cleanup[collapsed=true]\\r\\e[0KCleanup"",
3291
3250
  "gcloud run revisions list --project=google-project-id --region=europe-west6 --service=pan-test-app-prod-worker --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=google-project-id --region=europe-west6 --quiet $revisionname ; done",
3292
3251
  "gcloud artifacts docker images list europe-west6-docker.pkg.dev/google-project-id/catladder-deploy/pan-test-app/prod/worker --sort-by=~CREATE_TIME --format="value(version)" | tail -n +7 | while read -r version; do gcloud artifacts docker images delete europe-west6-docker.pkg.dev/google-project-id/catladder-deploy/pan-test-app/prod/worker@$version --quiet --delete-tags; done",
3252
+ "gcloud artifacts docker images list europe-west6-docker.pkg.dev/google-project-id/catladder-deploy/pan-test-app/caches/worker --sort-by=~CREATE_TIME --format="value(version)" | tail -n +2 | while read -r version; do gcloud artifacts docker images delete europe-west6-docker.pkg.dev/google-project-id/catladder-deploy/pan-test-app/caches/worker@$version --quiet --delete-tags; done",
3293
3253
  "echo -e "\\e[0Ksection_end:$(date +%s):cleanup\\r\\e[0K"",
3294
3254
  "echo Uploading SBOM to Dependency Track",
3295
3255
  "/dtrackuploader https://dep.panter.swiss/ "$DT_KEY_PROD" upload "pan-test-app/worker" "https://pan-test-app-prod-worker-unknown-host.example.com" "__sbom.json" vex.json || true",
@@ -3316,14 +3276,12 @@ COPY --chown=node:node .yarn /app/.yarn",
3316
3276
  "DB_PASSWORD": "$CL_prod_api_DB_PASSWORD",
3317
3277
  "DB_USER": "my-user",
3318
3278
  "DOCKER_BUILDKIT": "1",
3319
- "DOCKER_CACHE_IMAGE": "$DOCKER_REGISTRY_IMAGE_PATH/caches/worker",
3279
+ "DOCKER_CACHE_IMAGE": "europe-west6-docker.pkg.dev/google-project-id/catladder-deploy/pan-test-app/caches/worker",
3320
3280
  "DOCKER_DRIVER": "overlay2",
3321
3281
  "DOCKER_HOST": "tcp://0.0.0.0:2375",
3322
- "DOCKER_IMAGE": "$DOCKER_REGISTRY_IMAGE_PATH/$DOCKER_IMAGE_NAME",
3323
- "DOCKER_IMAGE_NAME": "prod/worker",
3282
+ "DOCKER_IMAGE": "europe-west6-docker.pkg.dev/google-project-id/catladder-deploy/pan-test-app/prod/worker",
3324
3283
  "DOCKER_IMAGE_TAG": "$CI_COMMIT_SHA",
3325
- "DOCKER_REGISTRY": "$CI_REGISTRY",
3326
- "DOCKER_REGISTRY_IMAGE_PATH": "$CI_REGISTRY_IMAGE",
3284
+ "DOCKER_REGISTRY": "europe-west6-docker.pkg.dev",
3327
3285
  "DOCKER_TLS_CERTDIR": "",
3328
3286
  "ENV_SHORT": "prod",
3329
3287
  "ENV_TYPE": "prod",
@@ -3406,13 +3364,6 @@ _ALL_ENV_VAR_KEYS: '["ENV_SHORT","APP_DIR","ENV_TYPE","BUILD_INFO_ID","BUILD_INF
3406
3364
  "export GCLOUD_PROJECT_NUMBER=$(gcloud projects describe google-project-id --format="value(projectNumber)")",
3407
3365
  "echo "GCLOUD_PROJECT_NUMBER: $GCLOUD_PROJECT_NUMBER"",
3408
3366
  "echo -e "\\e[0Ksection_end:$(date +%s):prepare\\r\\e[0K"",
3409
- "echo -e "\\e[0Ksection_start:$(date +%s):pushToArtifactRegistry[collapsed=true]\\r\\e[0KPushing image to artifacts registry"",
3410
- "docker login --username gitlab-ci-token --password $CI_JOB_TOKEN $CI_REGISTRY",
3411
- "gcloud auth configure-docker europe-west6-docker.pkg.dev",
3412
- "docker pull $DOCKER_IMAGE:$DOCKER_IMAGE_TAG",
3413
- "docker tag $DOCKER_IMAGE:$DOCKER_IMAGE_TAG europe-west6-docker.pkg.dev/google-project-id/catladder-deploy/pan-test-app/stage/worker:$DOCKER_IMAGE_TAG",
3414
- "docker push europe-west6-docker.pkg.dev/google-project-id/catladder-deploy/pan-test-app/stage/worker:$DOCKER_IMAGE_TAG",
3415
- "echo -e "\\e[0Ksection_end:$(date +%s):pushToArtifactRegistry\\r\\e[0K"",
3416
3367
  "echo -e "\\e[0Ksection_start:$(date +%s):deploy[collapsed=true]\\r\\e[0KDeploy to cloud run"",
3417
3368
  "echo "$ENV_VARS" > ____envvars.yaml",
3418
3369
  "set +e",
@@ -3424,6 +3375,7 @@ _ALL_ENV_VAR_KEYS: '["ENV_SHORT","APP_DIR","ENV_TYPE","BUILD_INFO_ID","BUILD_INF
3424
3375
  "echo -e "\\e[0Ksection_start:$(date +%s):cleanup[collapsed=true]\\r\\e[0KCleanup"",
3425
3376
  "gcloud run revisions list --project=google-project-id --region=europe-west6 --service=pan-test-app-stage-worker --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=google-project-id --region=europe-west6 --quiet $revisionname ; done",
3426
3377
  "gcloud artifacts docker images list europe-west6-docker.pkg.dev/google-project-id/catladder-deploy/pan-test-app/stage/worker --sort-by=~CREATE_TIME --format="value(version)" | tail -n +2 | while read -r version; do gcloud artifacts docker images delete europe-west6-docker.pkg.dev/google-project-id/catladder-deploy/pan-test-app/stage/worker@$version --quiet --delete-tags; done",
3378
+ "gcloud artifacts docker images list europe-west6-docker.pkg.dev/google-project-id/catladder-deploy/pan-test-app/caches/worker --sort-by=~CREATE_TIME --format="value(version)" | tail -n +2 | while read -r version; do gcloud artifacts docker images delete europe-west6-docker.pkg.dev/google-project-id/catladder-deploy/pan-test-app/caches/worker@$version --quiet --delete-tags; done",
3427
3379
  "echo -e "\\e[0Ksection_end:$(date +%s):cleanup\\r\\e[0K"",
3428
3380
  "echo Uploading SBOM to Dependency Track",
3429
3381
  "/dtrackuploader https://dep.panter.swiss/ "$DT_KEY_PROD" upload "pan-test-app/worker" "https://pan-test-app-stage-worker-unknown-host.example.com" "__sbom.json" vex.json || true",
@@ -3450,14 +3402,12 @@ _ALL_ENV_VAR_KEYS: '["ENV_SHORT","APP_DIR","ENV_TYPE","BUILD_INFO_ID","BUILD_INF
3450
3402
  "DB_PASSWORD": "$CL_stage_api_DB_PASSWORD",
3451
3403
  "DB_USER": "my-user",
3452
3404
  "DOCKER_BUILDKIT": "1",
3453
- "DOCKER_CACHE_IMAGE": "$DOCKER_REGISTRY_IMAGE_PATH/caches/worker",
3405
+ "DOCKER_CACHE_IMAGE": "europe-west6-docker.pkg.dev/google-project-id/catladder-deploy/pan-test-app/caches/worker",
3454
3406
  "DOCKER_DRIVER": "overlay2",
3455
3407
  "DOCKER_HOST": "tcp://0.0.0.0:2375",
3456
- "DOCKER_IMAGE": "$DOCKER_REGISTRY_IMAGE_PATH/$DOCKER_IMAGE_NAME",
3457
- "DOCKER_IMAGE_NAME": "stage/worker",
3408
+ "DOCKER_IMAGE": "europe-west6-docker.pkg.dev/google-project-id/catladder-deploy/pan-test-app/stage/worker",
3458
3409
  "DOCKER_IMAGE_TAG": "$CI_COMMIT_SHA",
3459
- "DOCKER_REGISTRY": "$CI_REGISTRY",
3460
- "DOCKER_REGISTRY_IMAGE_PATH": "$CI_REGISTRY_IMAGE",
3410
+ "DOCKER_REGISTRY": "europe-west6-docker.pkg.dev",
3461
3411
  "DOCKER_TLS_CERTDIR": "",
3462
3412
  "ENV_SHORT": "stage",
3463
3413
  "ENV_TYPE": "stage",
@@ -3525,6 +3475,7 @@ _ALL_ENV_VAR_KEYS: '["ENV_SHORT","APP_DIR","ENV_TYPE","BUILD_INFO_ID","BUILD_INF
3525
3475
  "gcloud auth activate-service-account --key-file="./____keyfile.json"",
3526
3476
  "gcloud run services delete pan-test-app-prod-worker --project=google-project-id --region=europe-west6",
3527
3477
  "gcloud artifacts docker images delete europe-west6-docker.pkg.dev/google-project-id/catladder-deploy/pan-test-app/prod/worker --quiet --delete-tags",
3478
+ "gcloud artifacts docker images list europe-west6-docker.pkg.dev/google-project-id/catladder-deploy/pan-test-app/caches/worker --sort-by=~CREATE_TIME --format="value(version)" | tail -n +2 | while read -r version; do gcloud artifacts docker images delete europe-west6-docker.pkg.dev/google-project-id/catladder-deploy/pan-test-app/caches/worker@$version --quiet --delete-tags; done",
3528
3479
  "echo Disabling component in Dependency Track",
3529
3480
  "/dtrackuploader https://dep.panter.swiss/ "$DT_KEY_PROD" disable "pan-test-app/worker" "https://pan-test-app-prod-worker-unknown-host.example.com" || true",
3530
3481
  "set -e",
@@ -3573,6 +3524,7 @@ _ALL_ENV_VAR_KEYS: '["ENV_SHORT","APP_DIR","ENV_TYPE","BUILD_INFO_ID","BUILD_INF
3573
3524
  "gcloud auth activate-service-account --key-file="./____keyfile.json"",
3574
3525
  "gcloud run services delete pan-test-app-stage-worker --project=google-project-id --region=europe-west6",
3575
3526
  "gcloud artifacts docker images delete europe-west6-docker.pkg.dev/google-project-id/catladder-deploy/pan-test-app/stage/worker --quiet --delete-tags",
3527
+ "gcloud artifacts docker images list europe-west6-docker.pkg.dev/google-project-id/catladder-deploy/pan-test-app/caches/worker --sort-by=~CREATE_TIME --format="value(version)" | tail -n +2 | while read -r version; do gcloud artifacts docker images delete europe-west6-docker.pkg.dev/google-project-id/catladder-deploy/pan-test-app/caches/worker@$version --quiet --delete-tags; done",
3576
3528
  "echo Disabling component in Dependency Track",
3577
3529
  "/dtrackuploader https://dep.panter.swiss/ "$DT_KEY_PROD" disable "pan-test-app/worker" "https://pan-test-app-stage-worker-unknown-host.example.com" || true",
3578
3530
  "set -e",