@catladder/pipeline 1.124.0 → 1.124.1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (40) hide show
  1. package/dist/build/custom/buildJob.js +1 -1
  2. package/dist/build/docker.d.ts +26 -6
  3. package/dist/build/docker.js +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.ts.snap CHANGED
@@ -167,7 +167,10 @@ exports[`matches snapshot 1`] = `
167
167
  "script": [
168
168
  "ensureNodeDockerfile",
169
169
  "echo -e "\\e[0Ksection_start:$(date +%s):docker-login[collapsed=true]\\r\\e[0KDocker Login"",
170
- "docker login --username gitlab-ci-token --password $CI_JOB_TOKEN $CI_REGISTRY",
170
+ "echo $CL_dev_api_GCLOUD_DEPLOY_credentialsKey > ./____keyfile.json
171
+ ",
172
+ "gcloud auth activate-service-account --key-file="./____keyfile.json"",
173
+ "gcloud auth configure-docker europe-west6-docker.pkg.dev",
171
174
  "echo -e "\\e[0Ksection_end:$(date +%s):docker-login\\r\\e[0K"",
172
175
  "echo -e "\\e[0Ksection_start:$(date +%s):docker-build[collapsed=true]\\r\\e[0KDocker build"",
173
176
  "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",
@@ -192,7 +195,7 @@ exports[`matches snapshot 1`] = `
192
195
  "DOCKERFILE_ADDITIONS": undefined,
193
196
  "DOCKERFILE_ADDITIONS_END": undefined,
194
197
  "DOCKER_BUILDKIT": "1",
195
- "DOCKER_CACHE_IMAGE": "$DOCKER_REGISTRY_IMAGE_PATH/caches/api",
198
+ "DOCKER_CACHE_IMAGE": "europe-west6-docker.pkg.dev/google-project-id/catladder-deploy/pan-test-app/caches/api",
196
199
  "DOCKER_COPY_AND_INSTALL_APP": "COPY --chown=node:node $APP_DIR .
197
200
  RUN yarn plugin import workspace-tools
198
201
  RUN yarn workspaces focus --production && yarn rebuild",
@@ -203,11 +206,9 @@ COPY --chown=node:node .yarn /app/.yarn",
203
206
  "DOCKER_DIR": ".",
204
207
  "DOCKER_DRIVER": "overlay2",
205
208
  "DOCKER_HOST": "tcp://0.0.0.0:2375",
206
- "DOCKER_IMAGE": "$DOCKER_REGISTRY_IMAGE_PATH/$DOCKER_IMAGE_NAME",
207
- "DOCKER_IMAGE_NAME": "dev/api",
209
+ "DOCKER_IMAGE": "europe-west6-docker.pkg.dev/google-project-id/catladder-deploy/pan-test-app/dev/api",
208
210
  "DOCKER_IMAGE_TAG": "$CI_COMMIT_SHA",
209
- "DOCKER_REGISTRY": "$CI_REGISTRY",
210
- "DOCKER_REGISTRY_IMAGE_PATH": "$CI_REGISTRY_IMAGE",
211
+ "DOCKER_REGISTRY": "europe-west6-docker.pkg.dev",
211
212
  "DOCKER_TLS_CERTDIR": "",
212
213
  "KUBERNETES_CPU_LIMIT": "1",
213
214
  "KUBERNETES_CPU_REQUEST": "0.5",
@@ -276,13 +277,6 @@ COPY --chown=node:node .yarn /app/.yarn",
276
277
  "export GCLOUD_PROJECT_NUMBER=$(gcloud projects describe google-project-id --format="value(projectNumber)")",
277
278
  "echo "GCLOUD_PROJECT_NUMBER: $GCLOUD_PROJECT_NUMBER"",
