@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-no-cpu-throttling.ts.snap CHANGED
@@ -159,7 +159,10 @@ exports[`matches snapshot 1`] = `
159
159
  "script": [
160
160
  "ensureNodeDockerfile",
161
161
  "echo -e "\\e[0Ksection_start:$(date +%s):docker-login[collapsed=true]\\r\\e[0KDocker Login"",
162
- "docker login --username gitlab-ci-token --password $CI_JOB_TOKEN $CI_REGISTRY",
162
+ "echo $CL_dev_api_GCLOUD_DEPLOY_credentialsKey > ./____keyfile.json
163
+ ",
164
+ "gcloud auth activate-service-account --key-file="./____keyfile.json"",
165
+ "gcloud auth configure-docker europe-west6-docker.pkg.dev",
163
166
  "echo -e "\\e[0Ksection_end:$(date +%s):docker-login\\r\\e[0K"",
164
167
  "echo -e "\\e[0Ksection_start:$(date +%s):docker-build[collapsed=true]\\r\\e[0KDocker build"",
165
168
  "docker build --network host --cache-from $DOCKER_CACHE_IMAGE --tag $DOCKER_IMAGE:$DOCKER_IMAGE_TAG -f $APP_DIR/Dockerfile . --build-arg BUILDKIT_INLINE_CACHE=1",
@@ -184,7 +187,7 @@ exports[`matches snapshot 1`] = `
184
187
  "DOCKERFILE_ADDITIONS": undefined,
185
188
  "DOCKERFILE_ADDITIONS_END": undefined,
186
189
  "DOCKER_BUILDKIT": "1",
187
- "DOCKER_CACHE_IMAGE": "$DOCKER_REGISTRY_IMAGE_PATH/caches/api",
190
+ "DOCKER_CACHE_IMAGE": "europe-west6-docker.pkg.dev/google-project-id/catladder-deploy/pan-test-app/caches/api",
188
191
  "DOCKER_COPY_AND_INSTALL_APP": "COPY --chown=node:node $APP_DIR .
189
192
  RUN yarn plugin import workspace-tools
190
193
  RUN yarn workspaces focus --production && yarn rebuild",
@@ -195,11 +198,9 @@ COPY --chown=node:node .yarn /app/.yarn",
195
198
  "DOCKER_DIR": ".",
196
199
  "DOCKER_DRIVER": "overlay2",
197
200
  "DOCKER_HOST": "tcp://0.0.0.0:2375",
198
- "DOCKER_IMAGE": "$DOCKER_REGISTRY_IMAGE_PATH/$DOCKER_IMAGE_NAME",
199
- "DOCKER_IMAGE_NAME": "dev/api",
201
+ "DOCKER_IMAGE": "europe-west6-docker.pkg.dev/google-project-id/catladder-deploy/pan-test-app/dev/api",
200
202
  "DOCKER_IMAGE_TAG": "$CI_COMMIT_SHA",
201
- "DOCKER_REGISTRY": "$CI_REGISTRY",
202
- "DOCKER_REGISTRY_IMAGE_PATH": "$CI_REGISTRY_IMAGE",
203
+ "DOCKER_REGISTRY": "europe-west6-docker.pkg.dev",
203
204
  "DOCKER_TLS_CERTDIR": "",
204
205
  "KUBERNETES_CPU_LIMIT": "1",
205
206
  "KUBERNETES_CPU_REQUEST": "0.5",
@@ -268,13 +269,6 @@ COPY --chown=node:node .yarn /app/.yarn",
268
269
  "export GCLOUD_PROJECT_NUMBER=$(gcloud projects describe google-project-id --format="value(projectNumber)")",
269
270
  "echo "GCLOUD_PROJECT_NUMBER: $GCLOUD_PROJECT_NUMBER"",
