@catladder/pipeline 0.0.0-update-docker-for-apps-e047cc44 → 0.0.0-update-node-b0c7282d

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 (51) hide show
  1. package/dist/build/custom/buildJob.js +1 -1
  2. package/dist/build/docker.d.ts +26 -6
  3. package/dist/build/docker.js +53 -8
  4. package/dist/build/node/buildJob.js +1 -1
  5. package/dist/build/node/meteor.js +1 -1
  6. package/dist/build/rails/build.js +12 -3
  7. package/dist/bundles/catladder-gitlab/index.js +146 -49
  8. package/dist/constants.js +1 -1
  9. package/dist/deploy/base/deploy.js +1 -1
  10. package/dist/deploy/cloudRun/artifactsRegistry.d.ts +7 -4
  11. package/dist/deploy/cloudRun/artifactsRegistry.js +30 -23
  12. package/dist/deploy/cloudRun/deployJob.js +14 -9
  13. package/dist/deploy/dockerTag/deployJob.js +32 -1
  14. package/dist/deploy/types/googleCloudRun.d.ts +10 -6
  15. package/dist/tsconfig.tsbuildinfo +1 -1
  16. package/examples/__snapshots__/cloud-run-memory-limit.ts.snap +73 -77
  17. package/examples/__snapshots__/cloud-run-meteor-with-worker.ts.snap +1813 -0
  18. package/examples/__snapshots__/cloud-run-no-cpu-throttling.ts.snap +73 -77
  19. package/examples/__snapshots__/cloud-run-non-public.ts.snap +73 -77
  20. package/examples/__snapshots__/cloud-run-post-stop-job.ts.snap +1855 -0
  21. package/examples/__snapshots__/cloud-run-with-sql-reuse-db.ts.snap +146 -154
  22. package/examples/__snapshots__/cloud-run-with-sql.ts.snap +146 -154
  23. package/examples/__snapshots__/cloud-run-with-worker.ts.snap +1853 -0
  24. package/examples/__snapshots__/custom-build-job-with-tests.ts.snap +73 -77
  25. package/examples/__snapshots__/custom-build-job.ts.snap +73 -77
  26. package/examples/__snapshots__/custom-deploy.ts.snap +65 -53
  27. package/examples/__snapshots__/custom-sbom-java.ts.snap +73 -77
  28. package/examples/__snapshots__/kubernetes-application-customization.ts.snap +41 -29
  29. package/examples/__snapshots__/kubernetes-with-cloud-sql-legacy.ts.snap +41 -29
  30. package/examples/__snapshots__/kubernetes-with-cloud-sql.ts.snap +41 -29
  31. package/examples/__snapshots__/kubernetes-with-jobs.ts.snap +82 -58
  32. package/examples/__snapshots__/kubernetes-with-mongodb.ts.snap +41 -29
  33. package/examples/__snapshots__/meteor-kubernetes.ts.snap +41 -29
  34. package/examples/__snapshots__/native-app.ts.snap +73 -77
  35. package/examples/__snapshots__/node-build-with-custom-image.ts.snap +73 -77
  36. package/examples/__snapshots__/rails-k8s-with-worker.ts.snap +58 -54
  37. package/examples/cloud-run-meteor-with-worker.ts +35 -0
  38. package/examples/cloud-run-post-stop-job.ts +40 -0
  39. package/examples/cloud-run-with-worker.ts +35 -0
  40. package/examples/custom-deploy.ts +8 -0
  41. package/package.json +1 -1
  42. package/src/build/custom/buildJob.ts +1 -0
  43. package/src/build/docker.ts +56 -16
  44. package/src/build/node/buildJob.ts +1 -0
  45. package/src/build/node/meteor.ts +1 -1
  46. package/src/build/rails/build.ts +2 -2
  47. package/src/deploy/base/deploy.ts +1 -1
  48. package/src/deploy/cloudRun/artifactsRegistry.ts +35 -32
  49. package/src/deploy/cloudRun/deployJob.ts +30 -15
  50. package/src/deploy/dockerTag/deployJob.ts +1 -1
  51. package/src/deploy/types/googleCloudRun.ts +11 -6
package/examples/__snapshots__/cloud-run-with-sql-reuse-db.ts.snap CHANGED
@@ -164,12 +164,20 @@ exports[`matches snapshot 1`] = `
164
164
  },
165
165
  "script": [
166
166
  "ensureNodeDockerfile",
167
- "docker login --username gitlab-ci-token --password $CI_JOB_TOKEN $CI_REGISTRY",
168
- "docker version",
167
+ "echo -e "\\e[0Ksection_start:$(date +%s):docker-login[collapsed=true]\\r\\e[0KDocker Login"",
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",
172
+ "echo -e "\\e[0Ksection_end:$(date +%s):docker-login\\r\\e[0K"",
173
+ "echo -e "\\e[0Ksection_start:$(date +%s):docker-build[collapsed=true]\\r\\e[0KDocker build"",
169
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",
175
+ "echo -e "\\e[0Ksection_end:$(date +%s):docker-build\\r\\e[0K"",
176
+ "echo -e "\\e[0Ksection_start:$(date +%s):docker-push[collapsed=true]\\r\\e[0KDocker push and tag"",
170
177
  "docker push $DOCKER_IMAGE:$DOCKER_IMAGE_TAG",
171
178
  "docker tag $DOCKER_IMAGE:$DOCKER_IMAGE_TAG $DOCKER_CACHE_IMAGE",
172
179
  "docker push $DOCKER_CACHE_IMAGE",
180
+ "echo -e "\\e[0Ksection_end:$(date +%s):docker-push\\r\\e[0K"",
173
181
  ],
174
182
  "services": [
175
183
  {
@@ -185,7 +193,7 @@ exports[`matches snapshot 1`] = `
185
193
  "DOCKERFILE_ADDITIONS": undefined,
186
194
  "DOCKERFILE_ADDITIONS_END": undefined,
187
195
  "DOCKER_BUILDKIT": "1",
188
- "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",
189
197
  "DOCKER_COPY_AND_INSTALL_APP": "COPY --chown=node:node $APP_DIR .
190
198
  RUN yarn plugin import workspace-tools
191
199
  RUN yarn workspaces focus --production && yarn rebuild",
@@ -196,11 +204,9 @@ COPY --chown=node:node .yarn /app/.yarn",
196
204
  "DOCKER_DIR": ".",
197
205
  "DOCKER_DRIVER": "overlay2",
198
206
  "DOCKER_HOST": "tcp://0.0.0.0:2375",
199
- "DOCKER_IMAGE": "$DOCKER_REGISTRY_IMAGE_PATH/$DOCKER_IMAGE_NAME",
200
- "DOCKER_IMAGE_NAME": "dev/api",
207
+ "DOCKER_IMAGE": "europe-west6-docker.pkg.dev/google-project-id/catladder-deploy/pan-test-app/dev/api",
201
208
  "DOCKER_IMAGE_TAG": "$CI_COMMIT_SHA",
202
- "DOCKER_REGISTRY": "$CI_REGISTRY",
203
- "DOCKER_REGISTRY_IMAGE_PATH": "$CI_REGISTRY_IMAGE",
209
+ "DOCKER_REGISTRY": "europe-west6-docker.pkg.dev",
204
210
  "DOCKER_TLS_CERTDIR": "",
205
211
  "KUBERNETES_CPU_LIMIT": "1",
206
212
  "KUBERNETES_CPU_REQUEST": "0.5",
@@ -269,13 +275,6 @@ COPY --chown=node:node .yarn /app/.yarn",
269
275
  "export GCLOUD_PROJECT_NUMBER=$(gcloud projects describe google-project-id --format="value(projectNumber)")",
270
276
  "echo "GCLOUD_PROJECT_NUMBER: $GCLOUD_PROJECT_NUMBER"",