278
279
  "echo -e "\\e[0Ksection_end:$(date +%s):prepare\\r\\e[0K"",
279
- "echo -e "\\e[0Ksection_start:$(date +%s):pushToArtifactRegistry[collapsed=true]\\r\\e[0KPushing image to artifacts registry"",
280
- "docker login --username gitlab-ci-token --password $CI_JOB_TOKEN $CI_REGISTRY",
281
- "gcloud auth configure-docker europe-west6-docker.pkg.dev",
282
- "docker pull $DOCKER_IMAGE:$DOCKER_IMAGE_TAG",
283
- "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",
284
- "docker push europe-west6-docker.pkg.dev/google-project-id/catladder-deploy/pan-test-app/dev/api:$DOCKER_IMAGE_TAG",
285
- "echo -e "\\e[0Ksection_end:$(date +%s):pushToArtifactRegistry\\r\\e[0K"",
286
280
  "echo -e "\\e[0Ksection_start:$(date +%s):deploy[collapsed=true]\\r\\e[0KDeploy to cloud run"",
287
281
  "echo "$ENV_VARS" > ____envvars.yaml",
288
282
  "set +e",
@@ -307,6 +301,7 @@ COPY --chown=node:node .yarn /app/.yarn",
307
301
  "echo -e "\\e[0Ksection_start:$(date +%s):cleanup[collapsed=true]\\r\\e[0KCleanup"",
308
302
  "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",
309
303
  "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",
304
+ "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",
310
305
  "echo -e "\\e[0Ksection_end:$(date +%s):cleanup\\r\\e[0K"",
311
306
  "echo Uploading SBOM to Dependency Track",
312
307
  "/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",
@@ -335,14 +330,12 @@ COPY --chown=node:node .yarn /app/.yarn",
335
330
  "DB_PASSWORD": "$CL_dev_api_DB_PASSWORD",
336
331
  "DB_USER": "my-user",
337
332
  "DOCKER_BUILDKIT": "1",
338
- "DOCKER_CACHE_IMAGE": "$DOCKER_REGISTRY_IMAGE_PATH/caches/api",
333
+ "DOCKER_CACHE_IMAGE": "europe-west6-docker.pkg.dev/google-project-id/catladder-deploy/pan-test-app/caches/api",
339
334
  "DOCKER_DRIVER": "overlay2",
340
335
  "DOCKER_HOST": "tcp://0.0.0.0:2375",
341
- "DOCKER_IMAGE": "$DOCKER_REGISTRY_IMAGE_PATH/$DOCKER_IMAGE_NAME",
342
- "DOCKER_IMAGE_NAME": "dev/api",
336
+ "DOCKER_IMAGE": "europe-west6-docker.pkg.dev/google-project-id/catladder-deploy/pan-test-app/dev/api",
343
337
  "DOCKER_IMAGE_TAG": "$CI_COMMIT_SHA",
344
- "DOCKER_REGISTRY": "$CI_REGISTRY",
345
- "DOCKER_REGISTRY_IMAGE_PATH": "$CI_REGISTRY_IMAGE",
338
+ "DOCKER_REGISTRY": "europe-west6-docker.pkg.dev",
346
339
  "DOCKER_TLS_CERTDIR": "",
347
340
  "ENV_SHORT": "dev",
348
341
  "ENV_TYPE": "dev",
@@ -417,6 +410,7 @@ _ALL_ENV_VAR_KEYS: '["ENV_SHORT","APP_DIR","ENV_TYPE","BUILD_INFO_ID","BUILD_INF
417
410
  "gcloud beta run jobs executions list --project=google-project-id --region=europe-west6 --job pan-test-app-dev-api-send-reminders --format="value(name)" | xargs -I {} gcloud beta run jobs executions delete {} --quiet --project=google-project-id --region=europe-west6",
418
411
  "gcloud beta run jobs delete pan-test-app-dev-api-send-reminders --project=google-project-id --region=europe-west6",
419
412
  "gcloud artifacts docker images delete europe-west6-docker.pkg.dev/google-project-id/catladder-deploy/pan-test-app/dev/api --quiet --delete-tags",
413
+ "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",
420
414
  "echo Disabling component in Dependency Track",
421
415
  "/dtrackuploader https://dep.panter.swiss/ "$DT_KEY_PROD" disable "pan-test-app/api" "https://pan-test-app-dev-api-unknown-host.example.com" || true",
422
416
  "set -e",
@@ -681,7 +675,10 @@ _ALL_ENV_VAR_KEYS: '["ENV_SHORT","APP_DIR","ENV_TYPE","BUILD_INFO_ID","BUILD_INF
681
675
  "script": [
682
676
  "ensureNodeDockerfile",
683
677
  "echo -e "\\e[0Ksection_start:$(date +%s):docker-login[collapsed=true]\\r\\e[0KDocker Login"",
684
- "docker login --username gitlab-ci-token --password $CI_JOB_TOKEN $CI_REGISTRY",
678
+ "echo $CL_dev_www_GCLOUD_DEPLOY_credentialsKey > ./____keyfile.json
679
+ ",
680
+ "gcloud auth activate-service-account --key-file="./____keyfile.json"",
681
+ "gcloud auth configure-docker europe-west6-docker.pkg.dev",
685
682
  "echo -e "\\e[0Ksection_end:$(date +%s):docker-login\\r\\e[0K"",
686
683
  "echo -e "\\e[0Ksection_start:$(date +%s):docker-build[collapsed=true]\\r\\e[0KDocker build"",
687
684
  "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",
@@ -706,7 +703,7 @@ _ALL_ENV_VAR_KEYS: '["ENV_SHORT","APP_DIR","ENV_TYPE","BUILD_INFO_ID","BUILD_INF
706
703
  "DOCKERFILE_ADDITIONS": undefined,
707
704
  "DOCKERFILE_ADDITIONS_END": undefined,
708
705
  "DOCKER_BUILDKIT": "1",
709
- "DOCKER_CACHE_IMAGE": "$DOCKER_REGISTRY_IMAGE_PATH/caches/www",
706
+ "DOCKER_CACHE_IMAGE": "europe-west6-docker.pkg.dev/google-project-id/catladder-deploy/pan-test-app/caches/www",
710
707
  "DOCKER_COPY_AND_INSTALL_APP": "COPY --chown=node:node $APP_DIR .
711
708
  RUN yarn plugin import workspace-tools
712
709
  RUN yarn workspaces focus --production && yarn rebuild",
@@ -717,11 +714,9 @@ COPY --chown=node:node .yarn /app/.yarn",
717
714
  "DOCKER_DIR": ".",
718
715
  "DOCKER_DRIVER": "overlay2",
719
716
  "DOCKER_HOST": "tcp://0.0.0.0:2375",
720
- "DOCKER_IMAGE": "$DOCKER_REGISTRY_IMAGE_PATH/$DOCKER_IMAGE_NAME",
721
- "DOCKER_IMAGE_NAME": "dev/www",
717
+ "DOCKER_IMAGE": "europe-west6-docker.pkg.dev/google-project-id/catladder-deploy/pan-test-app/dev/www",
722
718
  "DOCKER_IMAGE_TAG": "$CI_COMMIT_SHA",
723
- "DOCKER_REGISTRY": "$CI_REGISTRY",
724
- "DOCKER_REGISTRY_IMAGE_PATH": "$CI_REGISTRY_IMAGE",
719
+ "DOCKER_REGISTRY": "europe-west6-docker.pkg.dev",
725
720
  "DOCKER_TLS_CERTDIR": "",
726
721
  "KUBERNETES_CPU_LIMIT": "1",
727
722
  "KUBERNETES_CPU_REQUEST": "0.5",
@@ -790,13 +785,6 @@ COPY --chown=node:node .yarn /app/.yarn",
790
785
  "export GCLOUD_PROJECT_NUMBER=$(gcloud projects describe google-project-id --format="value(projectNumber)")",
791
786
  "echo "GCLOUD_PROJECT_NUMBER: $GCLOUD_PROJECT_NUMBER"",
792
787
  "echo -e "\\e[0Ksection_end:$(date +%s):prepare\\r\\e[0K"",
793
- "echo -e "\\e[0Ksection_start:$(date +%s):pushToArtifactRegistry[collapsed=true]\\r\\e[0KPushing image to artifacts registry"",
794
- "docker login --username gitlab-ci-token --password $CI_JOB_TOKEN $CI_REGISTRY",
795
- "gcloud auth configure-docker europe-west6-docker.pkg.dev",
796
- "docker pull $DOCKER_IMAGE:$DOCKER_IMAGE_TAG",
797
- "docker tag $DOCKER_IMAGE:$DOCKER_IMAGE_TAG europe-west6-docker.pkg.dev/google-project-id/catladder-deploy/pan-test-app/dev/www:$DOCKER_IMAGE_TAG",
798
- "docker push europe-west6-docker.pkg.dev/google-project-id/catladder-deploy/pan-test-app/dev/www:$DOCKER_IMAGE_TAG",
799
- "echo -e "\\e[0Ksection_end:$(date +%s):pushToArtifactRegistry\\r\\e[0K"",
800
788
  "echo -e "\\e[0Ksection_start:$(date +%s):deploy[collapsed=true]\\r\\e[0KDeploy to cloud run"",
801
789
  "echo "$ENV_VARS" > ____envvars.yaml",
802
790
  "gcloud run deploy pan-test-app-dev-www --command="yarn,start" --image=europe-west6-docker.pkg.dev/google-project-id/catladder-deploy/pan-test-app/dev/www:$DOCKER_IMAGE_TAG --project=google-project-id --region=europe-west6 --labels=customer-name=pan,component-name=www,app-name=test-app,env-type=dev,env-name=dev,build-type=node --env-vars-file=____envvars.yaml --min-instances=0 --max-instances=100 --cpu-throttling --allow-unauthenticated --ingress=all --cpu-boost",
@@ -804,6 +792,7 @@ COPY --chown=node:node .yarn /app/.yarn",
804
792
  "echo -e "\\e[0Ksection_start:$(date +%s):cleanup[collapsed=true]\\r\\e[0KCleanup"",
805
793
  "gcloud run revisions list --project=google-project-id --region=europe-west6 --service=pan-test-app-dev-www --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",
806
794
  "gcloud artifacts docker images list europe-west6-docker.pkg.dev/google-project-id/catladder-deploy/pan-test-app/dev/www --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/www@$version --quiet --delete-tags; done",
795
+ "gcloud artifacts docker images list europe-west6-docker.pkg.dev/google-project-id/catladder-deploy/pan-test-app/caches/www --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/www@$version --quiet --delete-tags; done",
807
796
  "echo -e "\\e[0Ksection_end:$(date +%s):cleanup\\r\\e[0K"",
808
797
  "echo Uploading SBOM to Dependency Track",
809
798
  "/dtrackuploader https://dep.panter.swiss/ "$DT_KEY_PROD" upload "pan-test-app/www" "https://pan-test-app-dev-www-unknown-host.example.com" "__sbom.json" vex.json || true",
@@ -825,14 +814,12 @@ COPY --chown=node:node .yarn /app/.yarn",
825
814
  "BUILD_INFO_ID": "some-id",
826
815
  "CLOUDSDK_CORE_DISABLE_PROMPTS": "1",
827
816
  "DOCKER_BUILDKIT": "1",
828
- "DOCKER_CACHE_IMAGE": "$DOCKER_REGISTRY_IMAGE_PATH/caches/www",
817
+ "DOCKER_CACHE_IMAGE": "europe-west6-docker.pkg.dev/google-project-id/catladder-deploy/pan-test-app/caches/www",
829
818
  "DOCKER_DRIVER": "overlay2",
830
819
  "DOCKER_HOST": "tcp://0.0.0.0:2375",
831
- "DOCKER_IMAGE": "$DOCKER_REGISTRY_IMAGE_PATH/$DOCKER_IMAGE_NAME",
832
- "DOCKER_IMAGE_NAME": "dev/www",
820
+ "DOCKER_IMAGE": "europe-west6-docker.pkg.dev/google-project-id/catladder-deploy/pan-test-app/dev/www",
833
821
  "DOCKER_IMAGE_TAG": "$CI_COMMIT_SHA",
834
- "DOCKER_REGISTRY": "$CI_REGISTRY",
835
- "DOCKER_REGISTRY_IMAGE_PATH": "$CI_REGISTRY_IMAGE",
822
+ "DOCKER_REGISTRY": "europe-west6-docker.pkg.dev",
836
823
  "DOCKER_TLS_CERTDIR": "",
837
824
  "ENV_SHORT": "dev",
838
825
  "ENV_TYPE": "dev",
@@ -895,6 +882,7 @@ _ALL_ENV_VAR_KEYS: '["ENV_SHORT","APP_DIR","ENV_TYPE","BUILD_INFO_ID","BUILD_INF
895
882
  "gcloud auth activate-service-account --key-file="./____keyfile.json"",
896
883
  "gcloud run services delete pan-test-app-dev-www --project=google-project-id --region=europe-west6",
897
884
  "gcloud artifacts docker images delete europe-west6-docker.pkg.dev/google-project-id/catladder-deploy/pan-test-app/dev/www --quiet --delete-tags",
885
+ "gcloud artifacts docker images list europe-west6-docker.pkg.dev/google-project-id/catladder-deploy/pan-test-app/caches/www --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/www@$version --quiet --delete-tags; done",
898
886
  "echo Disabling component in Dependency Track",
899
887
  "/dtrackuploader https://dep.panter.swiss/ "$DT_KEY_PROD" disable "pan-test-app/www" "https://pan-test-app-dev-www-unknown-host.example.com" || true",
900
888
  "set -e",
@@ -1239,7 +1227,10 @@ _ALL_ENV_VAR_KEYS: '["ENV_SHORT","APP_DIR","ENV_TYPE","BUILD_INFO_ID","BUILD_INF
1239
1227
  "script": [
1240
1228
  "ensureNodeDockerfile",
1241
1229
  "echo -e "\\e[0Ksection_start:$(date +%s):docker-login[collapsed=true]\\r\\e[0KDocker Login"",
1242
- "docker login --username gitlab-ci-token --password $CI_JOB_TOKEN $CI_REGISTRY",
1230
+ "echo $CL_review_api_GCLOUD_DEPLOY_credentialsKey > ./____keyfile.json
1231
+ ",
1232
+ "gcloud auth activate-service-account --key-file="./____keyfile.json"",
1233
+ "gcloud auth configure-docker europe-west6-docker.pkg.dev",
1243
1234
  "echo -e "\\e[0Ksection_end:$(date +%s):docker-login\\r\\e[0K"",
1244
1235
  "echo -e "\\e[0Ksection_start:$(date +%s):docker-build[collapsed=true]\\r\\e[0KDocker build"",
1245
1236
  "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",
@@ -1264,7 +1255,7 @@ _ALL_ENV_VAR_KEYS: '["ENV_SHORT","APP_DIR","ENV_TYPE","BUILD_INFO_ID","BUILD_INF
1264
1255
  "DOCKERFILE_ADDITIONS": undefined,
1265
1256
  "DOCKERFILE_ADDITIONS_END": undefined,
1266
1257
  "DOCKER_BUILDKIT": "1",
1267
- "DOCKER_CACHE_IMAGE": "$DOCKER_REGISTRY_IMAGE_PATH/caches/api",
1258
+ "DOCKER_CACHE_IMAGE": "europe-west6-docker.pkg.dev/google-project-id/catladder-deploy/pan-test-app/caches/api",
1268
1259
  "DOCKER_COPY_AND_INSTALL_APP": "COPY --chown=node:node $APP_DIR .
1269
1260
  RUN yarn plugin import workspace-tools
1270
1261
  RUN yarn workspaces focus --production && yarn rebuild",
@@ -1275,11 +1266,9 @@ COPY --chown=node:node .yarn /app/.yarn",
1275
1266
  "DOCKER_DIR": ".",
1276
1267
  "DOCKER_DRIVER": "overlay2",
1277
1268
  "DOCKER_HOST": "tcp://0.0.0.0:2375",
1278
- "DOCKER_IMAGE": "$DOCKER_REGISTRY_IMAGE_PATH/$DOCKER_IMAGE_NAME",
1279
- "DOCKER_IMAGE_NAME": "review/api",
1269
+ "DOCKER_IMAGE": "europe-west6-docker.pkg.dev/google-project-id/catladder-deploy/pan-test-app/review/api/mr1234",
1280
1270
  "DOCKER_IMAGE_TAG": "$CI_COMMIT_SHA",
1281
- "DOCKER_REGISTRY": "$CI_REGISTRY",
1282
- "DOCKER_REGISTRY_IMAGE_PATH": "$CI_REGISTRY_IMAGE",
1271
+ "DOCKER_REGISTRY": "europe-west6-docker.pkg.dev",
1283
1272
  "DOCKER_TLS_CERTDIR": "",
1284
1273
  "KUBERNETES_CPU_LIMIT": "1",
1285
1274
  "KUBERNETES_CPU_REQUEST": "0.5",
@@ -1348,13 +1337,6 @@ COPY --chown=node:node .yarn /app/.yarn",
1348
1337
  "export GCLOUD_PROJECT_NUMBER=$(gcloud projects describe google-project-id --format="value(projectNumber)")",
1349
1338
  "echo "GCLOUD_PROJECT_NUMBER: $GCLOUD_PROJECT_NUMBER"",
1350
1339
  "echo -e "\\e[0Ksection_end:$(date +%s):prepare\\r\\e[0K"",
1351
- "echo -e "\\e[0Ksection_start:$(date +%s):pushToArtifactRegistry[collapsed=true]\\r\\e[0KPushing image to artifacts registry"",
1352
- "docker login --username gitlab-ci-token --password $CI_JOB_TOKEN $CI_REGISTRY",
1353
- "gcloud auth configure-docker europe-west6-docker.pkg.dev",
1354
- "docker pull $DOCKER_IMAGE:$DOCKER_IMAGE_TAG",
1355
- "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",
1356
- "docker push europe-west6-docker.pkg.dev/google-project-id/catladder-deploy/pan-test-app/review/api/mr1234:$DOCKER_IMAGE_TAG",
1357
- "echo -e "\\e[0Ksection_end:$(date +%s):pushToArtifactRegistry\\r\\e[0K"",
1358
1340
  "echo -e "\\e[0Ksection_start:$(date +%s):deploy[collapsed=true]\\r\\e[0KDeploy to cloud run"",
1359
1341
  "echo "$ENV_VARS" > ____envvars.yaml",
1360
1342
  "set +e",
@@ -1379,6 +1361,7 @@ COPY --chown=node:node .yarn /app/.yarn",
1379
1361
  "echo -e "\\e[0Ksection_start:$(date +%s):cleanup[collapsed=true]\\r\\e[0KCleanup"",
1380
1362
  "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",
1381
1363
  "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",
1364
+ "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",
1382
1365
  "set +e",
1383
1366
  "gcloud artifacts docker images delete europe-west6-docker.pkg.dev/google-project-id/catladder-deploy/pan-test-app/review/api --quiet --delete-tags",
1384
1367
  "set -e",
@@ -1410,14 +1393,12 @@ COPY --chown=node:node .yarn /app/.yarn",
1410
1393
  "DB_PASSWORD": "$CL_review_api_DB_PASSWORD",
1411
1394
  "DB_USER": "my-user",
1412
1395
  "DOCKER_BUILDKIT": "1",
1413
- "DOCKER_CACHE_IMAGE": "$DOCKER_REGISTRY_IMAGE_PATH/caches/api",
1396
+ "DOCKER_CACHE_IMAGE": "europe-west6-docker.pkg.dev/google-project-id/catladder-deploy/pan-test-app/caches/api",
1414
1397
  "DOCKER_DRIVER": "overlay2",
1415
1398
  "DOCKER_HOST": "tcp://0.0.0.0:2375",
1416
- "DOCKER_IMAGE": "$DOCKER_REGISTRY_IMAGE_PATH/$DOCKER_IMAGE_NAME",
1417
- "DOCKER_IMAGE_NAME": "review/api",
1399
+ "DOCKER_IMAGE": "europe-west6-docker.pkg.dev/google-project-id/catladder-deploy/pan-test-app/review/api/mr1234",
1418
1400
  "DOCKER_IMAGE_TAG": "$CI_COMMIT_SHA",
1419
- "DOCKER_REGISTRY": "$CI_REGISTRY",
1420
- "DOCKER_REGISTRY_IMAGE_PATH": "$CI_REGISTRY_IMAGE",
1401
+ "DOCKER_REGISTRY": "europe-west6-docker.pkg.dev",
1421
1402
  "DOCKER_TLS_CERTDIR": "",
1422
1403
  "ENV_SHORT": "review",
1423
1404
  "ENV_TYPE": "review",
@@ -1501,6 +1482,7 @@ _ALL_ENV_VAR_KEYS: '["ENV_SHORT","APP_DIR","ENV_TYPE","BUILD_INFO_ID","BUILD_INF
1501
1482
  done
1502
1483
  ",
1503
1484
  "gcloud artifacts docker images delete europe-west6-docker.pkg.dev/google-project-id/catladder-deploy/pan-test-app/review/api/mr1234 --quiet --delete-tags",
1485
+ "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",
1504
1486
  "set +e",
1505
1487
  "gcloud artifacts docker images delete europe-west6-docker.pkg.dev/google-project-id/catladder-deploy/pan-test-app/review/api --quiet --delete-tags",
1506
1488
  "set -e",
@@ -1768,7 +1750,10 @@ _ALL_ENV_VAR_KEYS: '["ENV_SHORT","APP_DIR","ENV_TYPE","BUILD_INFO_ID","BUILD_INF
1768
1750
  "script": [
1769
1751
  "ensureNodeDockerfile",
1770
1752
  "echo -e "\\e[0Ksection_start:$(date +%s):docker-login[collapsed=true]\\r\\e[0KDocker Login"",
1771
- "docker login --username gitlab-ci-token --password $CI_JOB_TOKEN $CI_REGISTRY",
1753
+ "echo $CL_review_www_GCLOUD_DEPLOY_credentialsKey > ./____keyfile.json
1754
+ ",
1755
+ "gcloud auth activate-service-account --key-file="./____keyfile.json"",
1756
+ "gcloud auth configure-docker europe-west6-docker.pkg.dev",
1772
1757
  "echo -e "\\e[0Ksection_end:$(date +%s):docker-login\\r\\e[0K"",
1773
1758
  "echo -e "\\e[0Ksection_start:$(date +%s):docker-build[collapsed=true]\\r\\e[0KDocker build"",
1774
1759
  "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",
@@ -1793,7 +1778,7 @@ _ALL_ENV_VAR_KEYS: '["ENV_SHORT","APP_DIR","ENV_TYPE","BUILD_INFO_ID","BUILD_INF
1793
1778
  "DOCKERFILE_ADDITIONS": undefined,
1794
1779
  "DOCKERFILE_ADDITIONS_END": undefined,
1795
1780
  "DOCKER_BUILDKIT": "1",
1796
- "DOCKER_CACHE_IMAGE": "$DOCKER_REGISTRY_IMAGE_PATH/caches/www",
1781
+ "DOCKER_CACHE_IMAGE": "europe-west6-docker.pkg.dev/google-project-id/catladder-deploy/pan-test-app/caches/www",
1797
1782
  "DOCKER_COPY_AND_INSTALL_APP": "COPY --chown=node:node $APP_DIR .
1798
1783
  RUN yarn plugin import workspace-tools
1799
1784
  RUN yarn workspaces focus --production && yarn rebuild",
@@ -1804,11 +1789,9 @@ COPY --chown=node:node .yarn /app/.yarn",
1804
1789
  "DOCKER_DIR": ".",
1805
1790
  "DOCKER_DRIVER": "overlay2",
1806
1791
  "DOCKER_HOST": "tcp://0.0.0.0:2375",
1807
- "DOCKER_IMAGE": "$DOCKER_REGISTRY_IMAGE_PATH/$DOCKER_IMAGE_NAME",
1808
- "DOCKER_IMAGE_NAME": "review/www",
1792
+ "DOCKER_IMAGE": "europe-west6-docker.pkg.dev/google-project-id/catladder-deploy/pan-test-app/review/www/mr1234",
1809
1793
  "DOCKER_IMAGE_TAG": "$CI_COMMIT_SHA",
1810
- "DOCKER_REGISTRY": "$CI_REGISTRY",
1811
- "DOCKER_REGISTRY_IMAGE_PATH": "$CI_REGISTRY_IMAGE",
1794
+ "DOCKER_REGISTRY": "europe-west6-docker.pkg.dev",
1812
1795
  "DOCKER_TLS_CERTDIR": "",
1813
1796
  "KUBERNETES_CPU_LIMIT": "1",
1814
1797
  "KUBERNETES_CPU_REQUEST": "0.5",
@@ -1877,13 +1860,6 @@ COPY --chown=node:node .yarn /app/.yarn",
1877
1860
  "export GCLOUD_PROJECT_NUMBER=$(gcloud projects describe google-project-id --format="value(projectNumber)")",
1878
1861
  "echo "GCLOUD_PROJECT_NUMBER: $GCLOUD_PROJECT_NUMBER"",
1879
1862
  "echo -e "\\e[0Ksection_end:$(date +%s):prepare\\r\\e[0K"",
1880
- "echo -e "\\e[0Ksection_start:$(date +%s):pushToArtifactRegistry[collapsed=true]\\r\\e[0KPushing image to artifacts registry"",
1881
- "docker login --username gitlab-ci-token --password $CI_JOB_TOKEN $CI_REGISTRY",
1882
- "gcloud auth configure-docker europe-west6-docker.pkg.dev",
1883
- "docker pull $DOCKER_IMAGE:$DOCKER_IMAGE_TAG",
1884
- "docker tag $DOCKER_IMAGE:$DOCKER_IMAGE_TAG europe-west6-docker.pkg.dev/google-project-id/catladder-deploy/pan-test-app/review/www/mr1234:$DOCKER_IMAGE_TAG",
1885
- "docker push europe-west6-docker.pkg.dev/google-project-id/catladder-deploy/pan-test-app/review/www/mr1234:$DOCKER_IMAGE_TAG",
1886
- "echo -e "\\e[0Ksection_end:$(date +%s):pushToArtifactRegistry\\r\\e[0K"",
1887
1863
  "echo -e "\\e[0Ksection_start:$(date +%s):deploy[collapsed=true]\\r\\e[0KDeploy to cloud run"",
1888
1864
  "echo "$ENV_VARS" > ____envvars.yaml",
1889
1865
  "gcloud run deploy pan-test-app-review-mr1234-www --command="yarn,start" --image=europe-west6-docker.pkg.dev/google-project-id/catladder-deploy/pan-test-app/review/www/mr1234:$DOCKER_IMAGE_TAG --project=google-project-id --region=europe-west6 --labels=customer-name=pan,component-name=www,app-name=test-app,env-type=review,env-name=review,build-type=node --env-vars-file=____envvars.yaml --min-instances=0 --max-instances=100 --cpu-throttling --allow-unauthenticated --ingress=all --cpu-boost",
@@ -1891,6 +1867,7 @@ COPY --chown=node:node .yarn /app/.yarn",
1891
1867
  "echo -e "\\e[0Ksection_start:$(date +%s):cleanup[collapsed=true]\\r\\e[0KCleanup"",
1892
1868
  "gcloud run revisions list --project=google-project-id --region=europe-west6 --service=pan-test-app-review-mr1234-www --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",
1893
1869
  "gcloud artifacts docker images list europe-west6-docker.pkg.dev/google-project-id/catladder-deploy/pan-test-app/review/www/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/www/mr1234@$version --quiet --delete-tags; done",
1870
+ "gcloud artifacts docker images list europe-west6-docker.pkg.dev/google-project-id/catladder-deploy/pan-test-app/caches/www --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/www@$version --quiet --delete-tags; done",
1894
1871
  "set +e",
1895
1872
  "gcloud artifacts docker images delete europe-west6-docker.pkg.dev/google-project-id/catladder-deploy/pan-test-app/review/www --quiet --delete-tags",
1896
1873
  "set -e",
@@ -1915,14 +1892,12 @@ COPY --chown=node:node .yarn /app/.yarn",
1915
1892
  "BUILD_INFO_ID": "some-id",
1916
1893
  "CLOUDSDK_CORE_DISABLE_PROMPTS": "1",
1917
1894
  "DOCKER_BUILDKIT": "1",
1918
- "DOCKER_CACHE_IMAGE": "$DOCKER_REGISTRY_IMAGE_PATH/caches/www",
1895
+ "DOCKER_CACHE_IMAGE": "europe-west6-docker.pkg.dev/google-project-id/catladder-deploy/pan-test-app/caches/www",
1919
1896
  "DOCKER_DRIVER": "overlay2",
1920
1897
  "DOCKER_HOST": "tcp://0.0.0.0:2375",
1921
- "DOCKER_IMAGE": "$DOCKER_REGISTRY_IMAGE_PATH/$DOCKER_IMAGE_NAME",
1922
- "DOCKER_IMAGE_NAME": "review/www",
1898
+ "DOCKER_IMAGE": "europe-west6-docker.pkg.dev/google-project-id/catladder-deploy/pan-test-app/review/www/mr1234",
1923
1899
  "DOCKER_IMAGE_TAG": "$CI_COMMIT_SHA",
1924
- "DOCKER_REGISTRY": "$CI_REGISTRY",
1925
- "DOCKER_REGISTRY_IMAGE_PATH": "$CI_REGISTRY_IMAGE",
1900
+ "DOCKER_REGISTRY": "europe-west6-docker.pkg.dev",
1926
1901
  "DOCKER_TLS_CERTDIR": "",
1927
1902
  "ENV_SHORT": "review",
1928
1903
  "ENV_TYPE": "review",
@@ -1985,6 +1960,7 @@ _ALL_ENV_VAR_KEYS: '["ENV_SHORT","APP_DIR","ENV_TYPE","BUILD_INFO_ID","BUILD_INF
1985
1960
  "gcloud auth activate-service-account --key-file="./____keyfile.json"",
1986
1961
  "gcloud run services delete pan-test-app-review-mr1234-www --project=google-project-id --region=europe-west6",
1987
1962
  "gcloud artifacts docker images delete europe-west6-docker.pkg.dev/google-project-id/catladder-deploy/pan-test-app/review/www/mr1234 --quiet --delete-tags",
1963
+ "gcloud artifacts docker images list europe-west6-docker.pkg.dev/google-project-id/catladder-deploy/pan-test-app/caches/www --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/www@$version --quiet --delete-tags; done",
1988
1964
  "set +e",
1989
1965
  "gcloud artifacts docker images delete europe-west6-docker.pkg.dev/google-project-id/catladder-deploy/pan-test-app/review/www --quiet --delete-tags",
1990
1966
  "set -e",
@@ -2375,7 +2351,10 @@ _ALL_ENV_VAR_KEYS: '["ENV_SHORT","APP_DIR","ENV_TYPE","BUILD_INFO_ID","BUILD_INF
2375
2351
  "script": [
2376
2352
  "ensureNodeDockerfile",
2377
2353
  "echo -e "\\e[0Ksection_start:$(date +%s):docker-login[collapsed=true]\\r\\e[0KDocker Login"",
2378
- "docker login --username gitlab-ci-token --password $CI_JOB_TOKEN $CI_REGISTRY",
2354
+ "echo $CL_prod_api_GCLOUD_DEPLOY_credentialsKey > ./____keyfile.json
2355
+ ",
2356
+ "gcloud auth activate-service-account --key-file="./____keyfile.json"",
2357
+ "gcloud auth configure-docker europe-west6-docker.pkg.dev",
2379
2358
  "echo -e "\\e[0Ksection_end:$(date +%s):docker-login\\r\\e[0K"",
2380
2359
  "echo -e "\\e[0Ksection_start:$(date +%s):docker-build[collapsed=true]\\r\\e[0KDocker build"",
2381
2360
  "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",
@@ -2400,7 +2379,7 @@ _ALL_ENV_VAR_KEYS: '["ENV_SHORT","APP_DIR","ENV_TYPE","BUILD_INFO_ID","BUILD_INF
2400
2379
  "DOCKERFILE_ADDITIONS": undefined,
2401
2380
  "DOCKERFILE_ADDITIONS_END": undefined,
2402
2381
  "DOCKER_BUILDKIT": "1",
2403
- "DOCKER_CACHE_IMAGE": "$DOCKER_REGISTRY_IMAGE_PATH/caches/api",
2382
+ "DOCKER_CACHE_IMAGE": "europe-west6-docker.pkg.dev/google-project-id/catladder-deploy/pan-test-app/caches/api",
2404
2383
  "DOCKER_COPY_AND_INSTALL_APP": "COPY --chown=node:node $APP_DIR .
2405
2384
  RUN yarn plugin import workspace-tools
2406
2385
  RUN yarn workspaces focus --production && yarn rebuild",
@@ -2411,11 +2390,9 @@ COPY --chown=node:node .yarn /app/.yarn",
2411
2390
  "DOCKER_DIR": ".",
2412
2391
  "DOCKER_DRIVER": "overlay2",
2413
2392
  "DOCKER_HOST": "tcp://0.0.0.0:2375",
2414
- "DOCKER_IMAGE": "$DOCKER_REGISTRY_IMAGE_PATH/$DOCKER_IMAGE_NAME",
2415
- "DOCKER_IMAGE_NAME": "prod/api",
2393
+ "DOCKER_IMAGE": "europe-west6-docker.pkg.dev/google-project-id/catladder-deploy/pan-test-app/prod/api",
2416
2394
  "DOCKER_IMAGE_TAG": "$CI_COMMIT_SHA",
2417
- "DOCKER_REGISTRY": "$CI_REGISTRY",
2418
- "DOCKER_REGISTRY_IMAGE_PATH": "$CI_REGISTRY_IMAGE",
2395
+ "DOCKER_REGISTRY": "europe-west6-docker.pkg.dev",
2419
2396
  "DOCKER_TLS_CERTDIR": "",
2420
2397
  "KUBERNETES_CPU_LIMIT": "1",
2421
2398
  "KUBERNETES_CPU_REQUEST": "0.5",
@@ -2448,7 +2425,10 @@ COPY --chown=node:node .yarn /app/.yarn",
2448
2425
  "script": [
2449
2426
  "ensureNodeDockerfile",
2450
2427
  "echo -e "\\e[0Ksection_start:$(date +%s):docker-login[collapsed=true]\\r\\e[0KDocker Login"",
2451
- "docker login --username gitlab-ci-token --password $CI_JOB_TOKEN $CI_REGISTRY",
2428
+ "echo $CL_stage_api_GCLOUD_DEPLOY_credentialsKey > ./____keyfile.json
2429
+ ",
2430
+ "gcloud auth activate-service-account --key-file="./____keyfile.json"",
2431
+ "gcloud auth configure-docker europe-west6-docker.pkg.dev",
2452
2432
  "echo -e "\\e[0Ksection_end:$(date +%s):docker-login\\r\\e[0K"",
2453
2433
  "echo -e "\\e[0Ksection_start:$(date +%s):docker-build[collapsed=true]\\r\\e[0KDocker build"",
2454
2434
  "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",
@@ -2473,7 +2453,7 @@ COPY --chown=node:node .yarn /app/.yarn",
2473
2453
  "DOCKERFILE_ADDITIONS": undefined,
2474
2454
  "DOCKERFILE_ADDITIONS_END": undefined,
2475
2455
  "DOCKER_BUILDKIT": "1",
2476
- "DOCKER_CACHE_IMAGE": "$DOCKER_REGISTRY_IMAGE_PATH/caches/api",
2456
+ "DOCKER_CACHE_IMAGE": "europe-west6-docker.pkg.dev/google-project-id/catladder-deploy/pan-test-app/caches/api",
2477
2457
  "DOCKER_COPY_AND_INSTALL_APP": "COPY --chown=node:node $APP_DIR .
2478
2458
  RUN yarn plugin import workspace-tools
2479
2459
  RUN yarn workspaces focus --production && yarn rebuild",
@@ -2484,11 +2464,9 @@ COPY --chown=node:node .yarn /app/.yarn",
2484
2464
  "DOCKER_DIR": ".",
2485
2465
  "DOCKER_DRIVER": "overlay2",
2486
2466
  "DOCKER_HOST": "tcp://0.0.0.0:2375",
2487
- "DOCKER_IMAGE": "$DOCKER_REGISTRY_IMAGE_PATH/$DOCKER_IMAGE_NAME",
2488
- "DOCKER_IMAGE_NAME": "stage/api",
2467
+ "DOCKER_IMAGE": "europe-west6-docker.pkg.dev/google-project-id/catladder-deploy/pan-test-app/stage/api",
2489
2468
  "DOCKER_IMAGE_TAG": "$CI_COMMIT_SHA",
2490
- "DOCKER_REGISTRY": "$CI_REGISTRY",
2491
- "DOCKER_REGISTRY_IMAGE_PATH": "$CI_REGISTRY_IMAGE",
2469
+ "DOCKER_REGISTRY": "europe-west6-docker.pkg.dev",
2492
2470
  "DOCKER_TLS_CERTDIR": "",
2493
2471
  "KUBERNETES_CPU_LIMIT": "1",
2494
2472
  "KUBERNETES_CPU_REQUEST": "0.5",
@@ -2545,13 +2523,6 @@ COPY --chown=node:node .yarn /app/.yarn",
2545
2523
  "export GCLOUD_PROJECT_NUMBER=$(gcloud projects describe google-project-id --format="value(projectNumber)")",
2546
2524
  "echo "GCLOUD_PROJECT_NUMBER: $GCLOUD_PROJECT_NUMBER"",
2547
2525
  "echo -e "\\e[0Ksection_end:$(date +%s):prepare\\r\\e[0K"",
2548
- "echo -e "\\e[0Ksection_start:$(date +%s):pushToArtifactRegistry[collapsed=true]\\r\\e[0KPushing image to artifacts registry"",
2549
- "docker login --username gitlab-ci-token --password $CI_JOB_TOKEN $CI_REGISTRY",
2550
- "gcloud auth configure-docker europe-west6-docker.pkg.dev",
2551
- "docker pull $DOCKER_IMAGE:$DOCKER_IMAGE_TAG",
2552
- "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",
2553
- "docker push europe-west6-docker.pkg.dev/google-project-id/catladder-deploy/pan-test-app/prod/api:$DOCKER_IMAGE_TAG",
2554
- "echo -e "\\e[0Ksection_end:$(date +%s):pushToArtifactRegistry\\r\\e[0K"",
2555
2526
  "echo -e "\\e[0Ksection_start:$(date +%s):deploy[collapsed=true]\\r\\e[0KDeploy to cloud run"",
2556
2527
  "echo "$ENV_VARS" > ____envvars.yaml",
2557
2528
  "set +e",
@@ -2576,6 +2547,7 @@ COPY --chown=node:node .yarn /app/.yarn",
2576
2547
  "echo -e "\\e[0Ksection_start:$(date +%s):cleanup[collapsed=true]\\r\\e[0KCleanup"",
2577
2548
  "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",
2578
2549
  "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",
2550
+ "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",
2579
2551
  "echo -e "\\e[0Ksection_end:$(date +%s):cleanup\\r\\e[0K"",
2580
2552
  "echo Uploading SBOM to Dependency Track",
2581
2553
  "/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",
@@ -2604,14 +2576,12 @@ COPY --chown=node:node .yarn /app/.yarn",
2604
2576
  "DB_PASSWORD": "$CL_prod_api_DB_PASSWORD",
2605
2577
  "DB_USER": "my-user",
2606
2578
  "DOCKER_BUILDKIT": "1",
2607
- "DOCKER_CACHE_IMAGE": "$DOCKER_REGISTRY_IMAGE_PATH/caches/api",
2579
+ "DOCKER_CACHE_IMAGE": "europe-west6-docker.pkg.dev/google-project-id/catladder-deploy/pan-test-app/caches/api",
2608
2580
  "DOCKER_DRIVER": "overlay2",
2609
2581
  "DOCKER_HOST": "tcp://0.0.0.0:2375",
2610
- "DOCKER_IMAGE": "$DOCKER_REGISTRY_IMAGE_PATH/$DOCKER_IMAGE_NAME",
2611
- "DOCKER_IMAGE_NAME": "prod/api",
2582
+ "DOCKER_IMAGE": "europe-west6-docker.pkg.dev/google-project-id/catladder-deploy/pan-test-app/prod/api",
2612
2583
  "DOCKER_IMAGE_TAG": "$CI_COMMIT_SHA",
2613
- "DOCKER_REGISTRY": "$CI_REGISTRY",
2614
- "DOCKER_REGISTRY_IMAGE_PATH": "$CI_REGISTRY_IMAGE",
2584
+ "DOCKER_REGISTRY": "europe-west6-docker.pkg.dev",
2615
2585
  "DOCKER_TLS_CERTDIR": "",
2616
2586
  "ENV_SHORT": "prod",
2617
2587
  "ENV_TYPE": "prod",
@@ -2696,13 +2666,6 @@ _ALL_ENV_VAR_KEYS: '["ENV_SHORT","APP_DIR","ENV_TYPE","BUILD_INFO_ID","BUILD_INF
2696
2666
  "export GCLOUD_PROJECT_NUMBER=$(gcloud projects describe google-project-id --format="value(projectNumber)")",
2697
2667
  "echo "GCLOUD_PROJECT_NUMBER: $GCLOUD_PROJECT_NUMBER"",
2698
2668
  "echo -e "\\e[0Ksection_end:$(date +%s):prepare\\r\\e[0K"",
2699
- "echo -e "\\e[0Ksection_start:$(date +%s):pushToArtifactRegistry[collapsed=true]\\r\\e[0KPushing image to artifacts registry"",
2700
- "docker login --username gitlab-ci-token --password $CI_JOB_TOKEN $CI_REGISTRY",
2701
- "gcloud auth configure-docker europe-west6-docker.pkg.dev",
2702
- "docker pull $DOCKER_IMAGE:$DOCKER_IMAGE_TAG",
2703
- "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",
2704
- "docker push europe-west6-docker.pkg.dev/google-project-id/catladder-deploy/pan-test-app/stage/api:$DOCKER_IMAGE_TAG",
2705
- "echo -e "\\e[0Ksection_end:$(date +%s):pushToArtifactRegistry\\r\\e[0K"",
2706
2669
  "echo -e "\\e[0Ksection_start:$(date +%s):deploy[collapsed=true]\\r\\e[0KDeploy to cloud run"",
2707
2670
  "echo "$ENV_VARS" > ____envvars.yaml",
2708
2671
  "set +e",
@@ -2727,6 +2690,7 @@ _ALL_ENV_VAR_KEYS: '["ENV_SHORT","APP_DIR","ENV_TYPE","BUILD_INFO_ID","BUILD_INF
2727
2690
  "echo -e "\\e[0Ksection_start:$(date +%s):cleanup[collapsed=true]\\r\\e[0KCleanup"",
2728
2691
  "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",
2729
2692
  "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",
2693
+ "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",
2730
2694
  "echo -e "\\e[0Ksection_end:$(date +%s):cleanup\\r\\e[0K"",
2731
2695
  "echo Uploading SBOM to Dependency Track",
2732
2696
  "/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",
@@ -2755,14 +2719,12 @@ _ALL_ENV_VAR_KEYS: '["ENV_SHORT","APP_DIR","ENV_TYPE","BUILD_INFO_ID","BUILD_INF
2755
2719
  "DB_PASSWORD": "$CL_stage_api_DB_PASSWORD",
2756
2720
  "DB_USER": "my-user",
2757
2721
  "DOCKER_BUILDKIT": "1",
2758
- "DOCKER_CACHE_IMAGE": "$DOCKER_REGISTRY_IMAGE_PATH/caches/api",
2722
+ "DOCKER_CACHE_IMAGE": "europe-west6-docker.pkg.dev/google-project-id/catladder-deploy/pan-test-app/caches/api",
2759
2723
  "DOCKER_DRIVER": "overlay2",
2760
2724
  "DOCKER_HOST": "tcp://0.0.0.0:2375",
2761
- "DOCKER_IMAGE": "$DOCKER_REGISTRY_IMAGE_PATH/$DOCKER_IMAGE_NAME",
2762
- "DOCKER_IMAGE_NAME": "stage/api",
2725
+ "DOCKER_IMAGE": "europe-west6-docker.pkg.dev/google-project-id/catladder-deploy/pan-test-app/stage/api",
2763
2726
  "DOCKER_IMAGE_TAG": "$CI_COMMIT_SHA",
2764
- "DOCKER_REGISTRY": "$CI_REGISTRY",
2765
- "DOCKER_REGISTRY_IMAGE_PATH": "$CI_REGISTRY_IMAGE",
2727
+ "DOCKER_REGISTRY": "europe-west6-docker.pkg.dev",
2766
2728
  "DOCKER_TLS_CERTDIR": "",
2767
2729
  "ENV_SHORT": "stage",
2768
2730
  "ENV_TYPE": "stage",
@@ -2837,6 +2799,7 @@ _ALL_ENV_VAR_KEYS: '["ENV_SHORT","APP_DIR","ENV_TYPE","BUILD_INFO_ID","BUILD_INF
2837
2799
  "gcloud beta run jobs executions list --project=google-project-id --region=europe-west6 --job pan-test-app-prod-api-send-reminders --format="value(name)" | xargs -I {} gcloud beta run jobs executions delete {} --quiet --project=google-project-id --region=europe-west6",
2838
2800
  "gcloud beta run jobs delete pan-test-app-prod-api-send-reminders --project=google-project-id --region=europe-west6",
2839
2801
  "gcloud artifacts docker images delete europe-west6-docker.pkg.dev/google-project-id/catladder-deploy/pan-test-app/prod/api --quiet --delete-tags",
2802
+ "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",
2840
2803
  "echo Disabling component in Dependency Track",
2841
2804
  "/dtrackuploader https://dep.panter.swiss/ "$DT_KEY_PROD" disable "pan-test-app/api" "https://pan-test-app-prod-api-unknown-host.example.com" || true",
2842
2805
  "set -e",
@@ -2890,6 +2853,7 @@ _ALL_ENV_VAR_KEYS: '["ENV_SHORT","APP_DIR","ENV_TYPE","BUILD_INFO_ID","BUILD_INF
2890
2853
  "gcloud beta run jobs executions list --project=google-project-id --region=europe-west6 --job pan-test-app-stage-api-send-reminders --format="value(name)" | xargs -I {} gcloud beta run jobs executions delete {} --quiet --project=google-project-id --region=europe-west6",
2891
2854
  "gcloud beta run jobs delete pan-test-app-stage-api-send-reminders --project=google-project-id --region=europe-west6",
2892
2855
  "gcloud artifacts docker images delete europe-west6-docker.pkg.dev/google-project-id/catladder-deploy/pan-test-app/stage/api --quiet --delete-tags",
2856
+ "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",
2893
2857
  "echo Disabling component in Dependency Track",
2894
2858
  "/dtrackuploader https://dep.panter.swiss/ "$DT_KEY_PROD" disable "pan-test-app/api" "https://pan-test-app-stage-api-unknown-host.example.com" || true",
2895
2859
  "set -e",
@@ -3141,7 +3105,10 @@ _ALL_ENV_VAR_KEYS: '["ENV_SHORT","APP_DIR","ENV_TYPE","BUILD_INFO_ID","BUILD_INF
3141
3105
  "script": [
3142
3106
  "ensureNodeDockerfile",
3143
3107
  "echo -e "\\e[0Ksection_start:$(date +%s):docker-login[collapsed=true]\\r\\e[0KDocker Login"",
3144
- "docker login --username gitlab-ci-token --password $CI_JOB_TOKEN $CI_REGISTRY",
3108
+ "echo $CL_prod_www_GCLOUD_DEPLOY_credentialsKey > ./____keyfile.json
3109
+ ",
3110
+ "gcloud auth activate-service-account --key-file="./____keyfile.json"",
3111
+ "gcloud auth configure-docker europe-west6-docker.pkg.dev",
3145
3112
  "echo -e "\\e[0Ksection_end:$(date +%s):docker-login\\r\\e[0K"",
3146
3113
  "echo -e "\\e[0Ksection_start:$(date +%s):docker-build[collapsed=true]\\r\\e[0KDocker build"",
3147
3114
  "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",
@@ -3166,7 +3133,7 @@ _ALL_ENV_VAR_KEYS: '["ENV_SHORT","APP_DIR","ENV_TYPE","BUILD_INFO_ID","BUILD_INF
3166
3133
  "DOCKERFILE_ADDITIONS": undefined,
3167
3134
  "DOCKERFILE_ADDITIONS_END": undefined,
3168
3135
  "DOCKER_BUILDKIT": "1",
3169
- "DOCKER_CACHE_IMAGE": "$DOCKER_REGISTRY_IMAGE_PATH/caches/www",
3136
+ "DOCKER_CACHE_IMAGE": "europe-west6-docker.pkg.dev/google-project-id/catladder-deploy/pan-test-app/caches/www",
3170
3137
  "DOCKER_COPY_AND_INSTALL_APP": "COPY --chown=node:node $APP_DIR .
3171
3138
  RUN yarn plugin import workspace-tools
3172
3139
  RUN yarn workspaces focus --production && yarn rebuild",
@@ -3177,11 +3144,9 @@ COPY --chown=node:node .yarn /app/.yarn",
3177
3144
  "DOCKER_DIR": ".",
3178
3145
  "DOCKER_DRIVER": "overlay2",
3179
3146
  "DOCKER_HOST": "tcp://0.0.0.0:2375",
3180
- "DOCKER_IMAGE": "$DOCKER_REGISTRY_IMAGE_PATH/$DOCKER_IMAGE_NAME",
3181
- "DOCKER_IMAGE_NAME": "prod/www",
3147
+ "DOCKER_IMAGE": "europe-west6-docker.pkg.dev/google-project-id/catladder-deploy/pan-test-app/prod/www",
3182
3148
  "DOCKER_IMAGE_TAG": "$CI_COMMIT_SHA",
3183
- "DOCKER_REGISTRY": "$CI_REGISTRY",
3184
- "DOCKER_REGISTRY_IMAGE_PATH": "$CI_REGISTRY_IMAGE",
3149
+ "DOCKER_REGISTRY": "europe-west6-docker.pkg.dev",
3185
3150
  "DOCKER_TLS_CERTDIR": "",
3186
3151
  "KUBERNETES_CPU_LIMIT": "1",
3187
3152
  "KUBERNETES_CPU_REQUEST": "0.5",
@@ -3214,7 +3179,10 @@ COPY --chown=node:node .yarn /app/.yarn",
3214
3179
  "script": [
3215
3180
  "ensureNodeDockerfile",
3216
3181
  "echo -e "\\e[0Ksection_start:$(date +%s):docker-login[collapsed=true]\\r\\e[0KDocker Login"",
3217
- "docker login --username gitlab-ci-token --password $CI_JOB_TOKEN $CI_REGISTRY",
3182
+ "echo $CL_stage_www_GCLOUD_DEPLOY_credentialsKey > ./____keyfile.json
3183
+ ",
3184
+ "gcloud auth activate-service-account --key-file="./____keyfile.json"",
3185
+ "gcloud auth configure-docker europe-west6-docker.pkg.dev",
3218
3186
  "echo -e "\\e[0Ksection_end:$(date +%s):docker-login\\r\\e[0K"",
3219
3187
  "echo -e "\\e[0Ksection_start:$(date +%s):docker-build[collapsed=true]\\r\\e[0KDocker build"",
3220
3188
  "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",
@@ -3239,7 +3207,7 @@ COPY --chown=node:node .yarn /app/.yarn",
3239
3207
  "DOCKERFILE_ADDITIONS": undefined,
3240
3208
  "DOCKERFILE_ADDITIONS_END": undefined,
3241
3209
  "DOCKER_BUILDKIT": "1",
3242
- "DOCKER_CACHE_IMAGE": "$DOCKER_REGISTRY_IMAGE_PATH/caches/www",
3210
+ "DOCKER_CACHE_IMAGE": "europe-west6-docker.pkg.dev/google-project-id/catladder-deploy/pan-test-app/caches/www",
3243
3211
  "DOCKER_COPY_AND_INSTALL_APP": "COPY --chown=node:node $APP_DIR .
3244
3212
  RUN yarn plugin import workspace-tools
3245
3213
  RUN yarn workspaces focus --production && yarn rebuild",
@@ -3250,11 +3218,9 @@ COPY --chown=node:node .yarn /app/.yarn",
3250
3218
  "DOCKER_DIR": ".",
3251
3219
  "DOCKER_DRIVER": "overlay2",
3252
3220
  "DOCKER_HOST": "tcp://0.0.0.0:2375",
3253
- "DOCKER_IMAGE": "$DOCKER_REGISTRY_IMAGE_PATH/$DOCKER_IMAGE_NAME",
3254
- "DOCKER_IMAGE_NAME": "stage/www",
3221
+ "DOCKER_IMAGE": "europe-west6-docker.pkg.dev/google-project-id/catladder-deploy/pan-test-app/stage/www",
3255
3222
  "DOCKER_IMAGE_TAG": "$CI_COMMIT_SHA",
3256
- "DOCKER_REGISTRY": "$CI_REGISTRY",
3257
- "DOCKER_REGISTRY_IMAGE_PATH": "$CI_REGISTRY_IMAGE",
3223
+ "DOCKER_REGISTRY": "europe-west6-docker.pkg.dev",
3258
3224
  "DOCKER_TLS_CERTDIR": "",
3259
3225
  "KUBERNETES_CPU_LIMIT": "1",
3260
3226
  "KUBERNETES_CPU_REQUEST": "0.5",
@@ -3311,13 +3277,6 @@ COPY --chown=node:node .yarn /app/.yarn",
3311
3277
  "export GCLOUD_PROJECT_NUMBER=$(gcloud projects describe google-project-id --format="value(projectNumber)")",
3312
3278
  "echo "GCLOUD_PROJECT_NUMBER: $GCLOUD_PROJECT_NUMBER"",
3313
3279
  "echo -e "\\e[0Ksection_end:$(date +%s):prepare\\r\\e[0K"",
3314
- "echo -e "\\e[0Ksection_start:$(date +%s):pushToArtifactRegistry[collapsed=true]\\r\\e[0KPushing image to artifacts registry"",
3315
- "docker login --username gitlab-ci-token --password $CI_JOB_TOKEN $CI_REGISTRY",
3316
- "gcloud auth configure-docker europe-west6-docker.pkg.dev",
3317
- "docker pull $DOCKER_IMAGE:$DOCKER_IMAGE_TAG",
3318
- "docker tag $DOCKER_IMAGE:$DOCKER_IMAGE_TAG europe-west6-docker.pkg.dev/google-project-id/catladder-deploy/pan-test-app/prod/www:$DOCKER_IMAGE_TAG",
3319
- "docker push europe-west6-docker.pkg.dev/google-project-id/catladder-deploy/pan-test-app/prod/www:$DOCKER_IMAGE_TAG",
3320
- "echo -e "\\e[0Ksection_end:$(date +%s):pushToArtifactRegistry\\r\\e[0K"",
3321
3280
  "echo -e "\\e[0Ksection_start:$(date +%s):deploy[collapsed=true]\\r\\e[0KDeploy to cloud run"",
3322
3281
  "echo "$ENV_VARS" > ____envvars.yaml",
3323
3282
  "gcloud run deploy pan-test-app-prod-www --command="yarn,start" --image=europe-west6-docker.pkg.dev/google-project-id/catladder-deploy/pan-test-app/prod/www:$DOCKER_IMAGE_TAG --project=google-project-id --region=europe-west6 --labels=customer-name=pan,component-name=www,app-name=test-app,env-type=prod,env-name=prod,build-type=node --env-vars-file=____envvars.yaml --min-instances=0 --max-instances=100 --cpu-throttling --allow-unauthenticated --ingress=all --cpu-boost",
@@ -3325,6 +3284,7 @@ COPY --chown=node:node .yarn /app/.yarn",
3325
3284
  "echo -e "\\e[0Ksection_start:$(date +%s):cleanup[collapsed=true]\\r\\e[0KCleanup"",
3326
3285
  "gcloud run revisions list --project=google-project-id --region=europe-west6 --service=pan-test-app-prod-www --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",
3327
3286
  "gcloud artifacts docker images list europe-west6-docker.pkg.dev/google-project-id/catladder-deploy/pan-test-app/prod/www --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/www@$version --quiet --delete-tags; done",
3287
+ "gcloud artifacts docker images list europe-west6-docker.pkg.dev/google-project-id/catladder-deploy/pan-test-app/caches/www --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/www@$version --quiet --delete-tags; done",
3328
3288
  "echo -e "\\e[0Ksection_end:$(date +%s):cleanup\\r\\e[0K"",
3329
3289
  "echo Uploading SBOM to Dependency Track",
3330
3290
  "/dtrackuploader https://dep.panter.swiss/ "$DT_KEY_PROD" upload "pan-test-app/www" "https://pan-test-app-prod-www-unknown-host.example.com" "__sbom.json" vex.json || true",
@@ -3346,14 +3306,12 @@ COPY --chown=node:node .yarn /app/.yarn",
3346
3306
  "BUILD_INFO_ID": "some-id",
3347
3307
  "CLOUDSDK_CORE_DISABLE_PROMPTS": "1",
3348
3308
  "DOCKER_BUILDKIT": "1",
3349
- "DOCKER_CACHE_IMAGE": "$DOCKER_REGISTRY_IMAGE_PATH/caches/www",
3309
+ "DOCKER_CACHE_IMAGE": "europe-west6-docker.pkg.dev/google-project-id/catladder-deploy/pan-test-app/caches/www",
3350
3310
  "DOCKER_DRIVER": "overlay2",
3351
3311
  "DOCKER_HOST": "tcp://0.0.0.0:2375",
3352
- "DOCKER_IMAGE": "$DOCKER_REGISTRY_IMAGE_PATH/$DOCKER_IMAGE_NAME",
3353
- "DOCKER_IMAGE_NAME": "prod/www",
3312
+ "DOCKER_IMAGE": "europe-west6-docker.pkg.dev/google-project-id/catladder-deploy/pan-test-app/prod/www",
3354
3313
  "DOCKER_IMAGE_TAG": "$CI_COMMIT_SHA",
3355
- "DOCKER_REGISTRY": "$CI_REGISTRY",
3356
- "DOCKER_REGISTRY_IMAGE_PATH": "$CI_REGISTRY_IMAGE",
3314
+ "DOCKER_REGISTRY": "europe-west6-docker.pkg.dev",
3357
3315
  "DOCKER_TLS_CERTDIR": "",
3358
3316
  "ENV_SHORT": "prod",
3359
3317
  "ENV_TYPE": "prod",
@@ -3431,13 +3389,6 @@ _ALL_ENV_VAR_KEYS: '["ENV_SHORT","APP_DIR","ENV_TYPE","BUILD_INFO_ID","BUILD_INF
3431
3389
  "export GCLOUD_PROJECT_NUMBER=$(gcloud projects describe google-project-id --format="value(projectNumber)")",
3432
3390
  "echo "GCLOUD_PROJECT_NUMBER: $GCLOUD_PROJECT_NUMBER"",
3433
3391
  "echo -e "\\e[0Ksection_end:$(date +%s):prepare\\r\\e[0K"",
3434
- "echo -e "\\e[0Ksection_start:$(date +%s):pushToArtifactRegistry[collapsed=true]\\r\\e[0KPushing image to artifacts registry"",
3435
- "docker login --username gitlab-ci-token --password $CI_JOB_TOKEN $CI_REGISTRY",
3436
- "gcloud auth configure-docker europe-west6-docker.pkg.dev",
3437
- "docker pull $DOCKER_IMAGE:$DOCKER_IMAGE_TAG",
3438
- "docker tag $DOCKER_IMAGE:$DOCKER_IMAGE_TAG europe-west6-docker.pkg.dev/google-project-id/catladder-deploy/pan-test-app/stage/www:$DOCKER_IMAGE_TAG",
3439
- "docker push europe-west6-docker.pkg.dev/google-project-id/catladder-deploy/pan-test-app/stage/www:$DOCKER_IMAGE_TAG",
3440
- "echo -e "\\e[0Ksection_end:$(date +%s):pushToArtifactRegistry\\r\\e[0K"",
3441
3392
  "echo -e "\\e[0Ksection_start:$(date +%s):deploy[collapsed=true]\\r\\e[0KDeploy to cloud run"",
3442
3393
  "echo "$ENV_VARS" > ____envvars.yaml",
3443
3394
  "gcloud run deploy pan-test-app-stage-www --command="yarn,start" --image=europe-west6-docker.pkg.dev/google-project-id/catladder-deploy/pan-test-app/stage/www:$DOCKER_IMAGE_TAG --project=google-project-id --region=europe-west6 --labels=customer-name=pan,component-name=www,app-name=test-app,env-type=stage,env-name=stage,build-type=node --env-vars-file=____envvars.yaml --min-instances=0 --max-instances=100 --cpu-throttling --allow-unauthenticated --ingress=all --cpu-boost",
@@ -3445,6 +3396,7 @@ _ALL_ENV_VAR_KEYS: '["ENV_SHORT","APP_DIR","ENV_TYPE","BUILD_INFO_ID","BUILD_INF
3445
3396
  "echo -e "\\e[0Ksection_start:$(date +%s):cleanup[collapsed=true]\\r\\e[0KCleanup"",
3446
3397
  "gcloud run revisions list --project=google-project-id --region=europe-west6 --service=pan-test-app-stage-www --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",
3447
3398
  "gcloud artifacts docker images list europe-west6-docker.pkg.dev/google-project-id/catladder-deploy/pan-test-app/stage/www --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/www@$version --quiet --delete-tags; done",
3399
+ "gcloud artifacts docker images list europe-west6-docker.pkg.dev/google-project-id/catladder-deploy/pan-test-app/caches/www --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/www@$version --quiet --delete-tags; done",
3448
3400
  "echo -e "\\e[0Ksection_end:$(date +%s):cleanup\\r\\e[0K"",
3449
3401
  "echo Uploading SBOM to Dependency Track",
3450
3402
  "/dtrackuploader https://dep.panter.swiss/ "$DT_KEY_PROD" upload "pan-test-app/www" "https://pan-test-app-stage-www-unknown-host.example.com" "__sbom.json" vex.json || true",
@@ -3466,14 +3418,12 @@ _ALL_ENV_VAR_KEYS: '["ENV_SHORT","APP_DIR","ENV_TYPE","BUILD_INFO_ID","BUILD_INF
3466
3418
  "BUILD_INFO_ID": "some-id",
3467
3419
  "CLOUDSDK_CORE_DISABLE_PROMPTS": "1",
3468
3420
  "DOCKER_BUILDKIT": "1",
3469
- "DOCKER_CACHE_IMAGE": "$DOCKER_REGISTRY_IMAGE_PATH/caches/www",
3421
+ "DOCKER_CACHE_IMAGE": "europe-west6-docker.pkg.dev/google-project-id/catladder-deploy/pan-test-app/caches/www",
3470
3422
  "DOCKER_DRIVER": "overlay2",
3471
3423
  "DOCKER_HOST": "tcp://0.0.0.0:2375",
3472
- "DOCKER_IMAGE": "$DOCKER_REGISTRY_IMAGE_PATH/$DOCKER_IMAGE_NAME",
3473
- "DOCKER_IMAGE_NAME": "stage/www",
3424
+ "DOCKER_IMAGE": "europe-west6-docker.pkg.dev/google-project-id/catladder-deploy/pan-test-app/stage/www",
3474
3425
  "DOCKER_IMAGE_TAG": "$CI_COMMIT_SHA",
3475
- "DOCKER_REGISTRY": "$CI_REGISTRY",
3476
- "DOCKER_REGISTRY_IMAGE_PATH": "$CI_REGISTRY_IMAGE",
3426
+ "DOCKER_REGISTRY": "europe-west6-docker.pkg.dev",
3477
3427
  "DOCKER_TLS_CERTDIR": "",
3478
3428
  "ENV_SHORT": "stage",
3479
3429
  "ENV_TYPE": "stage",
@@ -3536,6 +3486,7 @@ _ALL_ENV_VAR_KEYS: '["ENV_SHORT","APP_DIR","ENV_TYPE","BUILD_INFO_ID","BUILD_INF
3536
3486
  "gcloud auth activate-service-account --key-file="./____keyfile.json"",
3537
3487
  "gcloud run services delete pan-test-app-prod-www --project=google-project-id --region=europe-west6",
3538
3488
  "gcloud artifacts docker images delete europe-west6-docker.pkg.dev/google-project-id/catladder-deploy/pan-test-app/prod/www --quiet --delete-tags",
3489
+ "gcloud artifacts docker images list europe-west6-docker.pkg.dev/google-project-id/catladder-deploy/pan-test-app/caches/www --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/www@$version --quiet --delete-tags; done",
3539
3490
  "echo Disabling component in Dependency Track",
3540
3491
  "/dtrackuploader https://dep.panter.swiss/ "$DT_KEY_PROD" disable "pan-test-app/www" "https://pan-test-app-prod-www-unknown-host.example.com" || true",
3541
3492
  "set -e",
@@ -3584,6 +3535,7 @@ _ALL_ENV_VAR_KEYS: '["ENV_SHORT","APP_DIR","ENV_TYPE","BUILD_INFO_ID","BUILD_INF
3584
3535
  "gcloud auth activate-service-account --key-file="./____keyfile.json"",
3585
3536
  "gcloud run services delete pan-test-app-stage-www --project=google-project-id --region=europe-west6",
3586
3537
  "gcloud artifacts docker images delete europe-west6-docker.pkg.dev/google-project-id/catladder-deploy/pan-test-app/stage/www --quiet --delete-tags",
3538
+ "gcloud artifacts docker images list europe-west6-docker.pkg.dev/google-project-id/catladder-deploy/pan-test-app/caches/www --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/www@$version --quiet --delete-tags; done",
3587
3539
  "echo Disabling component in Dependency Track",
3588
3540
  "/dtrackuploader https://dep.panter.swiss/ "$DT_KEY_PROD" disable "pan-test-app/www" "https://pan-test-app-stage-www-unknown-host.example.com" || true",
3589
3541
  "set -e",