270
271
  "echo -e "\\e[0Ksection_end:$(date +%s):prepare\\r\\e[0K"",
271
- "echo -e "\\e[0Ksection_start:$(date +%s):pushToArtifactRegistry[collapsed=true]\\r\\e[0KPushing image to artifacts registry"",
272
- "docker login --username gitlab-ci-token --password $CI_JOB_TOKEN $CI_REGISTRY",
273
- "gcloud auth configure-docker europe-west6-docker.pkg.dev",
274
- "docker pull $DOCKER_IMAGE:$DOCKER_IMAGE_TAG",
275
- "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",
276
- "docker push europe-west6-docker.pkg.dev/google-project-id/catladder-deploy/pan-test-app/dev/api:$DOCKER_IMAGE_TAG",
277
- "echo -e "\\e[0Ksection_end:$(date +%s):pushToArtifactRegistry\\r\\e[0K"",
278
272
  "echo -e "\\e[0Ksection_start:$(date +%s):deploy[collapsed=true]\\r\\e[0KDeploy to cloud run"",
279
273
  "echo "$ENV_VARS" > ____envvars.yaml",
280
274
  "gcloud run deploy pan-test-app-dev-api --command="yarn,start" --image=europe-west6-docker.pkg.dev/google-project-id/catladder-deploy/pan-test-app/dev/api:$DOCKER_IMAGE_TAG --project=google-project-id --region=europe-west6 --labels=customer-name=pan,component-name=api,app-name=test-app,env-type=dev,env-name=dev,build-type=node --env-vars-file=____envvars.yaml --min-instances=1 --max-instances=100 --no-cpu-throttling --allow-unauthenticated --ingress=all --cpu-boost",
@@ -282,6 +276,7 @@ COPY --chown=node:node .yarn /app/.yarn",
282
276
  "echo -e "\\e[0Ksection_start:$(date +%s):cleanup[collapsed=true]\\r\\e[0KCleanup"",
283
277
  "gcloud run revisions list --project=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",
284
278
  "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",
279
+ "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",
285
280
  "echo -e "\\e[0Ksection_end:$(date +%s):cleanup\\r\\e[0K"",
286
281
  "echo Uploading SBOM to Dependency Track",
287
282
  "/dtrackuploader https://dep.panter.swiss/ "$DT_KEY_PROD" upload "pan-test-app/api" "https://pan-test-app-dev-api-unknown-host.example.com" "__sbom.json" vex.json || true",
@@ -302,14 +297,12 @@ COPY --chown=node:node .yarn /app/.yarn",
302
297
  "BUILD_INFO_ID": "some-id",
303
298
  "CLOUDSDK_CORE_DISABLE_PROMPTS": "1",
304
299
  "DOCKER_BUILDKIT": "1",
305
- "DOCKER_CACHE_IMAGE": "$DOCKER_REGISTRY_IMAGE_PATH/caches/api",
300
+ "DOCKER_CACHE_IMAGE": "europe-west6-docker.pkg.dev/google-project-id/catladder-deploy/pan-test-app/caches/api",
306
301
  "DOCKER_DRIVER": "overlay2",
307
302
  "DOCKER_HOST": "tcp://0.0.0.0:2375",
308
- "DOCKER_IMAGE": "$DOCKER_REGISTRY_IMAGE_PATH/$DOCKER_IMAGE_NAME",
309
- "DOCKER_IMAGE_NAME": "dev/api",
303
+ "DOCKER_IMAGE": "europe-west6-docker.pkg.dev/google-project-id/catladder-deploy/pan-test-app/dev/api",
310
304
  "DOCKER_IMAGE_TAG": "$CI_COMMIT_SHA",
311
- "DOCKER_REGISTRY": "$CI_REGISTRY",
312
- "DOCKER_REGISTRY_IMAGE_PATH": "$CI_REGISTRY_IMAGE",
305
+ "DOCKER_REGISTRY": "europe-west6-docker.pkg.dev",
313
306
  "DOCKER_TLS_CERTDIR": "",
314
307
  "ENV_SHORT": "dev",
315
308
  "ENV_TYPE": "dev",
@@ -371,6 +364,7 @@ _ALL_ENV_VAR_KEYS: '["ENV_SHORT","APP_DIR","ENV_TYPE","BUILD_INFO_ID","BUILD_INF
371
364
  "gcloud auth activate-service-account --key-file="./____keyfile.json"",
372
365
  "gcloud run services delete pan-test-app-dev-api --project=google-project-id --region=europe-west6",
373
366
  "gcloud artifacts docker images delete europe-west6-docker.pkg.dev/google-project-id/catladder-deploy/pan-test-app/dev/api --quiet --delete-tags",
367
+ "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",
374
368
  "echo Disabling component in Dependency Track",
375
369
  "/dtrackuploader https://dep.panter.swiss/ "$DT_KEY_PROD" disable "pan-test-app/api" "https://pan-test-app-dev-api-unknown-host.example.com" || true",
376
370
  "set -e",
@@ -707,7 +701,10 @@ _ALL_ENV_VAR_KEYS: '["ENV_SHORT","APP_DIR","ENV_TYPE","BUILD_INFO_ID","BUILD_INF
707
701
  "script": [
708
702
  "ensureNodeDockerfile",
709
703
  "echo -e "\\e[0Ksection_start:$(date +%s):docker-login[collapsed=true]\\r\\e[0KDocker Login"",
710
- "docker login --username gitlab-ci-token --password $CI_JOB_TOKEN $CI_REGISTRY",
704
+ "echo $CL_review_api_GCLOUD_DEPLOY_credentialsKey > ./____keyfile.json
705
+ ",
706
+ "gcloud auth activate-service-account --key-file="./____keyfile.json"",
707
+ "gcloud auth configure-docker europe-west6-docker.pkg.dev",
711
708
  "echo -e "\\e[0Ksection_end:$(date +%s):docker-login\\r\\e[0K"",
712
709
  "echo -e "\\e[0Ksection_start:$(date +%s):docker-build[collapsed=true]\\r\\e[0KDocker build"",
713
710
  "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",
@@ -732,7 +729,7 @@ _ALL_ENV_VAR_KEYS: '["ENV_SHORT","APP_DIR","ENV_TYPE","BUILD_INFO_ID","BUILD_INF
732
729
  "DOCKERFILE_ADDITIONS": undefined,
733
730
  "DOCKERFILE_ADDITIONS_END": undefined,
734
731
  "DOCKER_BUILDKIT": "1",
735
- "DOCKER_CACHE_IMAGE": "$DOCKER_REGISTRY_IMAGE_PATH/caches/api",
732
+ "DOCKER_CACHE_IMAGE": "europe-west6-docker.pkg.dev/google-project-id/catladder-deploy/pan-test-app/caches/api",
736
733
  "DOCKER_COPY_AND_INSTALL_APP": "COPY --chown=node:node $APP_DIR .
737
734
  RUN yarn plugin import workspace-tools
738
735
  RUN yarn workspaces focus --production && yarn rebuild",
@@ -743,11 +740,9 @@ COPY --chown=node:node .yarn /app/.yarn",
743
740
  "DOCKER_DIR": ".",
744
741
  "DOCKER_DRIVER": "overlay2",
745
742
  "DOCKER_HOST": "tcp://0.0.0.0:2375",
746
- "DOCKER_IMAGE": "$DOCKER_REGISTRY_IMAGE_PATH/$DOCKER_IMAGE_NAME",
747
- "DOCKER_IMAGE_NAME": "review/api",
743
+ "DOCKER_IMAGE": "europe-west6-docker.pkg.dev/google-project-id/catladder-deploy/pan-test-app/review/api/mr1234",
748
744
  "DOCKER_IMAGE_TAG": "$CI_COMMIT_SHA",
749
- "DOCKER_REGISTRY": "$CI_REGISTRY",
750
- "DOCKER_REGISTRY_IMAGE_PATH": "$CI_REGISTRY_IMAGE",
745
+ "DOCKER_REGISTRY": "europe-west6-docker.pkg.dev",
751
746
  "DOCKER_TLS_CERTDIR": "",
752
747
  "KUBERNETES_CPU_LIMIT": "1",
753
748
  "KUBERNETES_CPU_REQUEST": "0.5",
@@ -816,13 +811,6 @@ COPY --chown=node:node .yarn /app/.yarn",
816
811
  "export GCLOUD_PROJECT_NUMBER=$(gcloud projects describe google-project-id --format="value(projectNumber)")",
817
812
  "echo "GCLOUD_PROJECT_NUMBER: $GCLOUD_PROJECT_NUMBER"",
818
813
  "echo -e "\\e[0Ksection_end:$(date +%s):prepare\\r\\e[0K"",
819
- "echo -e "\\e[0Ksection_start:$(date +%s):pushToArtifactRegistry[collapsed=true]\\r\\e[0KPushing image to artifacts registry"",
820
- "docker login --username gitlab-ci-token --password $CI_JOB_TOKEN $CI_REGISTRY",
821
- "gcloud auth configure-docker europe-west6-docker.pkg.dev",
822
- "docker pull $DOCKER_IMAGE:$DOCKER_IMAGE_TAG",
823
- "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",
824
- "docker push europe-west6-docker.pkg.dev/google-project-id/catladder-deploy/pan-test-app/review/api/mr1234:$DOCKER_IMAGE_TAG",
825
- "echo -e "\\e[0Ksection_end:$(date +%s):pushToArtifactRegistry\\r\\e[0K"",
826
814
  "echo -e "\\e[0Ksection_start:$(date +%s):deploy[collapsed=true]\\r\\e[0KDeploy to cloud run"",
827
815
  "echo "$ENV_VARS" > ____envvars.yaml",
828
816
  "gcloud run deploy pan-test-app-review-mr1234-api --command="yarn,start" --image=europe-west6-docker.pkg.dev/google-project-id/catladder-deploy/pan-test-app/review/api/mr1234:$DOCKER_IMAGE_TAG --project=google-project-id --region=europe-west6 --labels=customer-name=pan,component-name=api,app-name=test-app,env-type=review,env-name=review,build-type=node --env-vars-file=____envvars.yaml --min-instances=1 --max-instances=100 --no-cpu-throttling --allow-unauthenticated --ingress=all --cpu-boost",
@@ -830,6 +818,7 @@ COPY --chown=node:node .yarn /app/.yarn",
830
818
  "echo -e "\\e[0Ksection_start:$(date +%s):cleanup[collapsed=true]\\r\\e[0KCleanup"",
831
819
  "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",
832
820
  "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",
821
+ "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",
833
822
  "set +e",
834
823
  "gcloud artifacts docker images delete europe-west6-docker.pkg.dev/google-project-id/catladder-deploy/pan-test-app/review/api --quiet --delete-tags",
835
824
  "set -e",
@@ -853,14 +842,12 @@ COPY --chown=node:node .yarn /app/.yarn",
853
842
  "BUILD_INFO_ID": "some-id",
854
843
  "CLOUDSDK_CORE_DISABLE_PROMPTS": "1",
855
844
  "DOCKER_BUILDKIT": "1",
856
- "DOCKER_CACHE_IMAGE": "$DOCKER_REGISTRY_IMAGE_PATH/caches/api",
845
+ "DOCKER_CACHE_IMAGE": "europe-west6-docker.pkg.dev/google-project-id/catladder-deploy/pan-test-app/caches/api",
857
846
  "DOCKER_DRIVER": "overlay2",
858
847
  "DOCKER_HOST": "tcp://0.0.0.0:2375",
859
- "DOCKER_IMAGE": "$DOCKER_REGISTRY_IMAGE_PATH/$DOCKER_IMAGE_NAME",
860
- "DOCKER_IMAGE_NAME": "review/api",
848
+ "DOCKER_IMAGE": "europe-west6-docker.pkg.dev/google-project-id/catladder-deploy/pan-test-app/review/api/mr1234",
861
849
  "DOCKER_IMAGE_TAG": "$CI_COMMIT_SHA",
862
- "DOCKER_REGISTRY": "$CI_REGISTRY",
863
- "DOCKER_REGISTRY_IMAGE_PATH": "$CI_REGISTRY_IMAGE",
850
+ "DOCKER_REGISTRY": "europe-west6-docker.pkg.dev",
864
851
  "DOCKER_TLS_CERTDIR": "",
865
852
  "ENV_SHORT": "review",
866
853
  "ENV_TYPE": "review",
@@ -922,6 +909,7 @@ _ALL_ENV_VAR_KEYS: '["ENV_SHORT","APP_DIR","ENV_TYPE","BUILD_INFO_ID","BUILD_INF
922
909
  "gcloud auth activate-service-account --key-file="./____keyfile.json"",
923
910
  "gcloud run services delete pan-test-app-review-mr1234-api --project=google-project-id --region=europe-west6",
924
911
  "gcloud artifacts docker images delete europe-west6-docker.pkg.dev/google-project-id/catladder-deploy/pan-test-app/review/api/mr1234 --quiet --delete-tags",
912
+ "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",
925
913
  "set +e",
926
914
  "gcloud artifacts docker images delete europe-west6-docker.pkg.dev/google-project-id/catladder-deploy/pan-test-app/review/api --quiet --delete-tags",
927
915
  "set -e",
@@ -1296,7 +1284,10 @@ _ALL_ENV_VAR_KEYS: '["ENV_SHORT","APP_DIR","ENV_TYPE","BUILD_INFO_ID","BUILD_INF
1296
1284
  "script": [
1297
1285
  "ensureNodeDockerfile",
1298
1286
  "echo -e "\\e[0Ksection_start:$(date +%s):docker-login[collapsed=true]\\r\\e[0KDocker Login"",
1299
- "docker login --username gitlab-ci-token --password $CI_JOB_TOKEN $CI_REGISTRY",
1287
+ "echo $CL_prod_api_GCLOUD_DEPLOY_credentialsKey > ./____keyfile.json
1288
+ ",
1289
+ "gcloud auth activate-service-account --key-file="./____keyfile.json"",
1290
+ "gcloud auth configure-docker europe-west6-docker.pkg.dev",
1300
1291
  "echo -e "\\e[0Ksection_end:$(date +%s):docker-login\\r\\e[0K"",
1301
1292
  "echo -e "\\e[0Ksection_start:$(date +%s):docker-build[collapsed=true]\\r\\e[0KDocker build"",
1302
1293
  "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",
@@ -1321,7 +1312,7 @@ _ALL_ENV_VAR_KEYS: '["ENV_SHORT","APP_DIR","ENV_TYPE","BUILD_INFO_ID","BUILD_INF
1321
1312
  "DOCKERFILE_ADDITIONS": undefined,
1322
1313
  "DOCKERFILE_ADDITIONS_END": undefined,
1323
1314
  "DOCKER_BUILDKIT": "1",
1324
- "DOCKER_CACHE_IMAGE": "$DOCKER_REGISTRY_IMAGE_PATH/caches/api",
1315
+ "DOCKER_CACHE_IMAGE": "europe-west6-docker.pkg.dev/google-project-id/catladder-deploy/pan-test-app/caches/api",
1325
1316
  "DOCKER_COPY_AND_INSTALL_APP": "COPY --chown=node:node $APP_DIR .
1326
1317
  RUN yarn plugin import workspace-tools
1327
1318
  RUN yarn workspaces focus --production && yarn rebuild",
@@ -1332,11 +1323,9 @@ COPY --chown=node:node .yarn /app/.yarn",
1332
1323
  "DOCKER_DIR": ".",
1333
1324
  "DOCKER_DRIVER": "overlay2",
1334
1325
  "DOCKER_HOST": "tcp://0.0.0.0:2375",
1335
- "DOCKER_IMAGE": "$DOCKER_REGISTRY_IMAGE_PATH/$DOCKER_IMAGE_NAME",
1336
- "DOCKER_IMAGE_NAME": "prod/api",
1326
+ "DOCKER_IMAGE": "europe-west6-docker.pkg.dev/google-project-id/catladder-deploy/pan-test-app/prod/api",
1337
1327
  "DOCKER_IMAGE_TAG": "$CI_COMMIT_SHA",
1338
- "DOCKER_REGISTRY": "$CI_REGISTRY",
1339
- "DOCKER_REGISTRY_IMAGE_PATH": "$CI_REGISTRY_IMAGE",
1328
+ "DOCKER_REGISTRY": "europe-west6-docker.pkg.dev",
1340
1329
  "DOCKER_TLS_CERTDIR": "",
1341
1330
  "KUBERNETES_CPU_LIMIT": "1",
1342
1331
  "KUBERNETES_CPU_REQUEST": "0.5",
@@ -1369,7 +1358,10 @@ COPY --chown=node:node .yarn /app/.yarn",
1369
1358
  "script": [
1370
1359
  "ensureNodeDockerfile",
1371
1360
  "echo -e "\\e[0Ksection_start:$(date +%s):docker-login[collapsed=true]\\r\\e[0KDocker Login"",
1372
- "docker login --username gitlab-ci-token --password $CI_JOB_TOKEN $CI_REGISTRY",
1361
+ "echo $CL_stage_api_GCLOUD_DEPLOY_credentialsKey > ./____keyfile.json
1362
+ ",
1363
+ "gcloud auth activate-service-account --key-file="./____keyfile.json"",
1364
+ "gcloud auth configure-docker europe-west6-docker.pkg.dev",
1373
1365
  "echo -e "\\e[0Ksection_end:$(date +%s):docker-login\\r\\e[0K"",
1374
1366
  "echo -e "\\e[0Ksection_start:$(date +%s):docker-build[collapsed=true]\\r\\e[0KDocker build"",
1375
1367
  "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",
@@ -1394,7 +1386,7 @@ COPY --chown=node:node .yarn /app/.yarn",
1394
1386
  "DOCKERFILE_ADDITIONS": undefined,
1395
1387
  "DOCKERFILE_ADDITIONS_END": undefined,
1396
1388
  "DOCKER_BUILDKIT": "1",
1397
- "DOCKER_CACHE_IMAGE": "$DOCKER_REGISTRY_IMAGE_PATH/caches/api",
1389
+ "DOCKER_CACHE_IMAGE": "europe-west6-docker.pkg.dev/google-project-id/catladder-deploy/pan-test-app/caches/api",
1398
1390
  "DOCKER_COPY_AND_INSTALL_APP": "COPY --chown=node:node $APP_DIR .
1399
1391
  RUN yarn plugin import workspace-tools
1400
1392
  RUN yarn workspaces focus --production && yarn rebuild",
@@ -1405,11 +1397,9 @@ COPY --chown=node:node .yarn /app/.yarn",
1405
1397
  "DOCKER_DIR": ".",
1406
1398
  "DOCKER_DRIVER": "overlay2",
1407
1399
  "DOCKER_HOST": "tcp://0.0.0.0:2375",
1408
- "DOCKER_IMAGE": "$DOCKER_REGISTRY_IMAGE_PATH/$DOCKER_IMAGE_NAME",
1409
- "DOCKER_IMAGE_NAME": "stage/api",
1400
+ "DOCKER_IMAGE": "europe-west6-docker.pkg.dev/google-project-id/catladder-deploy/pan-test-app/stage/api",
1410
1401
  "DOCKER_IMAGE_TAG": "$CI_COMMIT_SHA",
1411
- "DOCKER_REGISTRY": "$CI_REGISTRY",
1412
- "DOCKER_REGISTRY_IMAGE_PATH": "$CI_REGISTRY_IMAGE",
1402
+ "DOCKER_REGISTRY": "europe-west6-docker.pkg.dev",
1413
1403
  "DOCKER_TLS_CERTDIR": "",
1414
1404
  "KUBERNETES_CPU_LIMIT": "1",
1415
1405
  "KUBERNETES_CPU_REQUEST": "0.5",
@@ -1466,13 +1456,6 @@ COPY --chown=node:node .yarn /app/.yarn",
1466
1456
  "export GCLOUD_PROJECT_NUMBER=$(gcloud projects describe google-project-id --format="value(projectNumber)")",
1467
1457
  "echo "GCLOUD_PROJECT_NUMBER: $GCLOUD_PROJECT_NUMBER"",
1468
1458
  "echo -e "\\e[0Ksection_end:$(date +%s):prepare\\r\\e[0K"",
1469
- "echo -e "\\e[0Ksection_start:$(date +%s):pushToArtifactRegistry[collapsed=true]\\r\\e[0KPushing image to artifacts registry"",
1470
- "docker login --username gitlab-ci-token --password $CI_JOB_TOKEN $CI_REGISTRY",
1471
- "gcloud auth configure-docker europe-west6-docker.pkg.dev",
1472
- "docker pull $DOCKER_IMAGE:$DOCKER_IMAGE_TAG",
1473
- "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",
1474
- "docker push europe-west6-docker.pkg.dev/google-project-id/catladder-deploy/pan-test-app/prod/api:$DOCKER_IMAGE_TAG",
1475
- "echo -e "\\e[0Ksection_end:$(date +%s):pushToArtifactRegistry\\r\\e[0K"",
1476
1459
  "echo -e "\\e[0Ksection_start:$(date +%s):deploy[collapsed=true]\\r\\e[0KDeploy to cloud run"",
1477
1460
  "echo "$ENV_VARS" > ____envvars.yaml",
1478
1461
  "gcloud run deploy pan-test-app-prod-api --command="yarn,start" --image=europe-west6-docker.pkg.dev/google-project-id/catladder-deploy/pan-test-app/prod/api:$DOCKER_IMAGE_TAG --project=google-project-id --region=europe-west6 --labels=customer-name=pan,component-name=api,app-name=test-app,env-type=prod,env-name=prod,build-type=node --env-vars-file=____envvars.yaml --min-instances=1 --max-instances=100 --no-cpu-throttling --allow-unauthenticated --ingress=all --cpu-boost",
@@ -1480,6 +1463,7 @@ COPY --chown=node:node .yarn /app/.yarn",
1480
1463
  "echo -e "\\e[0Ksection_start:$(date +%s):cleanup[collapsed=true]\\r\\e[0KCleanup"",
1481
1464
  "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",
1482
1465
  "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",
1466
+ "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",
1483
1467
  "echo -e "\\e[0Ksection_end:$(date +%s):cleanup\\r\\e[0K"",
1484
1468
  "echo Uploading SBOM to Dependency Track",
1485
1469
  "/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",
@@ -1500,14 +1484,12 @@ COPY --chown=node:node .yarn /app/.yarn",
1500
1484
  "BUILD_INFO_ID": "some-id",
1501
1485
  "CLOUDSDK_CORE_DISABLE_PROMPTS": "1",
1502
1486
  "DOCKER_BUILDKIT": "1",
1503
- "DOCKER_CACHE_IMAGE": "$DOCKER_REGISTRY_IMAGE_PATH/caches/api",
1487
+ "DOCKER_CACHE_IMAGE": "europe-west6-docker.pkg.dev/google-project-id/catladder-deploy/pan-test-app/caches/api",
1504
1488
  "DOCKER_DRIVER": "overlay2",
1505
1489
  "DOCKER_HOST": "tcp://0.0.0.0:2375",
1506
- "DOCKER_IMAGE": "$DOCKER_REGISTRY_IMAGE_PATH/$DOCKER_IMAGE_NAME",
1507
- "DOCKER_IMAGE_NAME": "prod/api",
1490
+ "DOCKER_IMAGE": "europe-west6-docker.pkg.dev/google-project-id/catladder-deploy/pan-test-app/prod/api",
1508
1491
  "DOCKER_IMAGE_TAG": "$CI_COMMIT_SHA",
1509
- "DOCKER_REGISTRY": "$CI_REGISTRY",
1510
- "DOCKER_REGISTRY_IMAGE_PATH": "$CI_REGISTRY_IMAGE",
1492
+ "DOCKER_REGISTRY": "europe-west6-docker.pkg.dev",
1511
1493
  "DOCKER_TLS_CERTDIR": "",
1512
1494
  "ENV_SHORT": "prod",
1513
1495
  "ENV_TYPE": "prod",
@@ -1584,13 +1566,6 @@ _ALL_ENV_VAR_KEYS: '["ENV_SHORT","APP_DIR","ENV_TYPE","BUILD_INFO_ID","BUILD_INF
1584
1566
  "export GCLOUD_PROJECT_NUMBER=$(gcloud projects describe google-project-id --format="value(projectNumber)")",
1585
1567
  "echo "GCLOUD_PROJECT_NUMBER: $GCLOUD_PROJECT_NUMBER"",
1586
1568
  "echo -e "\\e[0Ksection_end:$(date +%s):prepare\\r\\e[0K"",
1587
- "echo -e "\\e[0Ksection_start:$(date +%s):pushToArtifactRegistry[collapsed=true]\\r\\e[0KPushing image to artifacts registry"",
1588
- "docker login --username gitlab-ci-token --password $CI_JOB_TOKEN $CI_REGISTRY",
1589
- "gcloud auth configure-docker europe-west6-docker.pkg.dev",
1590
- "docker pull $DOCKER_IMAGE:$DOCKER_IMAGE_TAG",
1591
- "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",
1592
- "docker push europe-west6-docker.pkg.dev/google-project-id/catladder-deploy/pan-test-app/stage/api:$DOCKER_IMAGE_TAG",
1593
- "echo -e "\\e[0Ksection_end:$(date +%s):pushToArtifactRegistry\\r\\e[0K"",
1594
1569
  "echo -e "\\e[0Ksection_start:$(date +%s):deploy[collapsed=true]\\r\\e[0KDeploy to cloud run"",
1595
1570
  "echo "$ENV_VARS" > ____envvars.yaml",
1596
1571
  "gcloud run deploy pan-test-app-stage-api --command="yarn,start" --image=europe-west6-docker.pkg.dev/google-project-id/catladder-deploy/pan-test-app/stage/api:$DOCKER_IMAGE_TAG --project=google-project-id --region=europe-west6 --labels=customer-name=pan,component-name=api,app-name=test-app,env-type=stage,env-name=stage,build-type=node --env-vars-file=____envvars.yaml --min-instances=1 --max-instances=100 --no-cpu-throttling --allow-unauthenticated --ingress=all --cpu-boost",
@@ -1598,6 +1573,7 @@ _ALL_ENV_VAR_KEYS: '["ENV_SHORT","APP_DIR","ENV_TYPE","BUILD_INFO_ID","BUILD_INF
1598
1573
  "echo -e "\\e[0Ksection_start:$(date +%s):cleanup[collapsed=true]\\r\\e[0KCleanup"",
1599
1574
  "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",
1600
1575
  "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",
1576
+ "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",
1601
1577
  "echo -e "\\e[0Ksection_end:$(date +%s):cleanup\\r\\e[0K"",
1602
1578
  "echo Uploading SBOM to Dependency Track",
1603
1579
  "/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",
@@ -1618,14 +1594,12 @@ _ALL_ENV_VAR_KEYS: '["ENV_SHORT","APP_DIR","ENV_TYPE","BUILD_INFO_ID","BUILD_INF
1618
1594
  "BUILD_INFO_ID": "some-id",
1619
1595
  "CLOUDSDK_CORE_DISABLE_PROMPTS": "1",
1620
1596
  "DOCKER_BUILDKIT": "1",
1621
- "DOCKER_CACHE_IMAGE": "$DOCKER_REGISTRY_IMAGE_PATH/caches/api",
1597
+ "DOCKER_CACHE_IMAGE": "europe-west6-docker.pkg.dev/google-project-id/catladder-deploy/pan-test-app/caches/api",
1622
1598
  "DOCKER_DRIVER": "overlay2",
1623
1599
  "DOCKER_HOST": "tcp://0.0.0.0:2375",
1624
- "DOCKER_IMAGE": "$DOCKER_REGISTRY_IMAGE_PATH/$DOCKER_IMAGE_NAME",
1625
- "DOCKER_IMAGE_NAME": "stage/api",
1600
+ "DOCKER_IMAGE": "europe-west6-docker.pkg.dev/google-project-id/catladder-deploy/pan-test-app/stage/api",
1626
1601
  "DOCKER_IMAGE_TAG": "$CI_COMMIT_SHA",
1627
- "DOCKER_REGISTRY": "$CI_REGISTRY",
1628
- "DOCKER_REGISTRY_IMAGE_PATH": "$CI_REGISTRY_IMAGE",
1602
+ "DOCKER_REGISTRY": "europe-west6-docker.pkg.dev",
1629
1603
  "DOCKER_TLS_CERTDIR": "",
1630
1604
  "ENV_SHORT": "stage",
1631
1605
  "ENV_TYPE": "stage",
@@ -1687,6 +1661,7 @@ _ALL_ENV_VAR_KEYS: '["ENV_SHORT","APP_DIR","ENV_TYPE","BUILD_INFO_ID","BUILD_INF
1687
1661
  "gcloud auth activate-service-account --key-file="./____keyfile.json"",
1688
1662
  "gcloud run services delete pan-test-app-prod-api --project=google-project-id --region=europe-west6",
1689
1663
  "gcloud artifacts docker images delete europe-west6-docker.pkg.dev/google-project-id/catladder-deploy/pan-test-app/prod/api --quiet --delete-tags",
1664
+ "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",
1690
1665
  "echo Disabling component in Dependency Track",
1691
1666
  "/dtrackuploader https://dep.panter.swiss/ "$DT_KEY_PROD" disable "pan-test-app/api" "https://pan-test-app-prod-api-unknown-host.example.com" || true",
1692
1667
  "set -e",
@@ -1735,6 +1710,7 @@ _ALL_ENV_VAR_KEYS: '["ENV_SHORT","APP_DIR","ENV_TYPE","BUILD_INFO_ID","BUILD_INF
1735
1710
  "gcloud auth activate-service-account --key-file="./____keyfile.json"",
1736
1711
  "gcloud run services delete pan-test-app-stage-api --project=google-project-id --region=europe-west6",
1737
1712
  "gcloud artifacts docker images delete europe-west6-docker.pkg.dev/google-project-id/catladder-deploy/pan-test-app/stage/api --quiet --delete-tags",
1713
+ "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",
1738
1714
  "echo Disabling component in Dependency Track",
1739
1715
  "/dtrackuploader https://dep.panter.swiss/ "$DT_KEY_PROD" disable "pan-test-app/api" "https://pan-test-app-stage-api-unknown-host.example.com" || true",
1740
1716
  "set -e",