271
277
  "echo -e "\\e[0Ksection_end:$(date +%s):prepare\\r\\e[0K"",
272
- "echo -e "\\e[0Ksection_start:$(date +%s):pushToArtifactRegistry[collapsed=true]\\r\\e[0KPushing image to artifacts registry"",
273
- "docker login --username gitlab-ci-token --password $CI_JOB_TOKEN $CI_REGISTRY",
274
- "gcloud auth configure-docker europe-west6-docker.pkg.dev",
275
- "docker pull $DOCKER_IMAGE:$DOCKER_IMAGE_TAG",
276
- "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",
277
- "docker push europe-west6-docker.pkg.dev/google-project-id/catladder-deploy/pan-test-app/dev/api:$DOCKER_IMAGE_TAG",
278
- "echo -e "\\e[0Ksection_end:$(date +%s):pushToArtifactRegistry\\r\\e[0K"",
279
278
  "echo -e "\\e[0Ksection_start:$(date +%s):deploy[collapsed=true]\\r\\e[0KDeploy to cloud run"",
280
279
  "echo "$ENV_VARS" > ____envvars.yaml",
281
280
  "set +e",
@@ -287,6 +286,7 @@ COPY --chown=node:node .yarn /app/.yarn",
287
286
  "echo -e "\\e[0Ksection_start:$(date +%s):cleanup[collapsed=true]\\r\\e[0KCleanup"",
288
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",
289
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",
290
290
  "echo -e "\\e[0Ksection_end:$(date +%s):cleanup\\r\\e[0K"",
291
291
  "echo Uploading SBOM to Dependency Track",
292
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",
@@ -313,14 +313,12 @@ COPY --chown=node:node .yarn /app/.yarn",
313
313
  "DB_PASSWORD": "$CL_dev_api_DB_PASSWORD",
314
314
  "DB_USER": "my-user",
315
315
  "DOCKER_BUILDKIT": "1",
316
- "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",
317
317
  "DOCKER_DRIVER": "overlay2",
318
318
  "DOCKER_HOST": "tcp://0.0.0.0:2375",
319
- "DOCKER_IMAGE": "$DOCKER_REGISTRY_IMAGE_PATH/$DOCKER_IMAGE_NAME",
320
- "DOCKER_IMAGE_NAME": "dev/api",
319
+ "DOCKER_IMAGE": "europe-west6-docker.pkg.dev/google-project-id/catladder-deploy/pan-test-app/dev/api",
321
320
  "DOCKER_IMAGE_TAG": "$CI_COMMIT_SHA",
322
- "DOCKER_REGISTRY": "$CI_REGISTRY",
323
- "DOCKER_REGISTRY_IMAGE_PATH": "$CI_REGISTRY_IMAGE",
321
+ "DOCKER_REGISTRY": "europe-west6-docker.pkg.dev",
324
322
  "DOCKER_TLS_CERTDIR": "",
325
323
  "ENV_SHORT": "dev",
326
324
  "ENV_TYPE": "dev",
@@ -388,6 +386,7 @@ _ALL_ENV_VAR_KEYS: '["ENV_SHORT","APP_DIR","ENV_TYPE","BUILD_INFO_ID","BUILD_INF
388
386
  "gcloud auth activate-service-account --key-file="./____keyfile.json"",
389
387
  "gcloud run services delete pan-test-app-dev-api --project=google-project-id --region=europe-west6",
390
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",
391
390
  "echo Disabling component in Dependency Track",
392
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",
393
392
  "set -e",
@@ -656,12 +655,20 @@ _ALL_ENV_VAR_KEYS: '["ENV_SHORT","APP_DIR","ENV_TYPE","BUILD_INFO_ID","BUILD_INF
656
655
  },
657
656
  "script": [
658
657
  "ensureNodeDockerfile",
659
- "docker login --username gitlab-ci-token --password $CI_JOB_TOKEN $CI_REGISTRY",
660
- "docker version",
658
+ "echo -e "\\e[0Ksection_start:$(date +%s):docker-login[collapsed=true]\\r\\e[0KDocker Login"",
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",
663
+ "echo -e "\\e[0Ksection_end:$(date +%s):docker-login\\r\\e[0K"",
664
+ "echo -e "\\e[0Ksection_start:$(date +%s):docker-build[collapsed=true]\\r\\e[0KDocker build"",
661
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",
666
+ "echo -e "\\e[0Ksection_end:$(date +%s):docker-build\\r\\e[0K"",
667
+ "echo -e "\\e[0Ksection_start:$(date +%s):docker-push[collapsed=true]\\r\\e[0KDocker push and tag"",
662
668
  "docker push $DOCKER_IMAGE:$DOCKER_IMAGE_TAG",
663
669
  "docker tag $DOCKER_IMAGE:$DOCKER_IMAGE_TAG $DOCKER_CACHE_IMAGE",
664
670
  "docker push $DOCKER_CACHE_IMAGE",
671
+ "echo -e "\\e[0Ksection_end:$(date +%s):docker-push\\r\\e[0K"",
665
672
  ],
666
673
  "services": [
667
674
  {
@@ -677,7 +684,7 @@ _ALL_ENV_VAR_KEYS: '["ENV_SHORT","APP_DIR","ENV_TYPE","BUILD_INFO_ID","BUILD_INF
677
684
  "DOCKERFILE_ADDITIONS": undefined,
678
685
  "DOCKERFILE_ADDITIONS_END": undefined,
679
686
  "DOCKER_BUILDKIT": "1",
680
- "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",
681
688
  "DOCKER_COPY_AND_INSTALL_APP": "COPY --chown=node:node $APP_DIR .
682
689
  RUN yarn plugin import workspace-tools
683
690
  RUN yarn workspaces focus --production && yarn rebuild",
@@ -688,11 +695,9 @@ COPY --chown=node:node .yarn /app/.yarn",
688
695
  "DOCKER_DIR": ".",
689
696
  "DOCKER_DRIVER": "overlay2",
690
697
  "DOCKER_HOST": "tcp://0.0.0.0:2375",
691
- "DOCKER_IMAGE": "$DOCKER_REGISTRY_IMAGE_PATH/$DOCKER_IMAGE_NAME",
692
- "DOCKER_IMAGE_NAME": "dev/worker",
698
+ "DOCKER_IMAGE": "europe-west6-docker.pkg.dev/google-project-id/catladder-deploy/pan-test-app/dev/worker",
693
699
  "DOCKER_IMAGE_TAG": "$CI_COMMIT_SHA",
694
- "DOCKER_REGISTRY": "$CI_REGISTRY",
695
- "DOCKER_REGISTRY_IMAGE_PATH": "$CI_REGISTRY_IMAGE",
700
+ "DOCKER_REGISTRY": "europe-west6-docker.pkg.dev",
696
701
  "DOCKER_TLS_CERTDIR": "",
697
702
  "KUBERNETES_CPU_LIMIT": "1",
698
703
  "KUBERNETES_CPU_REQUEST": "0.5",
@@ -761,13 +766,6 @@ COPY --chown=node:node .yarn /app/.yarn",
761
766
  "export GCLOUD_PROJECT_NUMBER=$(gcloud projects describe google-project-id --format="value(projectNumber)")",
762
767
  "echo "GCLOUD_PROJECT_NUMBER: $GCLOUD_PROJECT_NUMBER"",
763
768
  "echo -e "\\e[0Ksection_end:$(date +%s):prepare\\r\\e[0K"",
764
- "echo -e "\\e[0Ksection_start:$(date +%s):pushToArtifactRegistry[collapsed=true]\\r\\e[0KPushing image to artifacts registry"",
765
- "docker login --username gitlab-ci-token --password $CI_JOB_TOKEN $CI_REGISTRY",
766
- "gcloud auth configure-docker europe-west6-docker.pkg.dev",
767
- "docker pull $DOCKER_IMAGE:$DOCKER_IMAGE_TAG",
768
- "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",
769
- "docker push europe-west6-docker.pkg.dev/google-project-id/catladder-deploy/pan-test-app/dev/worker:$DOCKER_IMAGE_TAG",
770
- "echo -e "\\e[0Ksection_end:$(date +%s):pushToArtifactRegistry\\r\\e[0K"",
771
769
  "echo -e "\\e[0Ksection_start:$(date +%s):deploy[collapsed=true]\\r\\e[0KDeploy to cloud run"",
772
770
  "echo "$ENV_VARS" > ____envvars.yaml",
773
771
  "set +e",
@@ -779,6 +777,7 @@ COPY --chown=node:node .yarn /app/.yarn",
779
777
  "echo -e "\\e[0Ksection_start:$(date +%s):cleanup[collapsed=true]\\r\\e[0KCleanup"",
780
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",
781
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",
782
781
  "echo -e "\\e[0Ksection_end:$(date +%s):cleanup\\r\\e[0K"",
783
782
  "echo Uploading SBOM to Dependency Track",
784
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",
@@ -805,14 +804,12 @@ COPY --chown=node:node .yarn /app/.yarn",
805
804
  "DB_PASSWORD": "$CL_dev_api_DB_PASSWORD",
806
805
  "DB_USER": "my-user",
807
806
  "DOCKER_BUILDKIT": "1",
808
- "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",
809
808
  "DOCKER_DRIVER": "overlay2",
810
809
  "DOCKER_HOST": "tcp://0.0.0.0:2375",
811
- "DOCKER_IMAGE": "$DOCKER_REGISTRY_IMAGE_PATH/$DOCKER_IMAGE_NAME",
812
- "DOCKER_IMAGE_NAME": "dev/worker",
810
+ "DOCKER_IMAGE": "europe-west6-docker.pkg.dev/google-project-id/catladder-deploy/pan-test-app/dev/worker",
813
811
  "DOCKER_IMAGE_TAG": "$CI_COMMIT_SHA",
814
- "DOCKER_REGISTRY": "$CI_REGISTRY",
815
- "DOCKER_REGISTRY_IMAGE_PATH": "$CI_REGISTRY_IMAGE",
812
+ "DOCKER_REGISTRY": "europe-west6-docker.pkg.dev",
816
813
  "DOCKER_TLS_CERTDIR": "",
817
814
  "ENV_SHORT": "dev",
818
815
  "ENV_TYPE": "dev",
@@ -880,6 +877,7 @@ _ALL_ENV_VAR_KEYS: '["ENV_SHORT","APP_DIR","ENV_TYPE","BUILD_INFO_ID","BUILD_INF
880
877
  "gcloud auth activate-service-account --key-file="./____keyfile.json"",
881
878
  "gcloud run services delete pan-test-app-dev-worker --project=google-project-id --region=europe-west6",
882
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",
883
881
  "echo Disabling component in Dependency Track",
884
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",
885
883
  "set -e",
@@ -1221,12 +1219,20 @@ _ALL_ENV_VAR_KEYS: '["ENV_SHORT","APP_DIR","ENV_TYPE","BUILD_INFO_ID","BUILD_INF
1221
1219
  },
1222
1220
  "script": [
1223
1221
  "ensureNodeDockerfile",
1224
- "docker login --username gitlab-ci-token --password $CI_JOB_TOKEN $CI_REGISTRY",
1225
- "docker version",
1222
+ "echo -e "\\e[0Ksection_start:$(date +%s):docker-login[collapsed=true]\\r\\e[0KDocker Login"",
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",
1227
+ "echo -e "\\e[0Ksection_end:$(date +%s):docker-login\\r\\e[0K"",
1228
+ "echo -e "\\e[0Ksection_start:$(date +%s):docker-build[collapsed=true]\\r\\e[0KDocker build"",
1226
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",
1230
+ "echo -e "\\e[0Ksection_end:$(date +%s):docker-build\\r\\e[0K"",
1231
+ "echo -e "\\e[0Ksection_start:$(date +%s):docker-push[collapsed=true]\\r\\e[0KDocker push and tag"",
1227
1232
  "docker push $DOCKER_IMAGE:$DOCKER_IMAGE_TAG",
1228
1233
  "docker tag $DOCKER_IMAGE:$DOCKER_IMAGE_TAG $DOCKER_CACHE_IMAGE",
1229
1234
  "docker push $DOCKER_CACHE_IMAGE",
1235
+ "echo -e "\\e[0Ksection_end:$(date +%s):docker-push\\r\\e[0K"",
1230
1236
  ],
1231
1237
  "services": [
1232
1238
  {
@@ -1242,7 +1248,7 @@ _ALL_ENV_VAR_KEYS: '["ENV_SHORT","APP_DIR","ENV_TYPE","BUILD_INFO_ID","BUILD_INF
1242
1248
  "DOCKERFILE_ADDITIONS": undefined,
1243
1249
  "DOCKERFILE_ADDITIONS_END": undefined,
1244
1250
  "DOCKER_BUILDKIT": "1",
1245
- "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",
1246
1252
  "DOCKER_COPY_AND_INSTALL_APP": "COPY --chown=node:node $APP_DIR .
1247
1253
  RUN yarn plugin import workspace-tools
1248
1254
  RUN yarn workspaces focus --production && yarn rebuild",
@@ -1253,11 +1259,9 @@ COPY --chown=node:node .yarn /app/.yarn",
1253
1259
  "DOCKER_DIR": ".",
1254
1260
  "DOCKER_DRIVER": "overlay2",
1255
1261
  "DOCKER_HOST": "tcp://0.0.0.0:2375",
1256
- "DOCKER_IMAGE": "$DOCKER_REGISTRY_IMAGE_PATH/$DOCKER_IMAGE_NAME",
1257
- "DOCKER_IMAGE_NAME": "review/api",
1262
+ "DOCKER_IMAGE": "europe-west6-docker.pkg.dev/google-project-id/catladder-deploy/pan-test-app/review/api/mr1234",
1258
1263
  "DOCKER_IMAGE_TAG": "$CI_COMMIT_SHA",
1259
- "DOCKER_REGISTRY": "$CI_REGISTRY",
1260
- "DOCKER_REGISTRY_IMAGE_PATH": "$CI_REGISTRY_IMAGE",
1264
+ "DOCKER_REGISTRY": "europe-west6-docker.pkg.dev",
1261
1265
  "DOCKER_TLS_CERTDIR": "",
1262
1266
  "KUBERNETES_CPU_LIMIT": "1",
1263
1267
  "KUBERNETES_CPU_REQUEST": "0.5",
@@ -1273,7 +1277,7 @@ COPY --chown=node:node .yarn /app/.yarn",
1273
1277
  ],
1274
1278
  },
1275
1279
  "environment": {
1276
- "auto_stop_in": "2 week",
1280
+ "auto_stop_in": "1 week",
1277
1281
  "name": "review/some-commit/api",
1278
1282
  "on_stop": "api 🛑 Stop ⚠️ | review ",
1279
1283
  "url": "https://pan-test-app-review-mr1234-api-unknown-host.example.com",
@@ -1326,13 +1330,6 @@ COPY --chown=node:node .yarn /app/.yarn",
1326
1330
  "export GCLOUD_PROJECT_NUMBER=$(gcloud projects describe google-project-id --format="value(projectNumber)")",
1327
1331
  "echo "GCLOUD_PROJECT_NUMBER: $GCLOUD_PROJECT_NUMBER"",
1328
1332
  "echo -e "\\e[0Ksection_end:$(date +%s):prepare\\r\\e[0K"",
1329
- "echo -e "\\e[0Ksection_start:$(date +%s):pushToArtifactRegistry[collapsed=true]\\r\\e[0KPushing image to artifacts registry"",
1330
- "docker login --username gitlab-ci-token --password $CI_JOB_TOKEN $CI_REGISTRY",
1331
- "gcloud auth configure-docker europe-west6-docker.pkg.dev",
1332
- "docker pull $DOCKER_IMAGE:$DOCKER_IMAGE_TAG",
1333
- "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",
1334
- "docker push europe-west6-docker.pkg.dev/google-project-id/catladder-deploy/pan-test-app/review/api/mr1234:$DOCKER_IMAGE_TAG",
1335
- "echo -e "\\e[0Ksection_end:$(date +%s):pushToArtifactRegistry\\r\\e[0K"",
1336
1333
  "echo -e "\\e[0Ksection_start:$(date +%s):deploy[collapsed=true]\\r\\e[0KDeploy to cloud run"",
1337
1334
  "echo "$ENV_VARS" > ____envvars.yaml",
1338
1335
  "set +e",
@@ -1344,6 +1341,7 @@ COPY --chown=node:node .yarn /app/.yarn",
1344
1341
  "echo -e "\\e[0Ksection_start:$(date +%s):cleanup[collapsed=true]\\r\\e[0KCleanup"",
1345
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",
1346
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",
1347
1345
  "set +e",
1348
1346
  "gcloud artifacts docker images delete europe-west6-docker.pkg.dev/google-project-id/catladder-deploy/pan-test-app/review/api --quiet --delete-tags",
1349
1347
  "set -e",
@@ -1373,14 +1371,12 @@ COPY --chown=node:node .yarn /app/.yarn",
1373
1371
  "DB_PASSWORD": "$CL_review_api_DB_PASSWORD",
1374
1372
  "DB_USER": "my-user",
1375
1373
  "DOCKER_BUILDKIT": "1",
1376
- "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",
1377
1375
  "DOCKER_DRIVER": "overlay2",
1378
1376
  "DOCKER_HOST": "tcp://0.0.0.0:2375",
1379
- "DOCKER_IMAGE": "$DOCKER_REGISTRY_IMAGE_PATH/$DOCKER_IMAGE_NAME",
1380
- "DOCKER_IMAGE_NAME": "review/api",
1377
+ "DOCKER_IMAGE": "europe-west6-docker.pkg.dev/google-project-id/catladder-deploy/pan-test-app/review/api/mr1234",
1381
1378
  "DOCKER_IMAGE_TAG": "$CI_COMMIT_SHA",
1382
- "DOCKER_REGISTRY": "$CI_REGISTRY",
1383
- "DOCKER_REGISTRY_IMAGE_PATH": "$CI_REGISTRY_IMAGE",
1379
+ "DOCKER_REGISTRY": "europe-west6-docker.pkg.dev",
1384
1380
  "DOCKER_TLS_CERTDIR": "",
1385
1381
  "ENV_SHORT": "review",
1386
1382
  "ENV_TYPE": "review",
@@ -1457,6 +1453,7 @@ _ALL_ENV_VAR_KEYS: '["ENV_SHORT","APP_DIR","ENV_TYPE","BUILD_INFO_ID","BUILD_INF
1457
1453
  done
1458
1454
  ",
1459
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",
1460
1457
  "set +e",
1461
1458
  "gcloud artifacts docker images delete europe-west6-docker.pkg.dev/google-project-id/catladder-deploy/pan-test-app/review/api --quiet --delete-tags",
1462
1459
  "set -e",
@@ -1728,12 +1725,20 @@ _ALL_ENV_VAR_KEYS: '["ENV_SHORT","APP_DIR","ENV_TYPE","BUILD_INFO_ID","BUILD_INF
1728
1725
  },
1729
1726
  "script": [
1730
1727
  "ensureNodeDockerfile",
1731
- "docker login --username gitlab-ci-token --password $CI_JOB_TOKEN $CI_REGISTRY",
1732
- "docker version",
1728
+ "echo -e "\\e[0Ksection_start:$(date +%s):docker-login[collapsed=true]\\r\\e[0KDocker Login"",
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",
1733
+ "echo -e "\\e[0Ksection_end:$(date +%s):docker-login\\r\\e[0K"",
1734
+ "echo -e "\\e[0Ksection_start:$(date +%s):docker-build[collapsed=true]\\r\\e[0KDocker build"",
1733
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",
1736
+ "echo -e "\\e[0Ksection_end:$(date +%s):docker-build\\r\\e[0K"",
1737
+ "echo -e "\\e[0Ksection_start:$(date +%s):docker-push[collapsed=true]\\r\\e[0KDocker push and tag"",
1734
1738
  "docker push $DOCKER_IMAGE:$DOCKER_IMAGE_TAG",
1735
1739
  "docker tag $DOCKER_IMAGE:$DOCKER_IMAGE_TAG $DOCKER_CACHE_IMAGE",
1736
1740
  "docker push $DOCKER_CACHE_IMAGE",
1741
+ "echo -e "\\e[0Ksection_end:$(date +%s):docker-push\\r\\e[0K"",
1737
1742
  ],
1738
1743
  "services": [
1739
1744
  {
@@ -1749,7 +1754,7 @@ _ALL_ENV_VAR_KEYS: '["ENV_SHORT","APP_DIR","ENV_TYPE","BUILD_INFO_ID","BUILD_INF
1749
1754
  "DOCKERFILE_ADDITIONS": undefined,
1750
1755
  "DOCKERFILE_ADDITIONS_END": undefined,
1751
1756
  "DOCKER_BUILDKIT": "1",
1752
- "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",
1753
1758
  "DOCKER_COPY_AND_INSTALL_APP": "COPY --chown=node:node $APP_DIR .
1754
1759
  RUN yarn plugin import workspace-tools
1755
1760
  RUN yarn workspaces focus --production && yarn rebuild",
@@ -1760,11 +1765,9 @@ COPY --chown=node:node .yarn /app/.yarn",
1760
1765
  "DOCKER_DIR": ".",
1761
1766
  "DOCKER_DRIVER": "overlay2",
1762
1767
  "DOCKER_HOST": "tcp://0.0.0.0:2375",
1763
- "DOCKER_IMAGE": "$DOCKER_REGISTRY_IMAGE_PATH/$DOCKER_IMAGE_NAME",
1764
- "DOCKER_IMAGE_NAME": "review/worker",
1768
+ "DOCKER_IMAGE": "europe-west6-docker.pkg.dev/google-project-id/catladder-deploy/pan-test-app/review/worker/mr1234",
1765
1769
  "DOCKER_IMAGE_TAG": "$CI_COMMIT_SHA",
1766
- "DOCKER_REGISTRY": "$CI_REGISTRY",
1767
- "DOCKER_REGISTRY_IMAGE_PATH": "$CI_REGISTRY_IMAGE",
1770
+ "DOCKER_REGISTRY": "europe-west6-docker.pkg.dev",
1768
1771
  "DOCKER_TLS_CERTDIR": "",
1769
1772
  "KUBERNETES_CPU_LIMIT": "1",
1770
1773
  "KUBERNETES_CPU_REQUEST": "0.5",
@@ -1780,7 +1783,7 @@ COPY --chown=node:node .yarn /app/.yarn",
1780
1783
  ],
1781
1784
  },
1782
1785
  "environment": {
1783
- "auto_stop_in": "2 week",
1786
+ "auto_stop_in": "1 week",
1784
1787
  "name": "review/some-commit/worker",
1785
1788
  "on_stop": "worker 🛑 Stop ⚠️ | review ",
1786
1789
  "url": "https://pan-test-app-review-mr1234-worker-unknown-host.example.com",
@@ -1833,13 +1836,6 @@ COPY --chown=node:node .yarn /app/.yarn",
1833
1836
  "export GCLOUD_PROJECT_NUMBER=$(gcloud projects describe google-project-id --format="value(projectNumber)")",
1834
1837
  "echo "GCLOUD_PROJECT_NUMBER: $GCLOUD_PROJECT_NUMBER"",
1835
1838
  "echo -e "\\e[0Ksection_end:$(date +%s):prepare\\r\\e[0K"",
1836
- "echo -e "\\e[0Ksection_start:$(date +%s):pushToArtifactRegistry[collapsed=true]\\r\\e[0KPushing image to artifacts registry"",
1837
- "docker login --username gitlab-ci-token --password $CI_JOB_TOKEN $CI_REGISTRY",
1838
- "gcloud auth configure-docker europe-west6-docker.pkg.dev",
1839
- "docker pull $DOCKER_IMAGE:$DOCKER_IMAGE_TAG",
1840
- "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",
1841
- "docker push europe-west6-docker.pkg.dev/google-project-id/catladder-deploy/pan-test-app/review/worker/mr1234:$DOCKER_IMAGE_TAG",
1842
- "echo -e "\\e[0Ksection_end:$(date +%s):pushToArtifactRegistry\\r\\e[0K"",
1843
1839
  "echo -e "\\e[0Ksection_start:$(date +%s):deploy[collapsed=true]\\r\\e[0KDeploy to cloud run"",
1844
1840
  "echo "$ENV_VARS" > ____envvars.yaml",
1845
1841
  "set +e",
@@ -1851,6 +1847,7 @@ COPY --chown=node:node .yarn /app/.yarn",
1851
1847
  "echo -e "\\e[0Ksection_start:$(date +%s):cleanup[collapsed=true]\\r\\e[0KCleanup"",
1852
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",
1853
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",
1854
1851
  "set +e",
1855
1852
  "gcloud artifacts docker images delete europe-west6-docker.pkg.dev/google-project-id/catladder-deploy/pan-test-app/review/worker --quiet --delete-tags",
1856
1853
  "set -e",
@@ -1880,14 +1877,12 @@ COPY --chown=node:node .yarn /app/.yarn",
1880
1877
  "DB_PASSWORD": "$CL_review_api_DB_PASSWORD",
1881
1878
  "DB_USER": "my-user",
1882
1879
  "DOCKER_BUILDKIT": "1",
1883
- "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",
1884
1881
  "DOCKER_DRIVER": "overlay2",
1885
1882
  "DOCKER_HOST": "tcp://0.0.0.0:2375",
1886
- "DOCKER_IMAGE": "$DOCKER_REGISTRY_IMAGE_PATH/$DOCKER_IMAGE_NAME",
1887
- "DOCKER_IMAGE_NAME": "review/worker",
1883
+ "DOCKER_IMAGE": "europe-west6-docker.pkg.dev/google-project-id/catladder-deploy/pan-test-app/review/worker/mr1234",
1888
1884
  "DOCKER_IMAGE_TAG": "$CI_COMMIT_SHA",
1889
- "DOCKER_REGISTRY": "$CI_REGISTRY",
1890
- "DOCKER_REGISTRY_IMAGE_PATH": "$CI_REGISTRY_IMAGE",
1885
+ "DOCKER_REGISTRY": "europe-west6-docker.pkg.dev",
1891
1886
  "DOCKER_TLS_CERTDIR": "",
1892
1887
  "ENV_SHORT": "review",
1893
1888
  "ENV_TYPE": "review",
@@ -1964,6 +1959,7 @@ _ALL_ENV_VAR_KEYS: '["ENV_SHORT","APP_DIR","ENV_TYPE","BUILD_INFO_ID","BUILD_INF
1964
1959
  done
1965
1960
  ",
1966
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",
1967
1963
  "set +e",
1968
1964
  "gcloud artifacts docker images delete europe-west6-docker.pkg.dev/google-project-id/catladder-deploy/pan-test-app/review/worker --quiet --delete-tags",
1969
1965
  "set -e",
@@ -2349,12 +2345,20 @@ _ALL_ENV_VAR_KEYS: '["ENV_SHORT","APP_DIR","ENV_TYPE","BUILD_INFO_ID","BUILD_INF
2349
2345
  },
2350
2346
  "script": [
2351
2347
  "ensureNodeDockerfile",
2352
- "docker login --username gitlab-ci-token --password $CI_JOB_TOKEN $CI_REGISTRY",
2353
- "docker version",
2348
+ "echo -e "\\e[0Ksection_start:$(date +%s):docker-login[collapsed=true]\\r\\e[0KDocker Login"",
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",
2353
+ "echo -e "\\e[0Ksection_end:$(date +%s):docker-login\\r\\e[0K"",
2354
+ "echo -e "\\e[0Ksection_start:$(date +%s):docker-build[collapsed=true]\\r\\e[0KDocker build"",
2354
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",
2356
+ "echo -e "\\e[0Ksection_end:$(date +%s):docker-build\\r\\e[0K"",
2357
+ "echo -e "\\e[0Ksection_start:$(date +%s):docker-push[collapsed=true]\\r\\e[0KDocker push and tag"",
2355
2358
  "docker push $DOCKER_IMAGE:$DOCKER_IMAGE_TAG",
2356
2359
  "docker tag $DOCKER_IMAGE:$DOCKER_IMAGE_TAG $DOCKER_CACHE_IMAGE",
2357
2360
  "docker push $DOCKER_CACHE_IMAGE",
2361
+ "echo -e "\\e[0Ksection_end:$(date +%s):docker-push\\r\\e[0K"",
2358
2362
  ],
2359
2363
  "services": [
2360
2364
  {
@@ -2370,7 +2374,7 @@ _ALL_ENV_VAR_KEYS: '["ENV_SHORT","APP_DIR","ENV_TYPE","BUILD_INFO_ID","BUILD_INF
2370
2374
  "DOCKERFILE_ADDITIONS": undefined,
2371
2375
  "DOCKERFILE_ADDITIONS_END": undefined,
2372
2376
  "DOCKER_BUILDKIT": "1",
2373
- "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",
2374
2378
  "DOCKER_COPY_AND_INSTALL_APP": "COPY --chown=node:node $APP_DIR .
2375
2379
  RUN yarn plugin import workspace-tools
2376
2380
  RUN yarn workspaces focus --production && yarn rebuild",
@@ -2381,11 +2385,9 @@ COPY --chown=node:node .yarn /app/.yarn",
2381
2385
  "DOCKER_DIR": ".",
2382
2386
  "DOCKER_DRIVER": "overlay2",
2383
2387
  "DOCKER_HOST": "tcp://0.0.0.0:2375",
2384
- "DOCKER_IMAGE": "$DOCKER_REGISTRY_IMAGE_PATH/$DOCKER_IMAGE_NAME",
2385
- "DOCKER_IMAGE_NAME": "prod/api",
2388
+ "DOCKER_IMAGE": "europe-west6-docker.pkg.dev/google-project-id/catladder-deploy/pan-test-app/prod/api",
2386
2389
  "DOCKER_IMAGE_TAG": "$CI_COMMIT_SHA",
2387
- "DOCKER_REGISTRY": "$CI_REGISTRY",
2388
- "DOCKER_REGISTRY_IMAGE_PATH": "$CI_REGISTRY_IMAGE",
2390
+ "DOCKER_REGISTRY": "europe-west6-docker.pkg.dev",
2389
2391
  "DOCKER_TLS_CERTDIR": "",
2390
2392
  "KUBERNETES_CPU_LIMIT": "1",
2391
2393
  "KUBERNETES_CPU_REQUEST": "0.5",
@@ -2417,12 +2419,20 @@ COPY --chown=node:node .yarn /app/.yarn",
2417
2419
  },
2418
2420
  "script": [
2419
2421
  "ensureNodeDockerfile",
2420
- "docker login --username gitlab-ci-token --password $CI_JOB_TOKEN $CI_REGISTRY",
2421
- "docker version",
2422
+ "echo -e "\\e[0Ksection_start:$(date +%s):docker-login[collapsed=true]\\r\\e[0KDocker Login"",
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",
2427
+ "echo -e "\\e[0Ksection_end:$(date +%s):docker-login\\r\\e[0K"",
2428
+ "echo -e "\\e[0Ksection_start:$(date +%s):docker-build[collapsed=true]\\r\\e[0KDocker build"",
2422
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",
2430
+ "echo -e "\\e[0Ksection_end:$(date +%s):docker-build\\r\\e[0K"",
2431
+ "echo -e "\\e[0Ksection_start:$(date +%s):docker-push[collapsed=true]\\r\\e[0KDocker push and tag"",
2423
2432
  "docker push $DOCKER_IMAGE:$DOCKER_IMAGE_TAG",
2424
2433
  "docker tag $DOCKER_IMAGE:$DOCKER_IMAGE_TAG $DOCKER_CACHE_IMAGE",
2425
2434
  "docker push $DOCKER_CACHE_IMAGE",
2435
+ "echo -e "\\e[0Ksection_end:$(date +%s):docker-push\\r\\e[0K"",
2426
2436
  ],
2427
2437
  "services": [
2428
2438
  {
@@ -2438,7 +2448,7 @@ COPY --chown=node:node .yarn /app/.yarn",
2438
2448
  "DOCKERFILE_ADDITIONS": undefined,
2439
2449
  "DOCKERFILE_ADDITIONS_END": undefined,
2440
2450
  "DOCKER_BUILDKIT": "1",
2441
- "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",
2442
2452
  "DOCKER_COPY_AND_INSTALL_APP": "COPY --chown=node:node $APP_DIR .
2443
2453
  RUN yarn plugin import workspace-tools
2444
2454
  RUN yarn workspaces focus --production && yarn rebuild",
@@ -2449,11 +2459,9 @@ COPY --chown=node:node .yarn /app/.yarn",
2449
2459
  "DOCKER_DIR": ".",
2450
2460
  "DOCKER_DRIVER": "overlay2",
2451
2461
  "DOCKER_HOST": "tcp://0.0.0.0:2375",
2452
- "DOCKER_IMAGE": "$DOCKER_REGISTRY_IMAGE_PATH/$DOCKER_IMAGE_NAME",
2453
- "DOCKER_IMAGE_NAME": "stage/api",
2462
+ "DOCKER_IMAGE": "europe-west6-docker.pkg.dev/google-project-id/catladder-deploy/pan-test-app/stage/api",
2454
2463
  "DOCKER_IMAGE_TAG": "$CI_COMMIT_SHA",
2455
- "DOCKER_REGISTRY": "$CI_REGISTRY",
2456
- "DOCKER_REGISTRY_IMAGE_PATH": "$CI_REGISTRY_IMAGE",
2464
+ "DOCKER_REGISTRY": "europe-west6-docker.pkg.dev",
2457
2465
  "DOCKER_TLS_CERTDIR": "",
2458
2466
  "KUBERNETES_CPU_LIMIT": "1",
2459
2467
  "KUBERNETES_CPU_REQUEST": "0.5",
@@ -2510,13 +2518,6 @@ COPY --chown=node:node .yarn /app/.yarn",
2510
2518
  "export GCLOUD_PROJECT_NUMBER=$(gcloud projects describe google-project-id --format="value(projectNumber)")",
2511
2519
  "echo "GCLOUD_PROJECT_NUMBER: $GCLOUD_PROJECT_NUMBER"",
2512
2520
  "echo -e "\\e[0Ksection_end:$(date +%s):prepare\\r\\e[0K"",
2513
- "echo -e "\\e[0Ksection_start:$(date +%s):pushToArtifactRegistry[collapsed=true]\\r\\e[0KPushing image to artifacts registry"",
2514
- "docker login --username gitlab-ci-token --password $CI_JOB_TOKEN $CI_REGISTRY",
2515
- "gcloud auth configure-docker europe-west6-docker.pkg.dev",
2516
- "docker pull $DOCKER_IMAGE:$DOCKER_IMAGE_TAG",
2517
- "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",
2518
- "docker push europe-west6-docker.pkg.dev/google-project-id/catladder-deploy/pan-test-app/prod/api:$DOCKER_IMAGE_TAG",
2519
- "echo -e "\\e[0Ksection_end:$(date +%s):pushToArtifactRegistry\\r\\e[0K"",
2520
2521
  "echo -e "\\e[0Ksection_start:$(date +%s):deploy[collapsed=true]\\r\\e[0KDeploy to cloud run"",
2521
2522
  "echo "$ENV_VARS" > ____envvars.yaml",
2522
2523
  "set +e",
@@ -2528,6 +2529,7 @@ COPY --chown=node:node .yarn /app/.yarn",
2528
2529
  "echo -e "\\e[0Ksection_start:$(date +%s):cleanup[collapsed=true]\\r\\e[0KCleanup"",
2529
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",
2530
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",
2531
2533
  "echo -e "\\e[0Ksection_end:$(date +%s):cleanup\\r\\e[0K"",
2532
2534
  "echo Uploading SBOM to Dependency Track",
2533
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",
@@ -2554,14 +2556,12 @@ COPY --chown=node:node .yarn /app/.yarn",
2554
2556
  "DB_PASSWORD": "$CL_prod_api_DB_PASSWORD",
2555
2557
  "DB_USER": "my-user",
2556
2558
  "DOCKER_BUILDKIT": "1",
2557
- "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",
2558
2560
  "DOCKER_DRIVER": "overlay2",
2559
2561
  "DOCKER_HOST": "tcp://0.0.0.0:2375",
2560
- "DOCKER_IMAGE": "$DOCKER_REGISTRY_IMAGE_PATH/$DOCKER_IMAGE_NAME",
2561
- "DOCKER_IMAGE_NAME": "prod/api",
2562
+ "DOCKER_IMAGE": "europe-west6-docker.pkg.dev/google-project-id/catladder-deploy/pan-test-app/prod/api",
2562
2563
  "DOCKER_IMAGE_TAG": "$CI_COMMIT_SHA",
2563
- "DOCKER_REGISTRY": "$CI_REGISTRY",
2564
- "DOCKER_REGISTRY_IMAGE_PATH": "$CI_REGISTRY_IMAGE",
2564
+ "DOCKER_REGISTRY": "europe-west6-docker.pkg.dev",
2565
2565
  "DOCKER_TLS_CERTDIR": "",
2566
2566
  "ENV_SHORT": "prod",
2567
2567
  "ENV_TYPE": "prod",
@@ -2644,13 +2644,6 @@ _ALL_ENV_VAR_KEYS: '["ENV_SHORT","APP_DIR","ENV_TYPE","BUILD_INFO_ID","BUILD_INF
2644
2644
  "export GCLOUD_PROJECT_NUMBER=$(gcloud projects describe google-project-id --format="value(projectNumber)")",
2645
2645
  "echo "GCLOUD_PROJECT_NUMBER: $GCLOUD_PROJECT_NUMBER"",
2646
2646
  "echo -e "\\e[0Ksection_end:$(date +%s):prepare\\r\\e[0K"",
2647
- "echo -e "\\e[0Ksection_start:$(date +%s):pushToArtifactRegistry[collapsed=true]\\r\\e[0KPushing image to artifacts registry"",
2648
- "docker login --username gitlab-ci-token --password $CI_JOB_TOKEN $CI_REGISTRY",
2649
- "gcloud auth configure-docker europe-west6-docker.pkg.dev",
2650
- "docker pull $DOCKER_IMAGE:$DOCKER_IMAGE_TAG",
2651
- "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",
2652
- "docker push europe-west6-docker.pkg.dev/google-project-id/catladder-deploy/pan-test-app/stage/api:$DOCKER_IMAGE_TAG",
2653
- "echo -e "\\e[0Ksection_end:$(date +%s):pushToArtifactRegistry\\r\\e[0K"",
2654
2647
  "echo -e "\\e[0Ksection_start:$(date +%s):deploy[collapsed=true]\\r\\e[0KDeploy to cloud run"",
2655
2648
  "echo "$ENV_VARS" > ____envvars.yaml",
2656
2649
  "set +e",
@@ -2662,6 +2655,7 @@ _ALL_ENV_VAR_KEYS: '["ENV_SHORT","APP_DIR","ENV_TYPE","BUILD_INFO_ID","BUILD_INF
2662
2655
  "echo -e "\\e[0Ksection_start:$(date +%s):cleanup[collapsed=true]\\r\\e[0KCleanup"",
2663
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",
2664
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",
2665
2659
  "echo -e "\\e[0Ksection_end:$(date +%s):cleanup\\r\\e[0K"",
2666
2660
  "echo Uploading SBOM to Dependency Track",
2667
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",
@@ -2688,14 +2682,12 @@ _ALL_ENV_VAR_KEYS: '["ENV_SHORT","APP_DIR","ENV_TYPE","BUILD_INFO_ID","BUILD_INF
2688
2682
  "DB_PASSWORD": "$CL_stage_api_DB_PASSWORD",
2689
2683
  "DB_USER": "my-user",
2690
2684
  "DOCKER_BUILDKIT": "1",
2691
- "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",
2692
2686
  "DOCKER_DRIVER": "overlay2",
2693
2687
  "DOCKER_HOST": "tcp://0.0.0.0:2375",
2694
- "DOCKER_IMAGE": "$DOCKER_REGISTRY_IMAGE_PATH/$DOCKER_IMAGE_NAME",
2695
- "DOCKER_IMAGE_NAME": "stage/api",
2688
+ "DOCKER_IMAGE": "europe-west6-docker.pkg.dev/google-project-id/catladder-deploy/pan-test-app/stage/api",
2696
2689
  "DOCKER_IMAGE_TAG": "$CI_COMMIT_SHA",
2697
- "DOCKER_REGISTRY": "$CI_REGISTRY",
2698
- "DOCKER_REGISTRY_IMAGE_PATH": "$CI_REGISTRY_IMAGE",
2690
+ "DOCKER_REGISTRY": "europe-west6-docker.pkg.dev",
2699
2691
  "DOCKER_TLS_CERTDIR": "",
2700
2692
  "ENV_SHORT": "stage",
2701
2693
  "ENV_TYPE": "stage",
@@ -2763,6 +2755,7 @@ _ALL_ENV_VAR_KEYS: '["ENV_SHORT","APP_DIR","ENV_TYPE","BUILD_INFO_ID","BUILD_INF
2763
2755
  "gcloud auth activate-service-account --key-file="./____keyfile.json"",
2764
2756
  "gcloud run services delete pan-test-app-prod-api --project=google-project-id --region=europe-west6",
2765
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",
2766
2759
  "echo Disabling component in Dependency Track",
2767
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",
2768
2761
  "set -e",
@@ -2811,6 +2804,7 @@ _ALL_ENV_VAR_KEYS: '["ENV_SHORT","APP_DIR","ENV_TYPE","BUILD_INFO_ID","BUILD_INF
2811
2804
  "gcloud auth activate-service-account --key-file="./____keyfile.json"",
2812
2805
  "gcloud run services delete pan-test-app-stage-api --project=google-project-id --region=europe-west6",
2813
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",
2814
2808
  "echo Disabling component in Dependency Track",
2815
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",
2816
2810
  "set -e",
@@ -3071,12 +3065,20 @@ _ALL_ENV_VAR_KEYS: '["ENV_SHORT","APP_DIR","ENV_TYPE","BUILD_INFO_ID","BUILD_INF
3071
3065
  },
3072
3066
  "script": [
3073
3067
  "ensureNodeDockerfile",
3074
- "docker login --username gitlab-ci-token --password $CI_JOB_TOKEN $CI_REGISTRY",
3075
- "docker version",
3068
+ "echo -e "\\e[0Ksection_start:$(date +%s):docker-login[collapsed=true]\\r\\e[0KDocker Login"",
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",
3073
+ "echo -e "\\e[0Ksection_end:$(date +%s):docker-login\\r\\e[0K"",
3074
+ "echo -e "\\e[0Ksection_start:$(date +%s):docker-build[collapsed=true]\\r\\e[0KDocker build"",
3076
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",
3076
+ "echo -e "\\e[0Ksection_end:$(date +%s):docker-build\\r\\e[0K"",
3077
+ "echo -e "\\e[0Ksection_start:$(date +%s):docker-push[collapsed=true]\\r\\e[0KDocker push and tag"",
3077
3078
  "docker push $DOCKER_IMAGE:$DOCKER_IMAGE_TAG",
3078
3079
  "docker tag $DOCKER_IMAGE:$DOCKER_IMAGE_TAG $DOCKER_CACHE_IMAGE",
3079
3080
  "docker push $DOCKER_CACHE_IMAGE",
3081
+ "echo -e "\\e[0Ksection_end:$(date +%s):docker-push\\r\\e[0K"",
3080
3082
  ],
3081
3083
  "services": [
3082
3084
  {
@@ -3092,7 +3094,7 @@ _ALL_ENV_VAR_KEYS: '["ENV_SHORT","APP_DIR","ENV_TYPE","BUILD_INFO_ID","BUILD_INF
3092
3094
  "DOCKERFILE_ADDITIONS": undefined,
3093
3095
  "DOCKERFILE_ADDITIONS_END": undefined,
3094
3096
  "DOCKER_BUILDKIT": "1",
3095
- "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",
3096
3098
  "DOCKER_COPY_AND_INSTALL_APP": "COPY --chown=node:node $APP_DIR .
3097
3099
  RUN yarn plugin import workspace-tools
3098
3100
  RUN yarn workspaces focus --production && yarn rebuild",
@@ -3103,11 +3105,9 @@ COPY --chown=node:node .yarn /app/.yarn",
3103
3105
  "DOCKER_DIR": ".",
3104
3106
  "DOCKER_DRIVER": "overlay2",
3105
3107
  "DOCKER_HOST": "tcp://0.0.0.0:2375",
3106
- "DOCKER_IMAGE": "$DOCKER_REGISTRY_IMAGE_PATH/$DOCKER_IMAGE_NAME",
3107
- "DOCKER_IMAGE_NAME": "prod/worker",
3108
+ "DOCKER_IMAGE": "europe-west6-docker.pkg.dev/google-project-id/catladder-deploy/pan-test-app/prod/worker",
3108
3109
  "DOCKER_IMAGE_TAG": "$CI_COMMIT_SHA",
3109
- "DOCKER_REGISTRY": "$CI_REGISTRY",
3110
- "DOCKER_REGISTRY_IMAGE_PATH": "$CI_REGISTRY_IMAGE",
3110
+ "DOCKER_REGISTRY": "europe-west6-docker.pkg.dev",
3111
3111
  "DOCKER_TLS_CERTDIR": "",
3112
3112
  "KUBERNETES_CPU_LIMIT": "1",
3113
3113
  "KUBERNETES_CPU_REQUEST": "0.5",
@@ -3139,12 +3139,20 @@ COPY --chown=node:node .yarn /app/.yarn",
3139
3139
  },
3140
3140
  "script": [
3141
3141
  "ensureNodeDockerfile",
3142
- "docker login --username gitlab-ci-token --password $CI_JOB_TOKEN $CI_REGISTRY",
3143
- "docker version",
3142
+ "echo -e "\\e[0Ksection_start:$(date +%s):docker-login[collapsed=true]\\r\\e[0KDocker Login"",
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",
3147
+ "echo -e "\\e[0Ksection_end:$(date +%s):docker-login\\r\\e[0K"",
3148
+ "echo -e "\\e[0Ksection_start:$(date +%s):docker-build[collapsed=true]\\r\\e[0KDocker build"",
3144
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",
3150
+ "echo -e "\\e[0Ksection_end:$(date +%s):docker-build\\r\\e[0K"",
3151
+ "echo -e "\\e[0Ksection_start:$(date +%s):docker-push[collapsed=true]\\r\\e[0KDocker push and tag"",
3145
3152
  "docker push $DOCKER_IMAGE:$DOCKER_IMAGE_TAG",
3146
3153
  "docker tag $DOCKER_IMAGE:$DOCKER_IMAGE_TAG $DOCKER_CACHE_IMAGE",
3147
3154
  "docker push $DOCKER_CACHE_IMAGE",
3155
+ "echo -e "\\e[0Ksection_end:$(date +%s):docker-push\\r\\e[0K"",
3148
3156
  ],
3149
3157
  "services": [
3150
3158
  {
@@ -3160,7 +3168,7 @@ COPY --chown=node:node .yarn /app/.yarn",
3160
3168
  "DOCKERFILE_ADDITIONS": undefined,
3161
3169
  "DOCKERFILE_ADDITIONS_END": undefined,
3162
3170
  "DOCKER_BUILDKIT": "1",
3163
- "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",
3164
3172
  "DOCKER_COPY_AND_INSTALL_APP": "COPY --chown=node:node $APP_DIR .
3165
3173
  RUN yarn plugin import workspace-tools
3166
3174
  RUN yarn workspaces focus --production && yarn rebuild",
@@ -3171,11 +3179,9 @@ COPY --chown=node:node .yarn /app/.yarn",
3171
3179
  "DOCKER_DIR": ".",
3172
3180
  "DOCKER_DRIVER": "overlay2",
3173
3181
  "DOCKER_HOST": "tcp://0.0.0.0:2375",
3174
- "DOCKER_IMAGE": "$DOCKER_REGISTRY_IMAGE_PATH/$DOCKER_IMAGE_NAME",
3175
- "DOCKER_IMAGE_NAME": "stage/worker",
3182
+ "DOCKER_IMAGE": "europe-west6-docker.pkg.dev/google-project-id/catladder-deploy/pan-test-app/stage/worker",
3176
3183
  "DOCKER_IMAGE_TAG": "$CI_COMMIT_SHA",
3177
- "DOCKER_REGISTRY": "$CI_REGISTRY",
3178
- "DOCKER_REGISTRY_IMAGE_PATH": "$CI_REGISTRY_IMAGE",
3184
+ "DOCKER_REGISTRY": "europe-west6-docker.pkg.dev",
3179
3185
  "DOCKER_TLS_CERTDIR": "",
3180
3186
  "KUBERNETES_CPU_LIMIT": "1",
3181
3187
  "KUBERNETES_CPU_REQUEST": "0.5",
@@ -3232,13 +3238,6 @@ COPY --chown=node:node .yarn /app/.yarn",
3232
3238
  "export GCLOUD_PROJECT_NUMBER=$(gcloud projects describe google-project-id --format="value(projectNumber)")",
3233
3239
  "echo "GCLOUD_PROJECT_NUMBER: $GCLOUD_PROJECT_NUMBER"",
3234
3240
  "echo -e "\\e[0Ksection_end:$(date +%s):prepare\\r\\e[0K"",
3235
- "echo -e "\\e[0Ksection_start:$(date +%s):pushToArtifactRegistry[collapsed=true]\\r\\e[0KPushing image to artifacts registry"",
3236
- "docker login --username gitlab-ci-token --password $CI_JOB_TOKEN $CI_REGISTRY",
3237
- "gcloud auth configure-docker europe-west6-docker.pkg.dev",
3238
- "docker pull $DOCKER_IMAGE:$DOCKER_IMAGE_TAG",
3239
- "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",
3240
- "docker push europe-west6-docker.pkg.dev/google-project-id/catladder-deploy/pan-test-app/prod/worker:$DOCKER_IMAGE_TAG",
3241
- "echo -e "\\e[0Ksection_end:$(date +%s):pushToArtifactRegistry\\r\\e[0K"",
3242
3241
  "echo -e "\\e[0Ksection_start:$(date +%s):deploy[collapsed=true]\\r\\e[0KDeploy to cloud run"",
3243
3242
  "echo "$ENV_VARS" > ____envvars.yaml",
3244
3243
  "set +e",
@@ -3250,6 +3249,7 @@ COPY --chown=node:node .yarn /app/.yarn",
3250
3249
  "echo -e "\\e[0Ksection_start:$(date +%s):cleanup[collapsed=true]\\r\\e[0KCleanup"",
3251
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",
3252
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",
3253
3253
  "echo -e "\\e[0Ksection_end:$(date +%s):cleanup\\r\\e[0K"",
3254
3254
  "echo Uploading SBOM to Dependency Track",
3255
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",
@@ -3276,14 +3276,12 @@ COPY --chown=node:node .yarn /app/.yarn",
3276
3276
  "DB_PASSWORD": "$CL_prod_api_DB_PASSWORD",
3277
3277
  "DB_USER": "my-user",
3278
3278
  "DOCKER_BUILDKIT": "1",
3279
- "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",
3280
3280
  "DOCKER_DRIVER": "overlay2",
3281
3281
  "DOCKER_HOST": "tcp://0.0.0.0:2375",
3282
- "DOCKER_IMAGE": "$DOCKER_REGISTRY_IMAGE_PATH/$DOCKER_IMAGE_NAME",
3283
- "DOCKER_IMAGE_NAME": "prod/worker",
3282
+ "DOCKER_IMAGE": "europe-west6-docker.pkg.dev/google-project-id/catladder-deploy/pan-test-app/prod/worker",
3284
3283
  "DOCKER_IMAGE_TAG": "$CI_COMMIT_SHA",
3285
- "DOCKER_REGISTRY": "$CI_REGISTRY",
3286
- "DOCKER_REGISTRY_IMAGE_PATH": "$CI_REGISTRY_IMAGE",
3284
+ "DOCKER_REGISTRY": "europe-west6-docker.pkg.dev",
3287
3285
  "DOCKER_TLS_CERTDIR": "",
3288
3286
  "ENV_SHORT": "prod",
3289
3287
  "ENV_TYPE": "prod",
@@ -3366,13 +3364,6 @@ _ALL_ENV_VAR_KEYS: '["ENV_SHORT","APP_DIR","ENV_TYPE","BUILD_INFO_ID","BUILD_INF
3366
3364
  "export GCLOUD_PROJECT_NUMBER=$(gcloud projects describe google-project-id --format="value(projectNumber)")",
3367
3365
  "echo "GCLOUD_PROJECT_NUMBER: $GCLOUD_PROJECT_NUMBER"",
3368
3366
  "echo -e "\\e[0Ksection_end:$(date +%s):prepare\\r\\e[0K"",
3369
- "echo -e "\\e[0Ksection_start:$(date +%s):pushToArtifactRegistry[collapsed=true]\\r\\e[0KPushing image to artifacts registry"",
3370
- "docker login --username gitlab-ci-token --password $CI_JOB_TOKEN $CI_REGISTRY",
3371
- "gcloud auth configure-docker europe-west6-docker.pkg.dev",
3372
- "docker pull $DOCKER_IMAGE:$DOCKER_IMAGE_TAG",
3373
- "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",
3374
- "docker push europe-west6-docker.pkg.dev/google-project-id/catladder-deploy/pan-test-app/stage/worker:$DOCKER_IMAGE_TAG",
3375
- "echo -e "\\e[0Ksection_end:$(date +%s):pushToArtifactRegistry\\r\\e[0K"",
3376
3367
  "echo -e "\\e[0Ksection_start:$(date +%s):deploy[collapsed=true]\\r\\e[0KDeploy to cloud run"",
3377
3368
  "echo "$ENV_VARS" > ____envvars.yaml",
3378
3369
  "set +e",
@@ -3384,6 +3375,7 @@ _ALL_ENV_VAR_KEYS: '["ENV_SHORT","APP_DIR","ENV_TYPE","BUILD_INFO_ID","BUILD_INF
3384
3375
  "echo -e "\\e[0Ksection_start:$(date +%s):cleanup[collapsed=true]\\r\\e[0KCleanup"",
3385
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",
3386
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",
3387
3379
  "echo -e "\\e[0Ksection_end:$(date +%s):cleanup\\r\\e[0K"",
3388
3380
  "echo Uploading SBOM to Dependency Track",
3389
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",
@@ -3410,14 +3402,12 @@ _ALL_ENV_VAR_KEYS: '["ENV_SHORT","APP_DIR","ENV_TYPE","BUILD_INFO_ID","BUILD_INF
3410
3402
  "DB_PASSWORD": "$CL_stage_api_DB_PASSWORD",
3411
3403
  "DB_USER": "my-user",
3412
3404
  "DOCKER_BUILDKIT": "1",
3413
- "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",
3414
3406
  "DOCKER_DRIVER": "overlay2",
3415
3407
  "DOCKER_HOST": "tcp://0.0.0.0:2375",
3416
- "DOCKER_IMAGE": "$DOCKER_REGISTRY_IMAGE_PATH/$DOCKER_IMAGE_NAME",
3417
- "DOCKER_IMAGE_NAME": "stage/worker",
3408
+ "DOCKER_IMAGE": "europe-west6-docker.pkg.dev/google-project-id/catladder-deploy/pan-test-app/stage/worker",
3418
3409
  "DOCKER_IMAGE_TAG": "$CI_COMMIT_SHA",
3419
- "DOCKER_REGISTRY": "$CI_REGISTRY",
3420
- "DOCKER_REGISTRY_IMAGE_PATH": "$CI_REGISTRY_IMAGE",
3410
+ "DOCKER_REGISTRY": "europe-west6-docker.pkg.dev",
3421
3411
  "DOCKER_TLS_CERTDIR": "",
3422
3412
  "ENV_SHORT": "stage",
3423
3413
  "ENV_TYPE": "stage",
@@ -3485,6 +3475,7 @@ _ALL_ENV_VAR_KEYS: '["ENV_SHORT","APP_DIR","ENV_TYPE","BUILD_INFO_ID","BUILD_INF
3485
3475
  "gcloud auth activate-service-account --key-file="./____keyfile.json"",
3486
3476
  "gcloud run services delete pan-test-app-prod-worker --project=google-project-id --region=europe-west6",
3487
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",
3488
3479
  "echo Disabling component in Dependency Track",
3489
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",
3490
3481
  "set -e",
@@ -3533,6 +3524,7 @@ _ALL_ENV_VAR_KEYS: '["ENV_SHORT","APP_DIR","ENV_TYPE","BUILD_INFO_ID","BUILD_INF
3533
3524
  "gcloud auth activate-service-account --key-file="./____keyfile.json"",
3534
3525
  "gcloud run services delete pan-test-app-stage-worker --project=google-project-id --region=europe-west6",
3535
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",
3536
3528
  "echo Disabling component in Dependency Track",
3537
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",
3538
3530
  "set -e",