@catladder/pipeline 1.123.1 → 1.124.1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (40) hide show
  1. package/dist/build/custom/buildJob.js +1 -1
  2. package/dist/build/docker.d.ts +26 -6
  3. package/dist/build/docker.js +53 -8
  4. package/dist/build/node/buildJob.js +1 -1
  5. package/dist/build/node/meteor.js +1 -1
  6. package/dist/build/rails/build.js +12 -3
  7. package/dist/bundles/catladder-gitlab/index.js +3 -3
  8. package/dist/constants.js +1 -1
  9. package/dist/deploy/cloudRun/artifactsRegistry.d.ts +7 -4
  10. package/dist/deploy/cloudRun/artifactsRegistry.js +30 -23
  11. package/dist/deploy/cloudRun/deployJob.js +1 -1
  12. package/dist/deploy/dockerTag/deployJob.js +32 -1
  13. package/dist/tsconfig.tsbuildinfo +1 -1
  14. package/examples/__snapshots__/cloud-run-memory-limit.ts.snap +72 -76
  15. package/examples/__snapshots__/cloud-run-no-cpu-throttling.ts.snap +72 -76
  16. package/examples/__snapshots__/cloud-run-non-public.ts.snap +72 -76
  17. package/examples/__snapshots__/cloud-run-with-sql-reuse-db.ts.snap +144 -152
  18. package/examples/__snapshots__/cloud-run-with-sql.ts.snap +144 -152
  19. package/examples/__snapshots__/custom-build-job-with-tests.ts.snap +72 -76
  20. package/examples/__snapshots__/custom-build-job.ts.snap +72 -76
  21. package/examples/__snapshots__/custom-deploy.ts.snap +40 -28
  22. package/examples/__snapshots__/custom-sbom-java.ts.snap +72 -76
  23. package/examples/__snapshots__/kubernetes-application-customization.ts.snap +40 -28
  24. package/examples/__snapshots__/kubernetes-with-cloud-sql-legacy.ts.snap +40 -28
  25. package/examples/__snapshots__/kubernetes-with-cloud-sql.ts.snap +40 -28
  26. package/examples/__snapshots__/kubernetes-with-jobs.ts.snap +80 -56
  27. package/examples/__snapshots__/kubernetes-with-mongodb.ts.snap +40 -28
  28. package/examples/__snapshots__/meteor-kubernetes.ts.snap +40 -28
  29. package/examples/__snapshots__/native-app.ts.snap +72 -76
  30. package/examples/__snapshots__/node-build-with-custom-image.ts.snap +72 -76
  31. package/examples/__snapshots__/rails-k8s-with-worker.ts.snap +56 -52
  32. package/package.json +1 -1
  33. package/src/build/custom/buildJob.ts +1 -0
  34. package/src/build/docker.ts +56 -16
  35. package/src/build/node/buildJob.ts +1 -0
  36. package/src/build/node/meteor.ts +1 -1
  37. package/src/build/rails/build.ts +2 -2
  38. package/src/deploy/cloudRun/artifactsRegistry.ts +35 -32
  39. package/src/deploy/cloudRun/deployJob.ts +1 -8
  40. package/src/deploy/dockerTag/deployJob.ts +1 -1
package/examples/__snapshots__/cloud-run-with-sql.ts.snap CHANGED
@@ -166,12 +166,20 @@ exports[`matches snapshot 1`] = `
166
166
  },
167
167
  "script": [
168
168
  "ensureNodeDockerfile",
169
- "docker login --username gitlab-ci-token --password $CI_JOB_TOKEN $CI_REGISTRY",
170
- "docker version",
169
+ "echo -e "\\e[0Ksection_start:$(date +%s):docker-login[collapsed=true]\\r\\e[0KDocker Login"",
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",
174
+ "echo -e "\\e[0Ksection_end:$(date +%s):docker-login\\r\\e[0K"",
175
+ "echo -e "\\e[0Ksection_start:$(date +%s):docker-build[collapsed=true]\\r\\e[0KDocker build"",
171
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",
177
+ "echo -e "\\e[0Ksection_end:$(date +%s):docker-build\\r\\e[0K"",
178
+ "echo -e "\\e[0Ksection_start:$(date +%s):docker-push[collapsed=true]\\r\\e[0KDocker push and tag"",
172
179
  "docker push $DOCKER_IMAGE:$DOCKER_IMAGE_TAG",
173
180
  "docker tag $DOCKER_IMAGE:$DOCKER_IMAGE_TAG $DOCKER_CACHE_IMAGE",
174
181
  "docker push $DOCKER_CACHE_IMAGE",
182
+ "echo -e "\\e[0Ksection_end:$(date +%s):docker-push\\r\\e[0K"",
175
183
  ],
176
184
  "services": [
177
185
  {
@@ -187,7 +195,7 @@ exports[`matches snapshot 1`] = `
187
195
  "DOCKERFILE_ADDITIONS": undefined,
188
196
  "DOCKERFILE_ADDITIONS_END": undefined,
189
197
  "DOCKER_BUILDKIT": "1",
190
- "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",
191
199
  "DOCKER_COPY_AND_INSTALL_APP": "COPY --chown=node:node $APP_DIR .
192
200
  RUN yarn plugin import workspace-tools
193
201
  RUN yarn workspaces focus --production && yarn rebuild",
@@ -198,11 +206,9 @@ COPY --chown=node:node .yarn /app/.yarn",
198
206
  "DOCKER_DIR": ".",
199
207
  "DOCKER_DRIVER": "overlay2",
200
208
  "DOCKER_HOST": "tcp://0.0.0.0:2375",
201
- "DOCKER_IMAGE": "$DOCKER_REGISTRY_IMAGE_PATH/$DOCKER_IMAGE_NAME",
202
- "DOCKER_IMAGE_NAME": "dev/api",
209
+ "DOCKER_IMAGE": "europe-west6-docker.pkg.dev/google-project-id/catladder-deploy/pan-test-app/dev/api",
203
210
  "DOCKER_IMAGE_TAG": "$CI_COMMIT_SHA",
204
- "DOCKER_REGISTRY": "$CI_REGISTRY",
205
- "DOCKER_REGISTRY_IMAGE_PATH": "$CI_REGISTRY_IMAGE",
211
+ "DOCKER_REGISTRY": "europe-west6-docker.pkg.dev",
206
212
  "DOCKER_TLS_CERTDIR": "",
207
213
  "KUBERNETES_CPU_LIMIT": "1",
208
214
  "KUBERNETES_CPU_REQUEST": "0.5",
@@ -271,13 +277,6 @@ COPY --chown=node:node .yarn /app/.yarn",
271
277
  "export GCLOUD_PROJECT_NUMBER=$(gcloud projects describe google-project-id --format="value(projectNumber)")",
272
278
  "echo "GCLOUD_PROJECT_NUMBER: $GCLOUD_PROJECT_NUMBER"",
273
279
  "echo -e "\\e[0Ksection_end:$(date +%s):prepare\\r\\e[0K"",
274
- "echo -e "\\e[0Ksection_start:$(date +%s):pushToArtifactRegistry[collapsed=true]\\r\\e[0KPushing image to artifacts registry"",
275
- "docker login --username gitlab-ci-token --password $CI_JOB_TOKEN $CI_REGISTRY",
276
- "gcloud auth configure-docker europe-west6-docker.pkg.dev",
277
- "docker pull $DOCKER_IMAGE:$DOCKER_IMAGE_TAG",
278
- "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",
279
- "docker push europe-west6-docker.pkg.dev/google-project-id/catladder-deploy/pan-test-app/dev/api:$DOCKER_IMAGE_TAG",
280
- "echo -e "\\e[0Ksection_end:$(date +%s):pushToArtifactRegistry\\r\\e[0K"",
281
280
  "echo -e "\\e[0Ksection_start:$(date +%s):deploy[collapsed=true]\\r\\e[0KDeploy to cloud run"",
282
281
  "echo "$ENV_VARS" > ____envvars.yaml",
283
282
  "set +e",
@@ -302,6 +301,7 @@ COPY --chown=node:node .yarn /app/.yarn",
302
301
  "echo -e "\\e[0Ksection_start:$(date +%s):cleanup[collapsed=true]\\r\\e[0KCleanup"",
303
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",
304
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",
305
305
  "echo -e "\\e[0Ksection_end:$(date +%s):cleanup\\r\\e[0K"",
306
306
  "echo Uploading SBOM to Dependency Track",
307
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",
@@ -330,14 +330,12 @@ COPY --chown=node:node .yarn /app/.yarn",
330
330
  "DB_PASSWORD": "$CL_dev_api_DB_PASSWORD",
331
331
  "DB_USER": "my-user",
332
332
  "DOCKER_BUILDKIT": "1",
333
- "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",
334
334
  "DOCKER_DRIVER": "overlay2",
335
335
  "DOCKER_HOST": "tcp://0.0.0.0:2375",
336
- "DOCKER_IMAGE": "$DOCKER_REGISTRY_IMAGE_PATH/$DOCKER_IMAGE_NAME",
337
- "DOCKER_IMAGE_NAME": "dev/api",
336
+ "DOCKER_IMAGE": "europe-west6-docker.pkg.dev/google-project-id/catladder-deploy/pan-test-app/dev/api",
338
337
  "DOCKER_IMAGE_TAG": "$CI_COMMIT_SHA",
339
- "DOCKER_REGISTRY": "$CI_REGISTRY",
340
- "DOCKER_REGISTRY_IMAGE_PATH": "$CI_REGISTRY_IMAGE",
338
+ "DOCKER_REGISTRY": "europe-west6-docker.pkg.dev",
341
339
  "DOCKER_TLS_CERTDIR": "",
342
340
  "ENV_SHORT": "dev",
343
341
  "ENV_TYPE": "dev",
@@ -412,6 +410,7 @@ _ALL_ENV_VAR_KEYS: '["ENV_SHORT","APP_DIR","ENV_TYPE","BUILD_INFO_ID","BUILD_INF
412
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",
413
411
  "gcloud beta run jobs delete pan-test-app-dev-api-send-reminders --project=google-project-id --region=europe-west6",
414
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",
415
414
  "echo Disabling component in Dependency Track",
416
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",
417
416
  "set -e",
@@ -675,12 +674,20 @@ _ALL_ENV_VAR_KEYS: '["ENV_SHORT","APP_DIR","ENV_TYPE","BUILD_INFO_ID","BUILD_INF
675
674
  },
676
675
  "script": [
677
676
  "ensureNodeDockerfile",
678
- "docker login --username gitlab-ci-token --password $CI_JOB_TOKEN $CI_REGISTRY",
679
- "docker version",
677
+ "echo -e "\\e[0Ksection_start:$(date +%s):docker-login[collapsed=true]\\r\\e[0KDocker Login"",
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",
682
+ "echo -e "\\e[0Ksection_end:$(date +%s):docker-login\\r\\e[0K"",
683
+ "echo -e "\\e[0Ksection_start:$(date +%s):docker-build[collapsed=true]\\r\\e[0KDocker build"",
680
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",
685
+ "echo -e "\\e[0Ksection_end:$(date +%s):docker-build\\r\\e[0K"",
686
+ "echo -e "\\e[0Ksection_start:$(date +%s):docker-push[collapsed=true]\\r\\e[0KDocker push and tag"",
681
687
  "docker push $DOCKER_IMAGE:$DOCKER_IMAGE_TAG",
682
688
  "docker tag $DOCKER_IMAGE:$DOCKER_IMAGE_TAG $DOCKER_CACHE_IMAGE",
683
689
  "docker push $DOCKER_CACHE_IMAGE",
690
+ "echo -e "\\e[0Ksection_end:$(date +%s):docker-push\\r\\e[0K"",
684
691
  ],
685
692
  "services": [
686
693
  {
@@ -696,7 +703,7 @@ _ALL_ENV_VAR_KEYS: '["ENV_SHORT","APP_DIR","ENV_TYPE","BUILD_INFO_ID","BUILD_INF
696
703
  "DOCKERFILE_ADDITIONS": undefined,
697
704
  "DOCKERFILE_ADDITIONS_END": undefined,
698
705
  "DOCKER_BUILDKIT": "1",
699
- "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",
700
707
  "DOCKER_COPY_AND_INSTALL_APP": "COPY --chown=node:node $APP_DIR .
701
708
  RUN yarn plugin import workspace-tools
702
709
  RUN yarn workspaces focus --production && yarn rebuild",
@@ -707,11 +714,9 @@ COPY --chown=node:node .yarn /app/.yarn",
707
714
  "DOCKER_DIR": ".",
708
715
  "DOCKER_DRIVER": "overlay2",
709
716
  "DOCKER_HOST": "tcp://0.0.0.0:2375",
710
- "DOCKER_IMAGE": "$DOCKER_REGISTRY_IMAGE_PATH/$DOCKER_IMAGE_NAME",
711
- "DOCKER_IMAGE_NAME": "dev/www",
717
+ "DOCKER_IMAGE": "europe-west6-docker.pkg.dev/google-project-id/catladder-deploy/pan-test-app/dev/www",
712
718
  "DOCKER_IMAGE_TAG": "$CI_COMMIT_SHA",
713
- "DOCKER_REGISTRY": "$CI_REGISTRY",
714
- "DOCKER_REGISTRY_IMAGE_PATH": "$CI_REGISTRY_IMAGE",
719
+ "DOCKER_REGISTRY": "europe-west6-docker.pkg.dev",
715
720
  "DOCKER_TLS_CERTDIR": "",
716
721
  "KUBERNETES_CPU_LIMIT": "1",
717
722
  "KUBERNETES_CPU_REQUEST": "0.5",
@@ -780,13 +785,6 @@ COPY --chown=node:node .yarn /app/.yarn",
780
785
  "export GCLOUD_PROJECT_NUMBER=$(gcloud projects describe google-project-id --format="value(projectNumber)")",
781
786
  "echo "GCLOUD_PROJECT_NUMBER: $GCLOUD_PROJECT_NUMBER"",
782
787
  "echo -e "\\e[0Ksection_end:$(date +%s):prepare\\r\\e[0K"",
783
- "echo -e "\\e[0Ksection_start:$(date +%s):pushToArtifactRegistry[collapsed=true]\\r\\e[0KPushing image to artifacts registry"",
784
- "docker login --username gitlab-ci-token --password $CI_JOB_TOKEN $CI_REGISTRY",
785
- "gcloud auth configure-docker europe-west6-docker.pkg.dev",
786
- "docker pull $DOCKER_IMAGE:$DOCKER_IMAGE_TAG",
787
- "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",
788
- "docker push europe-west6-docker.pkg.dev/google-project-id/catladder-deploy/pan-test-app/dev/www:$DOCKER_IMAGE_TAG",
789
- "echo -e "\\e[0Ksection_end:$(date +%s):pushToArtifactRegistry\\r\\e[0K"",
790
788
  "echo -e "\\e[0Ksection_start:$(date +%s):deploy[collapsed=true]\\r\\e[0KDeploy to cloud run"",
791
789
  "echo "$ENV_VARS" > ____envvars.yaml",
792
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",
@@ -794,6 +792,7 @@ COPY --chown=node:node .yarn /app/.yarn",
794
792
  "echo -e "\\e[0Ksection_start:$(date +%s):cleanup[collapsed=true]\\r\\e[0KCleanup"",
795
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",
796
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",
797
796
  "echo -e "\\e[0Ksection_end:$(date +%s):cleanup\\r\\e[0K"",
798
797
  "echo Uploading SBOM to Dependency Track",
799
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",
@@ -815,14 +814,12 @@ COPY --chown=node:node .yarn /app/.yarn",
815
814
  "BUILD_INFO_ID": "some-id",
816
815
  "CLOUDSDK_CORE_DISABLE_PROMPTS": "1",
817
816
  "DOCKER_BUILDKIT": "1",
818
- "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",
819
818
  "DOCKER_DRIVER": "overlay2",
820
819
  "DOCKER_HOST": "tcp://0.0.0.0:2375",
821
- "DOCKER_IMAGE": "$DOCKER_REGISTRY_IMAGE_PATH/$DOCKER_IMAGE_NAME",
822
- "DOCKER_IMAGE_NAME": "dev/www",
820
+ "DOCKER_IMAGE": "europe-west6-docker.pkg.dev/google-project-id/catladder-deploy/pan-test-app/dev/www",
823
821
  "DOCKER_IMAGE_TAG": "$CI_COMMIT_SHA",
824
- "DOCKER_REGISTRY": "$CI_REGISTRY",
825
- "DOCKER_REGISTRY_IMAGE_PATH": "$CI_REGISTRY_IMAGE",
822
+ "DOCKER_REGISTRY": "europe-west6-docker.pkg.dev",
826
823
  "DOCKER_TLS_CERTDIR": "",
827
824
  "ENV_SHORT": "dev",
828
825
  "ENV_TYPE": "dev",
@@ -885,6 +882,7 @@ _ALL_ENV_VAR_KEYS: '["ENV_SHORT","APP_DIR","ENV_TYPE","BUILD_INFO_ID","BUILD_INF
885
882
  "gcloud auth activate-service-account --key-file="./____keyfile.json"",
886
883
  "gcloud run services delete pan-test-app-dev-www --project=google-project-id --region=europe-west6",
887
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",
888
886
  "echo Disabling component in Dependency Track",
889
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",
890
888
  "set -e",
@@ -1228,12 +1226,20 @@ _ALL_ENV_VAR_KEYS: '["ENV_SHORT","APP_DIR","ENV_TYPE","BUILD_INFO_ID","BUILD_INF
1228
1226
  },
1229
1227
  "script": [
1230
1228
  "ensureNodeDockerfile",
1231
- "docker login --username gitlab-ci-token --password $CI_JOB_TOKEN $CI_REGISTRY",
1232
- "docker version",
1229
+ "echo -e "\\e[0Ksection_start:$(date +%s):docker-login[collapsed=true]\\r\\e[0KDocker Login"",
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",
1234
+ "echo -e "\\e[0Ksection_end:$(date +%s):docker-login\\r\\e[0K"",
1235
+ "echo -e "\\e[0Ksection_start:$(date +%s):docker-build[collapsed=true]\\r\\e[0KDocker build"",
1233
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",
1237
+ "echo -e "\\e[0Ksection_end:$(date +%s):docker-build\\r\\e[0K"",
1238
+ "echo -e "\\e[0Ksection_start:$(date +%s):docker-push[collapsed=true]\\r\\e[0KDocker push and tag"",
1234
1239
  "docker push $DOCKER_IMAGE:$DOCKER_IMAGE_TAG",
1235
1240
  "docker tag $DOCKER_IMAGE:$DOCKER_IMAGE_TAG $DOCKER_CACHE_IMAGE",
1236
1241
  "docker push $DOCKER_CACHE_IMAGE",
1242
+ "echo -e "\\e[0Ksection_end:$(date +%s):docker-push\\r\\e[0K"",
1237
1243
  ],
1238
1244
  "services": [
1239
1245
  {
@@ -1249,7 +1255,7 @@ _ALL_ENV_VAR_KEYS: '["ENV_SHORT","APP_DIR","ENV_TYPE","BUILD_INFO_ID","BUILD_INF
1249
1255
  "DOCKERFILE_ADDITIONS": undefined,
1250
1256
  "DOCKERFILE_ADDITIONS_END": undefined,
1251
1257
  "DOCKER_BUILDKIT": "1",
1252
- "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",
1253
1259
  "DOCKER_COPY_AND_INSTALL_APP": "COPY --chown=node:node $APP_DIR .
1254
1260
  RUN yarn plugin import workspace-tools
1255
1261
  RUN yarn workspaces focus --production && yarn rebuild",
@@ -1260,11 +1266,9 @@ COPY --chown=node:node .yarn /app/.yarn",
1260
1266
  "DOCKER_DIR": ".",
1261
1267
  "DOCKER_DRIVER": "overlay2",
1262
1268
  "DOCKER_HOST": "tcp://0.0.0.0:2375",
1263
- "DOCKER_IMAGE": "$DOCKER_REGISTRY_IMAGE_PATH/$DOCKER_IMAGE_NAME",
1264
- "DOCKER_IMAGE_NAME": "review/api",
1269
+ "DOCKER_IMAGE": "europe-west6-docker.pkg.dev/google-project-id/catladder-deploy/pan-test-app/review/api/mr1234",
1265
1270
  "DOCKER_IMAGE_TAG": "$CI_COMMIT_SHA",
1266
- "DOCKER_REGISTRY": "$CI_REGISTRY",
1267
- "DOCKER_REGISTRY_IMAGE_PATH": "$CI_REGISTRY_IMAGE",
1271
+ "DOCKER_REGISTRY": "europe-west6-docker.pkg.dev",
1268
1272
  "DOCKER_TLS_CERTDIR": "",
1269
1273
  "KUBERNETES_CPU_LIMIT": "1",
1270
1274
  "KUBERNETES_CPU_REQUEST": "0.5",
@@ -1333,13 +1337,6 @@ COPY --chown=node:node .yarn /app/.yarn",
1333
1337
  "export GCLOUD_PROJECT_NUMBER=$(gcloud projects describe google-project-id --format="value(projectNumber)")",
1334
1338
  "echo "GCLOUD_PROJECT_NUMBER: $GCLOUD_PROJECT_NUMBER"",
1335
1339
  "echo -e "\\e[0Ksection_end:$(date +%s):prepare\\r\\e[0K"",
1336
- "echo -e "\\e[0Ksection_start:$(date +%s):pushToArtifactRegistry[collapsed=true]\\r\\e[0KPushing image to artifacts registry"",
1337
- "docker login --username gitlab-ci-token --password $CI_JOB_TOKEN $CI_REGISTRY",
1338
- "gcloud auth configure-docker europe-west6-docker.pkg.dev",
1339
- "docker pull $DOCKER_IMAGE:$DOCKER_IMAGE_TAG",
1340
- "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",
1341
- "docker push europe-west6-docker.pkg.dev/google-project-id/catladder-deploy/pan-test-app/review/api/mr1234:$DOCKER_IMAGE_TAG",
1342
- "echo -e "\\e[0Ksection_end:$(date +%s):pushToArtifactRegistry\\r\\e[0K"",
1343
1340
  "echo -e "\\e[0Ksection_start:$(date +%s):deploy[collapsed=true]\\r\\e[0KDeploy to cloud run"",
1344
1341
  "echo "$ENV_VARS" > ____envvars.yaml",
1345
1342
  "set +e",
@@ -1364,6 +1361,7 @@ COPY --chown=node:node .yarn /app/.yarn",
1364
1361
  "echo -e "\\e[0Ksection_start:$(date +%s):cleanup[collapsed=true]\\r\\e[0KCleanup"",
1365
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",
1366
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",
1367
1365
  "set +e",
1368
1366
  "gcloud artifacts docker images delete europe-west6-docker.pkg.dev/google-project-id/catladder-deploy/pan-test-app/review/api --quiet --delete-tags",
1369
1367
  "set -e",
@@ -1395,14 +1393,12 @@ COPY --chown=node:node .yarn /app/.yarn",
1395
1393
  "DB_PASSWORD": "$CL_review_api_DB_PASSWORD",
1396
1394
  "DB_USER": "my-user",
1397
1395
  "DOCKER_BUILDKIT": "1",
1398
- "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",
1399
1397
  "DOCKER_DRIVER": "overlay2",
1400
1398
  "DOCKER_HOST": "tcp://0.0.0.0:2375",
1401
- "DOCKER_IMAGE": "$DOCKER_REGISTRY_IMAGE_PATH/$DOCKER_IMAGE_NAME",
1402
- "DOCKER_IMAGE_NAME": "review/api",
1399
+ "DOCKER_IMAGE": "europe-west6-docker.pkg.dev/google-project-id/catladder-deploy/pan-test-app/review/api/mr1234",
1403
1400
  "DOCKER_IMAGE_TAG": "$CI_COMMIT_SHA",
1404
- "DOCKER_REGISTRY": "$CI_REGISTRY",
1405
- "DOCKER_REGISTRY_IMAGE_PATH": "$CI_REGISTRY_IMAGE",
1401
+ "DOCKER_REGISTRY": "europe-west6-docker.pkg.dev",
1406
1402
  "DOCKER_TLS_CERTDIR": "",
1407
1403
  "ENV_SHORT": "review",
1408
1404
  "ENV_TYPE": "review",
@@ -1486,6 +1482,7 @@ _ALL_ENV_VAR_KEYS: '["ENV_SHORT","APP_DIR","ENV_TYPE","BUILD_INFO_ID","BUILD_INF
1486
1482
  done
1487
1483
  ",
1488
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",
1489
1486
  "set +e",
1490
1487
  "gcloud artifacts docker images delete europe-west6-docker.pkg.dev/google-project-id/catladder-deploy/pan-test-app/review/api --quiet --delete-tags",
1491
1488
  "set -e",
@@ -1752,12 +1749,20 @@ _ALL_ENV_VAR_KEYS: '["ENV_SHORT","APP_DIR","ENV_TYPE","BUILD_INFO_ID","BUILD_INF
1752
1749
  },
1753
1750
  "script": [
1754
1751
  "ensureNodeDockerfile",
1755
- "docker login --username gitlab-ci-token --password $CI_JOB_TOKEN $CI_REGISTRY",
1756
- "docker version",
1752
+ "echo -e "\\e[0Ksection_start:$(date +%s):docker-login[collapsed=true]\\r\\e[0KDocker Login"",
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",
1757
+ "echo -e "\\e[0Ksection_end:$(date +%s):docker-login\\r\\e[0K"",
1758
+ "echo -e "\\e[0Ksection_start:$(date +%s):docker-build[collapsed=true]\\r\\e[0KDocker build"",
1757
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",
1760
+ "echo -e "\\e[0Ksection_end:$(date +%s):docker-build\\r\\e[0K"",
1761
+ "echo -e "\\e[0Ksection_start:$(date +%s):docker-push[collapsed=true]\\r\\e[0KDocker push and tag"",
1758
1762
  "docker push $DOCKER_IMAGE:$DOCKER_IMAGE_TAG",
1759
1763
  "docker tag $DOCKER_IMAGE:$DOCKER_IMAGE_TAG $DOCKER_CACHE_IMAGE",
1760
1764
  "docker push $DOCKER_CACHE_IMAGE",
1765
+ "echo -e "\\e[0Ksection_end:$(date +%s):docker-push\\r\\e[0K"",
1761
1766
  ],
1762
1767
  "services": [
1763
1768
  {
@@ -1773,7 +1778,7 @@ _ALL_ENV_VAR_KEYS: '["ENV_SHORT","APP_DIR","ENV_TYPE","BUILD_INFO_ID","BUILD_INF
1773
1778
  "DOCKERFILE_ADDITIONS": undefined,
1774
1779
  "DOCKERFILE_ADDITIONS_END": undefined,
1775
1780
  "DOCKER_BUILDKIT": "1",
1776
- "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",
1777
1782
  "DOCKER_COPY_AND_INSTALL_APP": "COPY --chown=node:node $APP_DIR .
1778
1783
  RUN yarn plugin import workspace-tools
1779
1784
  RUN yarn workspaces focus --production && yarn rebuild",
@@ -1784,11 +1789,9 @@ COPY --chown=node:node .yarn /app/.yarn",
1784
1789
  "DOCKER_DIR": ".",
1785
1790
  "DOCKER_DRIVER": "overlay2",
1786
1791
  "DOCKER_HOST": "tcp://0.0.0.0:2375",
1787
- "DOCKER_IMAGE": "$DOCKER_REGISTRY_IMAGE_PATH/$DOCKER_IMAGE_NAME",
1788
- "DOCKER_IMAGE_NAME": "review/www",
1792
+ "DOCKER_IMAGE": "europe-west6-docker.pkg.dev/google-project-id/catladder-deploy/pan-test-app/review/www/mr1234",
1789
1793
  "DOCKER_IMAGE_TAG": "$CI_COMMIT_SHA",
1790
- "DOCKER_REGISTRY": "$CI_REGISTRY",
1791
- "DOCKER_REGISTRY_IMAGE_PATH": "$CI_REGISTRY_IMAGE",
1794
+ "DOCKER_REGISTRY": "europe-west6-docker.pkg.dev",
1792
1795
  "DOCKER_TLS_CERTDIR": "",
1793
1796
  "KUBERNETES_CPU_LIMIT": "1",
1794
1797
  "KUBERNETES_CPU_REQUEST": "0.5",
@@ -1857,13 +1860,6 @@ COPY --chown=node:node .yarn /app/.yarn",
1857
1860
  "export GCLOUD_PROJECT_NUMBER=$(gcloud projects describe google-project-id --format="value(projectNumber)")",
1858
1861
  "echo "GCLOUD_PROJECT_NUMBER: $GCLOUD_PROJECT_NUMBER"",
1859
1862
  "echo -e "\\e[0Ksection_end:$(date +%s):prepare\\r\\e[0K"",
1860
- "echo -e "\\e[0Ksection_start:$(date +%s):pushToArtifactRegistry[collapsed=true]\\r\\e[0KPushing image to artifacts registry"",
1861
- "docker login --username gitlab-ci-token --password $CI_JOB_TOKEN $CI_REGISTRY",
1862
- "gcloud auth configure-docker europe-west6-docker.pkg.dev",
1863
- "docker pull $DOCKER_IMAGE:$DOCKER_IMAGE_TAG",
1864
- "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",
1865
- "docker push europe-west6-docker.pkg.dev/google-project-id/catladder-deploy/pan-test-app/review/www/mr1234:$DOCKER_IMAGE_TAG",
1866
- "echo -e "\\e[0Ksection_end:$(date +%s):pushToArtifactRegistry\\r\\e[0K"",
1867
1863
  "echo -e "\\e[0Ksection_start:$(date +%s):deploy[collapsed=true]\\r\\e[0KDeploy to cloud run"",
1868
1864
  "echo "$ENV_VARS" > ____envvars.yaml",
1869
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",
@@ -1871,6 +1867,7 @@ COPY --chown=node:node .yarn /app/.yarn",
1871
1867
  "echo -e "\\e[0Ksection_start:$(date +%s):cleanup[collapsed=true]\\r\\e[0KCleanup"",
1872
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",
1873
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",
1874
1871
  "set +e",
1875
1872
  "gcloud artifacts docker images delete europe-west6-docker.pkg.dev/google-project-id/catladder-deploy/pan-test-app/review/www --quiet --delete-tags",
1876
1873
  "set -e",
@@ -1895,14 +1892,12 @@ COPY --chown=node:node .yarn /app/.yarn",
1895
1892
  "BUILD_INFO_ID": "some-id",
1896
1893
  "CLOUDSDK_CORE_DISABLE_PROMPTS": "1",
1897
1894
  "DOCKER_BUILDKIT": "1",
1898
- "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",
1899
1896
  "DOCKER_DRIVER": "overlay2",
1900
1897
  "DOCKER_HOST": "tcp://0.0.0.0:2375",
1901
- "DOCKER_IMAGE": "$DOCKER_REGISTRY_IMAGE_PATH/$DOCKER_IMAGE_NAME",
1902
- "DOCKER_IMAGE_NAME": "review/www",
1898
+ "DOCKER_IMAGE": "europe-west6-docker.pkg.dev/google-project-id/catladder-deploy/pan-test-app/review/www/mr1234",
1903
1899
  "DOCKER_IMAGE_TAG": "$CI_COMMIT_SHA",
1904
- "DOCKER_REGISTRY": "$CI_REGISTRY",
1905
- "DOCKER_REGISTRY_IMAGE_PATH": "$CI_REGISTRY_IMAGE",
1900
+ "DOCKER_REGISTRY": "europe-west6-docker.pkg.dev",
1906
1901
  "DOCKER_TLS_CERTDIR": "",
1907
1902
  "ENV_SHORT": "review",
1908
1903
  "ENV_TYPE": "review",
@@ -1965,6 +1960,7 @@ _ALL_ENV_VAR_KEYS: '["ENV_SHORT","APP_DIR","ENV_TYPE","BUILD_INFO_ID","BUILD_INF
1965
1960
  "gcloud auth activate-service-account --key-file="./____keyfile.json"",
1966
1961
  "gcloud run services delete pan-test-app-review-mr1234-www --project=google-project-id --region=europe-west6",
1967
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",
1968
1964
  "set +e",
1969
1965
  "gcloud artifacts docker images delete europe-west6-docker.pkg.dev/google-project-id/catladder-deploy/pan-test-app/review/www --quiet --delete-tags",
1970
1966
  "set -e",
@@ -2354,12 +2350,20 @@ _ALL_ENV_VAR_KEYS: '["ENV_SHORT","APP_DIR","ENV_TYPE","BUILD_INFO_ID","BUILD_INF
2354
2350
  },
2355
2351
  "script": [
2356
2352
  "ensureNodeDockerfile",
2357
- "docker login --username gitlab-ci-token --password $CI_JOB_TOKEN $CI_REGISTRY",
2358
- "docker version",
2353
+ "echo -e "\\e[0Ksection_start:$(date +%s):docker-login[collapsed=true]\\r\\e[0KDocker Login"",
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",
2358
+ "echo -e "\\e[0Ksection_end:$(date +%s):docker-login\\r\\e[0K"",
2359
+ "echo -e "\\e[0Ksection_start:$(date +%s):docker-build[collapsed=true]\\r\\e[0KDocker build"",
2359
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",
2361
+ "echo -e "\\e[0Ksection_end:$(date +%s):docker-build\\r\\e[0K"",
2362
+ "echo -e "\\e[0Ksection_start:$(date +%s):docker-push[collapsed=true]\\r\\e[0KDocker push and tag"",
2360
2363
  "docker push $DOCKER_IMAGE:$DOCKER_IMAGE_TAG",
2361
2364
  "docker tag $DOCKER_IMAGE:$DOCKER_IMAGE_TAG $DOCKER_CACHE_IMAGE",
2362
2365
  "docker push $DOCKER_CACHE_IMAGE",
2366
+ "echo -e "\\e[0Ksection_end:$(date +%s):docker-push\\r\\e[0K"",
2363
2367
  ],
2364
2368
  "services": [
2365
2369
  {
@@ -2375,7 +2379,7 @@ _ALL_ENV_VAR_KEYS: '["ENV_SHORT","APP_DIR","ENV_TYPE","BUILD_INFO_ID","BUILD_INF
2375
2379
  "DOCKERFILE_ADDITIONS": undefined,
2376
2380
  "DOCKERFILE_ADDITIONS_END": undefined,
2377
2381
  "DOCKER_BUILDKIT": "1",
2378
- "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",
2379
2383
  "DOCKER_COPY_AND_INSTALL_APP": "COPY --chown=node:node $APP_DIR .
2380
2384
  RUN yarn plugin import workspace-tools
2381
2385
  RUN yarn workspaces focus --production && yarn rebuild",
@@ -2386,11 +2390,9 @@ COPY --chown=node:node .yarn /app/.yarn",
2386
2390
  "DOCKER_DIR": ".",
2387
2391
  "DOCKER_DRIVER": "overlay2",
2388
2392
  "DOCKER_HOST": "tcp://0.0.0.0:2375",
2389
- "DOCKER_IMAGE": "$DOCKER_REGISTRY_IMAGE_PATH/$DOCKER_IMAGE_NAME",
2390
- "DOCKER_IMAGE_NAME": "prod/api",
2393
+ "DOCKER_IMAGE": "europe-west6-docker.pkg.dev/google-project-id/catladder-deploy/pan-test-app/prod/api",
2391
2394
  "DOCKER_IMAGE_TAG": "$CI_COMMIT_SHA",
2392
- "DOCKER_REGISTRY": "$CI_REGISTRY",
2393
- "DOCKER_REGISTRY_IMAGE_PATH": "$CI_REGISTRY_IMAGE",
2395
+ "DOCKER_REGISTRY": "europe-west6-docker.pkg.dev",
2394
2396
  "DOCKER_TLS_CERTDIR": "",
2395
2397
  "KUBERNETES_CPU_LIMIT": "1",
2396
2398
  "KUBERNETES_CPU_REQUEST": "0.5",
@@ -2422,12 +2424,20 @@ COPY --chown=node:node .yarn /app/.yarn",
2422
2424
  },
2423
2425
  "script": [
2424
2426
  "ensureNodeDockerfile",
2425
- "docker login --username gitlab-ci-token --password $CI_JOB_TOKEN $CI_REGISTRY",
2426
- "docker version",
2427
+ "echo -e "\\e[0Ksection_start:$(date +%s):docker-login[collapsed=true]\\r\\e[0KDocker Login"",
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",
2432
+ "echo -e "\\e[0Ksection_end:$(date +%s):docker-login\\r\\e[0K"",
2433
+ "echo -e "\\e[0Ksection_start:$(date +%s):docker-build[collapsed=true]\\r\\e[0KDocker build"",
2427
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",
2435
+ "echo -e "\\e[0Ksection_end:$(date +%s):docker-build\\r\\e[0K"",
2436
+ "echo -e "\\e[0Ksection_start:$(date +%s):docker-push[collapsed=true]\\r\\e[0KDocker push and tag"",
2428
2437
  "docker push $DOCKER_IMAGE:$DOCKER_IMAGE_TAG",
2429
2438
  "docker tag $DOCKER_IMAGE:$DOCKER_IMAGE_TAG $DOCKER_CACHE_IMAGE",
2430
2439
  "docker push $DOCKER_CACHE_IMAGE",
2440
+ "echo -e "\\e[0Ksection_end:$(date +%s):docker-push\\r\\e[0K"",
2431
2441
  ],
2432
2442
  "services": [
2433
2443
  {
@@ -2443,7 +2453,7 @@ COPY --chown=node:node .yarn /app/.yarn",
2443
2453
  "DOCKERFILE_ADDITIONS": undefined,
2444
2454
  "DOCKERFILE_ADDITIONS_END": undefined,
2445
2455
  "DOCKER_BUILDKIT": "1",
2446
- "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",
2447
2457
  "DOCKER_COPY_AND_INSTALL_APP": "COPY --chown=node:node $APP_DIR .
2448
2458
  RUN yarn plugin import workspace-tools
2449
2459
  RUN yarn workspaces focus --production && yarn rebuild",
@@ -2454,11 +2464,9 @@ COPY --chown=node:node .yarn /app/.yarn",
2454
2464
  "DOCKER_DIR": ".",
2455
2465
  "DOCKER_DRIVER": "overlay2",
2456
2466
  "DOCKER_HOST": "tcp://0.0.0.0:2375",
2457
- "DOCKER_IMAGE": "$DOCKER_REGISTRY_IMAGE_PATH/$DOCKER_IMAGE_NAME",
2458
- "DOCKER_IMAGE_NAME": "stage/api",
2467
+ "DOCKER_IMAGE": "europe-west6-docker.pkg.dev/google-project-id/catladder-deploy/pan-test-app/stage/api",
2459
2468
  "DOCKER_IMAGE_TAG": "$CI_COMMIT_SHA",
2460
- "DOCKER_REGISTRY": "$CI_REGISTRY",
2461
- "DOCKER_REGISTRY_IMAGE_PATH": "$CI_REGISTRY_IMAGE",
2469
+ "DOCKER_REGISTRY": "europe-west6-docker.pkg.dev",
2462
2470
  "DOCKER_TLS_CERTDIR": "",
2463
2471
  "KUBERNETES_CPU_LIMIT": "1",
2464
2472
  "KUBERNETES_CPU_REQUEST": "0.5",
@@ -2515,13 +2523,6 @@ COPY --chown=node:node .yarn /app/.yarn",
2515
2523
  "export GCLOUD_PROJECT_NUMBER=$(gcloud projects describe google-project-id --format="value(projectNumber)")",
2516
2524
  "echo "GCLOUD_PROJECT_NUMBER: $GCLOUD_PROJECT_NUMBER"",
2517
2525
  "echo -e "\\e[0Ksection_end:$(date +%s):prepare\\r\\e[0K"",
2518
- "echo -e "\\e[0Ksection_start:$(date +%s):pushToArtifactRegistry[collapsed=true]\\r\\e[0KPushing image to artifacts registry"",
2519
- "docker login --username gitlab-ci-token --password $CI_JOB_TOKEN $CI_REGISTRY",
2520
- "gcloud auth configure-docker europe-west6-docker.pkg.dev",
2521
- "docker pull $DOCKER_IMAGE:$DOCKER_IMAGE_TAG",
2522
- "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",
2523
- "docker push europe-west6-docker.pkg.dev/google-project-id/catladder-deploy/pan-test-app/prod/api:$DOCKER_IMAGE_TAG",
2524
- "echo -e "\\e[0Ksection_end:$(date +%s):pushToArtifactRegistry\\r\\e[0K"",
2525
2526
  "echo -e "\\e[0Ksection_start:$(date +%s):deploy[collapsed=true]\\r\\e[0KDeploy to cloud run"",
2526
2527
  "echo "$ENV_VARS" > ____envvars.yaml",
2527
2528
  "set +e",
@@ -2546,6 +2547,7 @@ COPY --chown=node:node .yarn /app/.yarn",
2546
2547
  "echo -e "\\e[0Ksection_start:$(date +%s):cleanup[collapsed=true]\\r\\e[0KCleanup"",
2547
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",
2548
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",
2549
2551
  "echo -e "\\e[0Ksection_end:$(date +%s):cleanup\\r\\e[0K"",
2550
2552
  "echo Uploading SBOM to Dependency Track",
2551
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",
@@ -2574,14 +2576,12 @@ COPY --chown=node:node .yarn /app/.yarn",
2574
2576
  "DB_PASSWORD": "$CL_prod_api_DB_PASSWORD",
2575
2577
  "DB_USER": "my-user",
2576
2578
  "DOCKER_BUILDKIT": "1",
2577
- "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",
2578
2580
  "DOCKER_DRIVER": "overlay2",
2579
2581
  "DOCKER_HOST": "tcp://0.0.0.0:2375",
2580
- "DOCKER_IMAGE": "$DOCKER_REGISTRY_IMAGE_PATH/$DOCKER_IMAGE_NAME",
2581
- "DOCKER_IMAGE_NAME": "prod/api",
2582
+ "DOCKER_IMAGE": "europe-west6-docker.pkg.dev/google-project-id/catladder-deploy/pan-test-app/prod/api",
2582
2583
  "DOCKER_IMAGE_TAG": "$CI_COMMIT_SHA",
2583
- "DOCKER_REGISTRY": "$CI_REGISTRY",
2584
- "DOCKER_REGISTRY_IMAGE_PATH": "$CI_REGISTRY_IMAGE",
2584
+ "DOCKER_REGISTRY": "europe-west6-docker.pkg.dev",
2585
2585
  "DOCKER_TLS_CERTDIR": "",
2586
2586
  "ENV_SHORT": "prod",
2587
2587
  "ENV_TYPE": "prod",
@@ -2666,13 +2666,6 @@ _ALL_ENV_VAR_KEYS: '["ENV_SHORT","APP_DIR","ENV_TYPE","BUILD_INFO_ID","BUILD_INF
2666
2666
  "export GCLOUD_PROJECT_NUMBER=$(gcloud projects describe google-project-id --format="value(projectNumber)")",
2667
2667
  "echo "GCLOUD_PROJECT_NUMBER: $GCLOUD_PROJECT_NUMBER"",
2668
2668
  "echo -e "\\e[0Ksection_end:$(date +%s):prepare\\r\\e[0K"",
2669
- "echo -e "\\e[0Ksection_start:$(date +%s):pushToArtifactRegistry[collapsed=true]\\r\\e[0KPushing image to artifacts registry"",
2670
- "docker login --username gitlab-ci-token --password $CI_JOB_TOKEN $CI_REGISTRY",
2671
- "gcloud auth configure-docker europe-west6-docker.pkg.dev",
2672
- "docker pull $DOCKER_IMAGE:$DOCKER_IMAGE_TAG",
2673
- "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",
2674
- "docker push europe-west6-docker.pkg.dev/google-project-id/catladder-deploy/pan-test-app/stage/api:$DOCKER_IMAGE_TAG",
2675
- "echo -e "\\e[0Ksection_end:$(date +%s):pushToArtifactRegistry\\r\\e[0K"",
2676
2669
  "echo -e "\\e[0Ksection_start:$(date +%s):deploy[collapsed=true]\\r\\e[0KDeploy to cloud run"",
2677
2670
  "echo "$ENV_VARS" > ____envvars.yaml",
2678
2671
  "set +e",
@@ -2697,6 +2690,7 @@ _ALL_ENV_VAR_KEYS: '["ENV_SHORT","APP_DIR","ENV_TYPE","BUILD_INFO_ID","BUILD_INF
2697
2690
  "echo -e "\\e[0Ksection_start:$(date +%s):cleanup[collapsed=true]\\r\\e[0KCleanup"",
2698
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",
2699
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",
2700
2694
  "echo -e "\\e[0Ksection_end:$(date +%s):cleanup\\r\\e[0K"",
2701
2695
  "echo Uploading SBOM to Dependency Track",
2702
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",
@@ -2725,14 +2719,12 @@ _ALL_ENV_VAR_KEYS: '["ENV_SHORT","APP_DIR","ENV_TYPE","BUILD_INFO_ID","BUILD_INF
2725
2719
  "DB_PASSWORD": "$CL_stage_api_DB_PASSWORD",
2726
2720
  "DB_USER": "my-user",
2727
2721
  "DOCKER_BUILDKIT": "1",
2728
- "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",
2729
2723
  "DOCKER_DRIVER": "overlay2",
2730
2724
  "DOCKER_HOST": "tcp://0.0.0.0:2375",
2731
- "DOCKER_IMAGE": "$DOCKER_REGISTRY_IMAGE_PATH/$DOCKER_IMAGE_NAME",
2732
- "DOCKER_IMAGE_NAME": "stage/api",
2725
+ "DOCKER_IMAGE": "europe-west6-docker.pkg.dev/google-project-id/catladder-deploy/pan-test-app/stage/api",
2733
2726
  "DOCKER_IMAGE_TAG": "$CI_COMMIT_SHA",
2734
- "DOCKER_REGISTRY": "$CI_REGISTRY",
2735
- "DOCKER_REGISTRY_IMAGE_PATH": "$CI_REGISTRY_IMAGE",
2727
+ "DOCKER_REGISTRY": "europe-west6-docker.pkg.dev",
2736
2728
  "DOCKER_TLS_CERTDIR": "",
2737
2729
  "ENV_SHORT": "stage",
2738
2730
  "ENV_TYPE": "stage",
@@ -2807,6 +2799,7 @@ _ALL_ENV_VAR_KEYS: '["ENV_SHORT","APP_DIR","ENV_TYPE","BUILD_INFO_ID","BUILD_INF
2807
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",
2808
2800
  "gcloud beta run jobs delete pan-test-app-prod-api-send-reminders --project=google-project-id --region=europe-west6",
2809
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",
2810
2803
  "echo Disabling component in Dependency Track",
2811
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",
2812
2805
  "set -e",
@@ -2860,6 +2853,7 @@ _ALL_ENV_VAR_KEYS: '["ENV_SHORT","APP_DIR","ENV_TYPE","BUILD_INFO_ID","BUILD_INF
2860
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",
2861
2854
  "gcloud beta run jobs delete pan-test-app-stage-api-send-reminders --project=google-project-id --region=europe-west6",
2862
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",
2863
2857
  "echo Disabling component in Dependency Track",
2864
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",
2865
2859
  "set -e",
@@ -3110,12 +3104,20 @@ _ALL_ENV_VAR_KEYS: '["ENV_SHORT","APP_DIR","ENV_TYPE","BUILD_INFO_ID","BUILD_INF
3110
3104
  },
3111
3105
  "script": [
3112
3106
  "ensureNodeDockerfile",
3113
- "docker login --username gitlab-ci-token --password $CI_JOB_TOKEN $CI_REGISTRY",
3114
- "docker version",
3107
+ "echo -e "\\e[0Ksection_start:$(date +%s):docker-login[collapsed=true]\\r\\e[0KDocker Login"",
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",
3112
+ "echo -e "\\e[0Ksection_end:$(date +%s):docker-login\\r\\e[0K"",
3113
+ "echo -e "\\e[0Ksection_start:$(date +%s):docker-build[collapsed=true]\\r\\e[0KDocker build"",
3115
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",
3115
+ "echo -e "\\e[0Ksection_end:$(date +%s):docker-build\\r\\e[0K"",
3116
+ "echo -e "\\e[0Ksection_start:$(date +%s):docker-push[collapsed=true]\\r\\e[0KDocker push and tag"",
3116
3117
  "docker push $DOCKER_IMAGE:$DOCKER_IMAGE_TAG",
3117
3118
  "docker tag $DOCKER_IMAGE:$DOCKER_IMAGE_TAG $DOCKER_CACHE_IMAGE",
3118
3119
  "docker push $DOCKER_CACHE_IMAGE",
3120
+ "echo -e "\\e[0Ksection_end:$(date +%s):docker-push\\r\\e[0K"",
3119
3121
  ],
3120
3122
  "services": [
3121
3123
  {
@@ -3131,7 +3133,7 @@ _ALL_ENV_VAR_KEYS: '["ENV_SHORT","APP_DIR","ENV_TYPE","BUILD_INFO_ID","BUILD_INF
3131
3133
  "DOCKERFILE_ADDITIONS": undefined,
3132
3134
  "DOCKERFILE_ADDITIONS_END": undefined,
3133
3135
  "DOCKER_BUILDKIT": "1",
3134
- "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",
3135
3137
  "DOCKER_COPY_AND_INSTALL_APP": "COPY --chown=node:node $APP_DIR .
3136
3138
  RUN yarn plugin import workspace-tools
3137
3139
  RUN yarn workspaces focus --production && yarn rebuild",
@@ -3142,11 +3144,9 @@ COPY --chown=node:node .yarn /app/.yarn",
3142
3144
  "DOCKER_DIR": ".",
3143
3145
  "DOCKER_DRIVER": "overlay2",
3144
3146
  "DOCKER_HOST": "tcp://0.0.0.0:2375",
3145
- "DOCKER_IMAGE": "$DOCKER_REGISTRY_IMAGE_PATH/$DOCKER_IMAGE_NAME",
3146
- "DOCKER_IMAGE_NAME": "prod/www",
3147
+ "DOCKER_IMAGE": "europe-west6-docker.pkg.dev/google-project-id/catladder-deploy/pan-test-app/prod/www",
3147
3148
  "DOCKER_IMAGE_TAG": "$CI_COMMIT_SHA",
3148
- "DOCKER_REGISTRY": "$CI_REGISTRY",
3149
- "DOCKER_REGISTRY_IMAGE_PATH": "$CI_REGISTRY_IMAGE",
3149
+ "DOCKER_REGISTRY": "europe-west6-docker.pkg.dev",
3150
3150
  "DOCKER_TLS_CERTDIR": "",
3151
3151
  "KUBERNETES_CPU_LIMIT": "1",
3152
3152
  "KUBERNETES_CPU_REQUEST": "0.5",
@@ -3178,12 +3178,20 @@ COPY --chown=node:node .yarn /app/.yarn",
3178
3178
  },
3179
3179
  "script": [
3180
3180
  "ensureNodeDockerfile",
3181
- "docker login --username gitlab-ci-token --password $CI_JOB_TOKEN $CI_REGISTRY",
3182
- "docker version",
3181
+ "echo -e "\\e[0Ksection_start:$(date +%s):docker-login[collapsed=true]\\r\\e[0KDocker Login"",
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",
3186
+ "echo -e "\\e[0Ksection_end:$(date +%s):docker-login\\r\\e[0K"",
3187
+ "echo -e "\\e[0Ksection_start:$(date +%s):docker-build[collapsed=true]\\r\\e[0KDocker build"",
3183
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",
3189
+ "echo -e "\\e[0Ksection_end:$(date +%s):docker-build\\r\\e[0K"",
3190
+ "echo -e "\\e[0Ksection_start:$(date +%s):docker-push[collapsed=true]\\r\\e[0KDocker push and tag"",
3184
3191
  "docker push $DOCKER_IMAGE:$DOCKER_IMAGE_TAG",
3185
3192
  "docker tag $DOCKER_IMAGE:$DOCKER_IMAGE_TAG $DOCKER_CACHE_IMAGE",
3186
3193
  "docker push $DOCKER_CACHE_IMAGE",
3194
+ "echo -e "\\e[0Ksection_end:$(date +%s):docker-push\\r\\e[0K"",
3187
3195
  ],
3188
3196
  "services": [
3189
3197
  {
@@ -3199,7 +3207,7 @@ COPY --chown=node:node .yarn /app/.yarn",
3199
3207
  "DOCKERFILE_ADDITIONS": undefined,
3200
3208
  "DOCKERFILE_ADDITIONS_END": undefined,
3201
3209
  "DOCKER_BUILDKIT": "1",
3202
- "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",
3203
3211
  "DOCKER_COPY_AND_INSTALL_APP": "COPY --chown=node:node $APP_DIR .
3204
3212
  RUN yarn plugin import workspace-tools
3205
3213
  RUN yarn workspaces focus --production && yarn rebuild",
@@ -3210,11 +3218,9 @@ COPY --chown=node:node .yarn /app/.yarn",
3210
3218
  "DOCKER_DIR": ".",
3211
3219
  "DOCKER_DRIVER": "overlay2",
3212
3220
  "DOCKER_HOST": "tcp://0.0.0.0:2375",
3213
- "DOCKER_IMAGE": "$DOCKER_REGISTRY_IMAGE_PATH/$DOCKER_IMAGE_NAME",
3214
- "DOCKER_IMAGE_NAME": "stage/www",
3221
+ "DOCKER_IMAGE": "europe-west6-docker.pkg.dev/google-project-id/catladder-deploy/pan-test-app/stage/www",
3215
3222
  "DOCKER_IMAGE_TAG": "$CI_COMMIT_SHA",
3216
- "DOCKER_REGISTRY": "$CI_REGISTRY",
3217
- "DOCKER_REGISTRY_IMAGE_PATH": "$CI_REGISTRY_IMAGE",
3223
+ "DOCKER_REGISTRY": "europe-west6-docker.pkg.dev",
3218
3224
  "DOCKER_TLS_CERTDIR": "",
3219
3225
  "KUBERNETES_CPU_LIMIT": "1",
3220
3226
  "KUBERNETES_CPU_REQUEST": "0.5",
@@ -3271,13 +3277,6 @@ COPY --chown=node:node .yarn /app/.yarn",
3271
3277
  "export GCLOUD_PROJECT_NUMBER=$(gcloud projects describe google-project-id --format="value(projectNumber)")",
3272
3278
  "echo "GCLOUD_PROJECT_NUMBER: $GCLOUD_PROJECT_NUMBER"",
3273
3279
  "echo -e "\\e[0Ksection_end:$(date +%s):prepare\\r\\e[0K"",
3274
- "echo -e "\\e[0Ksection_start:$(date +%s):pushToArtifactRegistry[collapsed=true]\\r\\e[0KPushing image to artifacts registry"",
3275
- "docker login --username gitlab-ci-token --password $CI_JOB_TOKEN $CI_REGISTRY",
3276
- "gcloud auth configure-docker europe-west6-docker.pkg.dev",
3277
- "docker pull $DOCKER_IMAGE:$DOCKER_IMAGE_TAG",
3278
- "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",
3279
- "docker push europe-west6-docker.pkg.dev/google-project-id/catladder-deploy/pan-test-app/prod/www:$DOCKER_IMAGE_TAG",
3280
- "echo -e "\\e[0Ksection_end:$(date +%s):pushToArtifactRegistry\\r\\e[0K"",
3281
3280
  "echo -e "\\e[0Ksection_start:$(date +%s):deploy[collapsed=true]\\r\\e[0KDeploy to cloud run"",
3282
3281
  "echo "$ENV_VARS" > ____envvars.yaml",
3283
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",
@@ -3285,6 +3284,7 @@ COPY --chown=node:node .yarn /app/.yarn",
3285
3284
  "echo -e "\\e[0Ksection_start:$(date +%s):cleanup[collapsed=true]\\r\\e[0KCleanup"",
3286
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",
3287
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",
3288
3288
  "echo -e "\\e[0Ksection_end:$(date +%s):cleanup\\r\\e[0K"",
3289
3289
  "echo Uploading SBOM to Dependency Track",
3290
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",
@@ -3306,14 +3306,12 @@ COPY --chown=node:node .yarn /app/.yarn",
3306
3306
  "BUILD_INFO_ID": "some-id",
3307
3307
  "CLOUDSDK_CORE_DISABLE_PROMPTS": "1",
3308
3308
  "DOCKER_BUILDKIT": "1",
3309
- "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",
3310
3310
  "DOCKER_DRIVER": "overlay2",
3311
3311
  "DOCKER_HOST": "tcp://0.0.0.0:2375",
3312
- "DOCKER_IMAGE": "$DOCKER_REGISTRY_IMAGE_PATH/$DOCKER_IMAGE_NAME",
3313
- "DOCKER_IMAGE_NAME": "prod/www",
3312
+ "DOCKER_IMAGE": "europe-west6-docker.pkg.dev/google-project-id/catladder-deploy/pan-test-app/prod/www",
3314
3313
  "DOCKER_IMAGE_TAG": "$CI_COMMIT_SHA",
3315
- "DOCKER_REGISTRY": "$CI_REGISTRY",
3316
- "DOCKER_REGISTRY_IMAGE_PATH": "$CI_REGISTRY_IMAGE",
3314
+ "DOCKER_REGISTRY": "europe-west6-docker.pkg.dev",
3317
3315
  "DOCKER_TLS_CERTDIR": "",
3318
3316
  "ENV_SHORT": "prod",
3319
3317
  "ENV_TYPE": "prod",
@@ -3391,13 +3389,6 @@ _ALL_ENV_VAR_KEYS: '["ENV_SHORT","APP_DIR","ENV_TYPE","BUILD_INFO_ID","BUILD_INF
3391
3389
  "export GCLOUD_PROJECT_NUMBER=$(gcloud projects describe google-project-id --format="value(projectNumber)")",
3392
3390
  "echo "GCLOUD_PROJECT_NUMBER: $GCLOUD_PROJECT_NUMBER"",
3393
3391
  "echo -e "\\e[0Ksection_end:$(date +%s):prepare\\r\\e[0K"",
3394
- "echo -e "\\e[0Ksection_start:$(date +%s):pushToArtifactRegistry[collapsed=true]\\r\\e[0KPushing image to artifacts registry"",
3395
- "docker login --username gitlab-ci-token --password $CI_JOB_TOKEN $CI_REGISTRY",
3396
- "gcloud auth configure-docker europe-west6-docker.pkg.dev",
3397
- "docker pull $DOCKER_IMAGE:$DOCKER_IMAGE_TAG",
3398
- "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",
3399
- "docker push europe-west6-docker.pkg.dev/google-project-id/catladder-deploy/pan-test-app/stage/www:$DOCKER_IMAGE_TAG",
3400
- "echo -e "\\e[0Ksection_end:$(date +%s):pushToArtifactRegistry\\r\\e[0K"",
3401
3392
  "echo -e "\\e[0Ksection_start:$(date +%s):deploy[collapsed=true]\\r\\e[0KDeploy to cloud run"",
3402
3393
  "echo "$ENV_VARS" > ____envvars.yaml",
3403
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",
@@ -3405,6 +3396,7 @@ _ALL_ENV_VAR_KEYS: '["ENV_SHORT","APP_DIR","ENV_TYPE","BUILD_INFO_ID","BUILD_INF
3405
3396
  "echo -e "\\e[0Ksection_start:$(date +%s):cleanup[collapsed=true]\\r\\e[0KCleanup"",
3406
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",
3407
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",
3408
3400
  "echo -e "\\e[0Ksection_end:$(date +%s):cleanup\\r\\e[0K"",
3409
3401
  "echo Uploading SBOM to Dependency Track",
3410
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",
@@ -3426,14 +3418,12 @@ _ALL_ENV_VAR_KEYS: '["ENV_SHORT","APP_DIR","ENV_TYPE","BUILD_INFO_ID","BUILD_INF
3426
3418
  "BUILD_INFO_ID": "some-id",
3427
3419
  "CLOUDSDK_CORE_DISABLE_PROMPTS": "1",
3428
3420
  "DOCKER_BUILDKIT": "1",
3429
- "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",
3430
3422
  "DOCKER_DRIVER": "overlay2",
3431
3423
  "DOCKER_HOST": "tcp://0.0.0.0:2375",
3432
- "DOCKER_IMAGE": "$DOCKER_REGISTRY_IMAGE_PATH/$DOCKER_IMAGE_NAME",
3433
- "DOCKER_IMAGE_NAME": "stage/www",
3424
+ "DOCKER_IMAGE": "europe-west6-docker.pkg.dev/google-project-id/catladder-deploy/pan-test-app/stage/www",
3434
3425
  "DOCKER_IMAGE_TAG": "$CI_COMMIT_SHA",
3435
- "DOCKER_REGISTRY": "$CI_REGISTRY",
3436
- "DOCKER_REGISTRY_IMAGE_PATH": "$CI_REGISTRY_IMAGE",
3426
+ "DOCKER_REGISTRY": "europe-west6-docker.pkg.dev",
3437
3427
  "DOCKER_TLS_CERTDIR": "",
3438
3428
  "ENV_SHORT": "stage",
3439
3429
  "ENV_TYPE": "stage",
@@ -3496,6 +3486,7 @@ _ALL_ENV_VAR_KEYS: '["ENV_SHORT","APP_DIR","ENV_TYPE","BUILD_INFO_ID","BUILD_INF
3496
3486
  "gcloud auth activate-service-account --key-file="./____keyfile.json"",
3497
3487
  "gcloud run services delete pan-test-app-prod-www --project=google-project-id --region=europe-west6",
3498
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",
3499
3490
  "echo Disabling component in Dependency Track",
3500
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",
3501
3492
  "set -e",
@@ -3544,6 +3535,7 @@ _ALL_ENV_VAR_KEYS: '["ENV_SHORT","APP_DIR","ENV_TYPE","BUILD_INFO_ID","BUILD_INF
3544
3535
  "gcloud auth activate-service-account --key-file="./____keyfile.json"",
3545
3536
  "gcloud run services delete pan-test-app-stage-www --project=google-project-id --region=europe-west6",
3546
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",
3547
3539
  "echo Disabling component in Dependency Track",
3548
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",
3549
3541
  "set -e",