@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-no-cpu-throttling.ts.snap CHANGED
@@ -158,12 +158,20 @@ exports[`matches snapshot 1`] = `
158
158
  },
159
159
  "script": [
160
160
  "ensureNodeDockerfile",
161
- "docker login --username gitlab-ci-token --password $CI_JOB_TOKEN $CI_REGISTRY",
162
- "docker version",
161
+ "echo -e "\\e[0Ksection_start:$(date +%s):docker-login[collapsed=true]\\r\\e[0KDocker Login"",
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",
166
+ "echo -e "\\e[0Ksection_end:$(date +%s):docker-login\\r\\e[0K"",
167
+ "echo -e "\\e[0Ksection_start:$(date +%s):docker-build[collapsed=true]\\r\\e[0KDocker build"",
163
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",
169
+ "echo -e "\\e[0Ksection_end:$(date +%s):docker-build\\r\\e[0K"",
170
+ "echo -e "\\e[0Ksection_start:$(date +%s):docker-push[collapsed=true]\\r\\e[0KDocker push and tag"",
164
171
  "docker push $DOCKER_IMAGE:$DOCKER_IMAGE_TAG",
165
172
  "docker tag $DOCKER_IMAGE:$DOCKER_IMAGE_TAG $DOCKER_CACHE_IMAGE",
166
173
  "docker push $DOCKER_CACHE_IMAGE",
174
+ "echo -e "\\e[0Ksection_end:$(date +%s):docker-push\\r\\e[0K"",
167
175
  ],
168
176
  "services": [
169
177
  {
@@ -179,7 +187,7 @@ exports[`matches snapshot 1`] = `
179
187
  "DOCKERFILE_ADDITIONS": undefined,
180
188
  "DOCKERFILE_ADDITIONS_END": undefined,
181
189
  "DOCKER_BUILDKIT": "1",
182
- "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",
183
191
  "DOCKER_COPY_AND_INSTALL_APP": "COPY --chown=node:node $APP_DIR .
184
192
  RUN yarn plugin import workspace-tools
185
193
  RUN yarn workspaces focus --production && yarn rebuild",
@@ -190,11 +198,9 @@ COPY --chown=node:node .yarn /app/.yarn",
190
198
  "DOCKER_DIR": ".",
191
199
  "DOCKER_DRIVER": "overlay2",
192
200
  "DOCKER_HOST": "tcp://0.0.0.0:2375",
193
- "DOCKER_IMAGE": "$DOCKER_REGISTRY_IMAGE_PATH/$DOCKER_IMAGE_NAME",
194
- "DOCKER_IMAGE_NAME": "dev/api",
201
+ "DOCKER_IMAGE": "europe-west6-docker.pkg.dev/google-project-id/catladder-deploy/pan-test-app/dev/api",
195
202
  "DOCKER_IMAGE_TAG": "$CI_COMMIT_SHA",
196
- "DOCKER_REGISTRY": "$CI_REGISTRY",
197
- "DOCKER_REGISTRY_IMAGE_PATH": "$CI_REGISTRY_IMAGE",
203
+ "DOCKER_REGISTRY": "europe-west6-docker.pkg.dev",
198
204
  "DOCKER_TLS_CERTDIR": "",
199
205
  "KUBERNETES_CPU_LIMIT": "1",
200
206
  "KUBERNETES_CPU_REQUEST": "0.5",
@@ -263,13 +269,6 @@ COPY --chown=node:node .yarn /app/.yarn",
263
269
  "export GCLOUD_PROJECT_NUMBER=$(gcloud projects describe google-project-id --format="value(projectNumber)")",
264
270
  "echo "GCLOUD_PROJECT_NUMBER: $GCLOUD_PROJECT_NUMBER"",
265
271
  "echo -e "\\e[0Ksection_end:$(date +%s):prepare\\r\\e[0K"",
266
- "echo -e "\\e[0Ksection_start:$(date +%s):pushToArtifactRegistry[collapsed=true]\\r\\e[0KPushing image to artifacts registry"",
267
- "docker login --username gitlab-ci-token --password $CI_JOB_TOKEN $CI_REGISTRY",
268
- "gcloud auth configure-docker europe-west6-docker.pkg.dev",
269
- "docker pull $DOCKER_IMAGE:$DOCKER_IMAGE_TAG",
270
- "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",
271
- "docker push europe-west6-docker.pkg.dev/google-project-id/catladder-deploy/pan-test-app/dev/api:$DOCKER_IMAGE_TAG",
272
- "echo -e "\\e[0Ksection_end:$(date +%s):pushToArtifactRegistry\\r\\e[0K"",
273
272
  "echo -e "\\e[0Ksection_start:$(date +%s):deploy[collapsed=true]\\r\\e[0KDeploy to cloud run"",
274
273
  "echo "$ENV_VARS" > ____envvars.yaml",
275
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",
@@ -277,6 +276,7 @@ COPY --chown=node:node .yarn /app/.yarn",
277
276
  "echo -e "\\e[0Ksection_start:$(date +%s):cleanup[collapsed=true]\\r\\e[0KCleanup"",
278
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",
279
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",
280
280
  "echo -e "\\e[0Ksection_end:$(date +%s):cleanup\\r\\e[0K"",
281
281
  "echo Uploading SBOM to Dependency Track",
282
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",
@@ -297,14 +297,12 @@ COPY --chown=node:node .yarn /app/.yarn",
297
297
  "BUILD_INFO_ID": "some-id",
298
298
  "CLOUDSDK_CORE_DISABLE_PROMPTS": "1",
299
299
  "DOCKER_BUILDKIT": "1",
300
- "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",
301
301
  "DOCKER_DRIVER": "overlay2",
302
302
  "DOCKER_HOST": "tcp://0.0.0.0:2375",
303
- "DOCKER_IMAGE": "$DOCKER_REGISTRY_IMAGE_PATH/$DOCKER_IMAGE_NAME",
304
- "DOCKER_IMAGE_NAME": "dev/api",
303
+ "DOCKER_IMAGE": "europe-west6-docker.pkg.dev/google-project-id/catladder-deploy/pan-test-app/dev/api",
305
304
  "DOCKER_IMAGE_TAG": "$CI_COMMIT_SHA",
306
- "DOCKER_REGISTRY": "$CI_REGISTRY",
307
- "DOCKER_REGISTRY_IMAGE_PATH": "$CI_REGISTRY_IMAGE",
305
+ "DOCKER_REGISTRY": "europe-west6-docker.pkg.dev",
308
306
  "DOCKER_TLS_CERTDIR": "",
309
307
  "ENV_SHORT": "dev",
310
308
  "ENV_TYPE": "dev",
@@ -366,6 +364,7 @@ _ALL_ENV_VAR_KEYS: '["ENV_SHORT","APP_DIR","ENV_TYPE","BUILD_INFO_ID","BUILD_INF
366
364
  "gcloud auth activate-service-account --key-file="./____keyfile.json"",
367
365
  "gcloud run services delete pan-test-app-dev-api --project=google-project-id --region=europe-west6",
368
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",
369
368
  "echo Disabling component in Dependency Track",
370
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",
371
370
  "set -e",
@@ -701,12 +700,20 @@ _ALL_ENV_VAR_KEYS: '["ENV_SHORT","APP_DIR","ENV_TYPE","BUILD_INFO_ID","BUILD_INF
701
700
  },
702
701
  "script": [
703
702
  "ensureNodeDockerfile",
704
- "docker login --username gitlab-ci-token --password $CI_JOB_TOKEN $CI_REGISTRY",
705
- "docker version",
703
+ "echo -e "\\e[0Ksection_start:$(date +%s):docker-login[collapsed=true]\\r\\e[0KDocker Login"",
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",
708
+ "echo -e "\\e[0Ksection_end:$(date +%s):docker-login\\r\\e[0K"",
709
+ "echo -e "\\e[0Ksection_start:$(date +%s):docker-build[collapsed=true]\\r\\e[0KDocker build"",
706
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",
711
+ "echo -e "\\e[0Ksection_end:$(date +%s):docker-build\\r\\e[0K"",
712
+ "echo -e "\\e[0Ksection_start:$(date +%s):docker-push[collapsed=true]\\r\\e[0KDocker push and tag"",
707
713
  "docker push $DOCKER_IMAGE:$DOCKER_IMAGE_TAG",
708
714
  "docker tag $DOCKER_IMAGE:$DOCKER_IMAGE_TAG $DOCKER_CACHE_IMAGE",
709
715
  "docker push $DOCKER_CACHE_IMAGE",
716
+ "echo -e "\\e[0Ksection_end:$(date +%s):docker-push\\r\\e[0K"",
710
717
  ],
711
718
  "services": [
712
719
  {
@@ -722,7 +729,7 @@ _ALL_ENV_VAR_KEYS: '["ENV_SHORT","APP_DIR","ENV_TYPE","BUILD_INFO_ID","BUILD_INF
722
729
  "DOCKERFILE_ADDITIONS": undefined,
723
730
  "DOCKERFILE_ADDITIONS_END": undefined,
724
731
  "DOCKER_BUILDKIT": "1",
725
- "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",
726
733
  "DOCKER_COPY_AND_INSTALL_APP": "COPY --chown=node:node $APP_DIR .
727
734
  RUN yarn plugin import workspace-tools
728
735
  RUN yarn workspaces focus --production && yarn rebuild",
@@ -733,11 +740,9 @@ COPY --chown=node:node .yarn /app/.yarn",
733
740
  "DOCKER_DIR": ".",
734
741
  "DOCKER_DRIVER": "overlay2",
735
742
  "DOCKER_HOST": "tcp://0.0.0.0:2375",
736
- "DOCKER_IMAGE": "$DOCKER_REGISTRY_IMAGE_PATH/$DOCKER_IMAGE_NAME",
737
- "DOCKER_IMAGE_NAME": "review/api",
743
+ "DOCKER_IMAGE": "europe-west6-docker.pkg.dev/google-project-id/catladder-deploy/pan-test-app/review/api/mr1234",
738
744
  "DOCKER_IMAGE_TAG": "$CI_COMMIT_SHA",
739
- "DOCKER_REGISTRY": "$CI_REGISTRY",
740
- "DOCKER_REGISTRY_IMAGE_PATH": "$CI_REGISTRY_IMAGE",
745
+ "DOCKER_REGISTRY": "europe-west6-docker.pkg.dev",
741
746
  "DOCKER_TLS_CERTDIR": "",
742
747
  "KUBERNETES_CPU_LIMIT": "1",
743
748
  "KUBERNETES_CPU_REQUEST": "0.5",
@@ -806,13 +811,6 @@ COPY --chown=node:node .yarn /app/.yarn",
806
811
  "export GCLOUD_PROJECT_NUMBER=$(gcloud projects describe google-project-id --format="value(projectNumber)")",
807
812
  "echo "GCLOUD_PROJECT_NUMBER: $GCLOUD_PROJECT_NUMBER"",
808
813
  "echo -e "\\e[0Ksection_end:$(date +%s):prepare\\r\\e[0K"",
809
- "echo -e "\\e[0Ksection_start:$(date +%s):pushToArtifactRegistry[collapsed=true]\\r\\e[0KPushing image to artifacts registry"",
810
- "docker login --username gitlab-ci-token --password $CI_JOB_TOKEN $CI_REGISTRY",
811
- "gcloud auth configure-docker europe-west6-docker.pkg.dev",
812
- "docker pull $DOCKER_IMAGE:$DOCKER_IMAGE_TAG",
813
- "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",
814
- "docker push europe-west6-docker.pkg.dev/google-project-id/catladder-deploy/pan-test-app/review/api/mr1234:$DOCKER_IMAGE_TAG",
815
- "echo -e "\\e[0Ksection_end:$(date +%s):pushToArtifactRegistry\\r\\e[0K"",
816
814
  "echo -e "\\e[0Ksection_start:$(date +%s):deploy[collapsed=true]\\r\\e[0KDeploy to cloud run"",
817
815
  "echo "$ENV_VARS" > ____envvars.yaml",
818
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",
@@ -820,6 +818,7 @@ COPY --chown=node:node .yarn /app/.yarn",
820
818
  "echo -e "\\e[0Ksection_start:$(date +%s):cleanup[collapsed=true]\\r\\e[0KCleanup"",
821
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",
822
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",
823
822
  "set +e",
824
823
  "gcloud artifacts docker images delete europe-west6-docker.pkg.dev/google-project-id/catladder-deploy/pan-test-app/review/api --quiet --delete-tags",
825
824
  "set -e",
@@ -843,14 +842,12 @@ COPY --chown=node:node .yarn /app/.yarn",
843
842
  "BUILD_INFO_ID": "some-id",
844
843
  "CLOUDSDK_CORE_DISABLE_PROMPTS": "1",
845
844
  "DOCKER_BUILDKIT": "1",
846
- "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",
847
846
  "DOCKER_DRIVER": "overlay2",
848
847
  "DOCKER_HOST": "tcp://0.0.0.0:2375",
849
- "DOCKER_IMAGE": "$DOCKER_REGISTRY_IMAGE_PATH/$DOCKER_IMAGE_NAME",
850
- "DOCKER_IMAGE_NAME": "review/api",
848
+ "DOCKER_IMAGE": "europe-west6-docker.pkg.dev/google-project-id/catladder-deploy/pan-test-app/review/api/mr1234",
851
849
  "DOCKER_IMAGE_TAG": "$CI_COMMIT_SHA",
852
- "DOCKER_REGISTRY": "$CI_REGISTRY",
853
- "DOCKER_REGISTRY_IMAGE_PATH": "$CI_REGISTRY_IMAGE",
850
+ "DOCKER_REGISTRY": "europe-west6-docker.pkg.dev",
854
851
  "DOCKER_TLS_CERTDIR": "",
855
852
  "ENV_SHORT": "review",
856
853
  "ENV_TYPE": "review",
@@ -912,6 +909,7 @@ _ALL_ENV_VAR_KEYS: '["ENV_SHORT","APP_DIR","ENV_TYPE","BUILD_INFO_ID","BUILD_INF
912
909
  "gcloud auth activate-service-account --key-file="./____keyfile.json"",
913
910
  "gcloud run services delete pan-test-app-review-mr1234-api --project=google-project-id --region=europe-west6",
914
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",
915
913
  "set +e",
916
914
  "gcloud artifacts docker images delete europe-west6-docker.pkg.dev/google-project-id/catladder-deploy/pan-test-app/review/api --quiet --delete-tags",
917
915
  "set -e",
@@ -1285,12 +1283,20 @@ _ALL_ENV_VAR_KEYS: '["ENV_SHORT","APP_DIR","ENV_TYPE","BUILD_INFO_ID","BUILD_INF
1285
1283
  },
1286
1284
  "script": [
1287
1285
  "ensureNodeDockerfile",
1288
- "docker login --username gitlab-ci-token --password $CI_JOB_TOKEN $CI_REGISTRY",
1289
- "docker version",
1286
+ "echo -e "\\e[0Ksection_start:$(date +%s):docker-login[collapsed=true]\\r\\e[0KDocker Login"",
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",
1291
+ "echo -e "\\e[0Ksection_end:$(date +%s):docker-login\\r\\e[0K"",
1292
+ "echo -e "\\e[0Ksection_start:$(date +%s):docker-build[collapsed=true]\\r\\e[0KDocker build"",
1290
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",
1294
+ "echo -e "\\e[0Ksection_end:$(date +%s):docker-build\\r\\e[0K"",
1295
+ "echo -e "\\e[0Ksection_start:$(date +%s):docker-push[collapsed=true]\\r\\e[0KDocker push and tag"",
1291
1296
  "docker push $DOCKER_IMAGE:$DOCKER_IMAGE_TAG",
1292
1297
  "docker tag $DOCKER_IMAGE:$DOCKER_IMAGE_TAG $DOCKER_CACHE_IMAGE",
1293
1298
  "docker push $DOCKER_CACHE_IMAGE",
1299
+ "echo -e "\\e[0Ksection_end:$(date +%s):docker-push\\r\\e[0K"",
1294
1300
  ],
1295
1301
  "services": [
1296
1302
  {
@@ -1306,7 +1312,7 @@ _ALL_ENV_VAR_KEYS: '["ENV_SHORT","APP_DIR","ENV_TYPE","BUILD_INFO_ID","BUILD_INF
1306
1312
  "DOCKERFILE_ADDITIONS": undefined,
1307
1313
  "DOCKERFILE_ADDITIONS_END": undefined,
1308
1314
  "DOCKER_BUILDKIT": "1",
1309
- "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",
1310
1316
  "DOCKER_COPY_AND_INSTALL_APP": "COPY --chown=node:node $APP_DIR .
1311
1317
  RUN yarn plugin import workspace-tools
1312
1318
  RUN yarn workspaces focus --production && yarn rebuild",
@@ -1317,11 +1323,9 @@ COPY --chown=node:node .yarn /app/.yarn",
1317
1323
  "DOCKER_DIR": ".",
1318
1324
  "DOCKER_DRIVER": "overlay2",
1319
1325
  "DOCKER_HOST": "tcp://0.0.0.0:2375",
1320
- "DOCKER_IMAGE": "$DOCKER_REGISTRY_IMAGE_PATH/$DOCKER_IMAGE_NAME",
1321
- "DOCKER_IMAGE_NAME": "prod/api",
1326
+ "DOCKER_IMAGE": "europe-west6-docker.pkg.dev/google-project-id/catladder-deploy/pan-test-app/prod/api",
1322
1327
  "DOCKER_IMAGE_TAG": "$CI_COMMIT_SHA",
1323
- "DOCKER_REGISTRY": "$CI_REGISTRY",
1324
- "DOCKER_REGISTRY_IMAGE_PATH": "$CI_REGISTRY_IMAGE",
1328
+ "DOCKER_REGISTRY": "europe-west6-docker.pkg.dev",
1325
1329
  "DOCKER_TLS_CERTDIR": "",
1326
1330
  "KUBERNETES_CPU_LIMIT": "1",
1327
1331
  "KUBERNETES_CPU_REQUEST": "0.5",
@@ -1353,12 +1357,20 @@ COPY --chown=node:node .yarn /app/.yarn",
1353
1357
  },
1354
1358
  "script": [
1355
1359
  "ensureNodeDockerfile",
1356
- "docker login --username gitlab-ci-token --password $CI_JOB_TOKEN $CI_REGISTRY",
1357
- "docker version",
1360
+ "echo -e "\\e[0Ksection_start:$(date +%s):docker-login[collapsed=true]\\r\\e[0KDocker Login"",
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",
1365
+ "echo -e "\\e[0Ksection_end:$(date +%s):docker-login\\r\\e[0K"",
1366
+ "echo -e "\\e[0Ksection_start:$(date +%s):docker-build[collapsed=true]\\r\\e[0KDocker build"",
1358
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",
1368
+ "echo -e "\\e[0Ksection_end:$(date +%s):docker-build\\r\\e[0K"",
1369
+ "echo -e "\\e[0Ksection_start:$(date +%s):docker-push[collapsed=true]\\r\\e[0KDocker push and tag"",
1359
1370
  "docker push $DOCKER_IMAGE:$DOCKER_IMAGE_TAG",
1360
1371
  "docker tag $DOCKER_IMAGE:$DOCKER_IMAGE_TAG $DOCKER_CACHE_IMAGE",
1361
1372
  "docker push $DOCKER_CACHE_IMAGE",
1373
+ "echo -e "\\e[0Ksection_end:$(date +%s):docker-push\\r\\e[0K"",
1362
1374
  ],
1363
1375
  "services": [
1364
1376
  {
@@ -1374,7 +1386,7 @@ COPY --chown=node:node .yarn /app/.yarn",
1374
1386
  "DOCKERFILE_ADDITIONS": undefined,
1375
1387
  "DOCKERFILE_ADDITIONS_END": undefined,
1376
1388
  "DOCKER_BUILDKIT": "1",
1377
- "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",
1378
1390
  "DOCKER_COPY_AND_INSTALL_APP": "COPY --chown=node:node $APP_DIR .
1379
1391
  RUN yarn plugin import workspace-tools
1380
1392
  RUN yarn workspaces focus --production && yarn rebuild",
@@ -1385,11 +1397,9 @@ COPY --chown=node:node .yarn /app/.yarn",
1385
1397
  "DOCKER_DIR": ".",
1386
1398
  "DOCKER_DRIVER": "overlay2",
1387
1399
  "DOCKER_HOST": "tcp://0.0.0.0:2375",
1388
- "DOCKER_IMAGE": "$DOCKER_REGISTRY_IMAGE_PATH/$DOCKER_IMAGE_NAME",
1389
- "DOCKER_IMAGE_NAME": "stage/api",
1400
+ "DOCKER_IMAGE": "europe-west6-docker.pkg.dev/google-project-id/catladder-deploy/pan-test-app/stage/api",
1390
1401
  "DOCKER_IMAGE_TAG": "$CI_COMMIT_SHA",
1391
- "DOCKER_REGISTRY": "$CI_REGISTRY",
1392
- "DOCKER_REGISTRY_IMAGE_PATH": "$CI_REGISTRY_IMAGE",
1402
+ "DOCKER_REGISTRY": "europe-west6-docker.pkg.dev",
1393
1403
  "DOCKER_TLS_CERTDIR": "",
1394
1404
  "KUBERNETES_CPU_LIMIT": "1",
1395
1405
  "KUBERNETES_CPU_REQUEST": "0.5",
@@ -1446,13 +1456,6 @@ COPY --chown=node:node .yarn /app/.yarn",
1446
1456
  "export GCLOUD_PROJECT_NUMBER=$(gcloud projects describe google-project-id --format="value(projectNumber)")",
1447
1457
  "echo "GCLOUD_PROJECT_NUMBER: $GCLOUD_PROJECT_NUMBER"",
1448
1458
  "echo -e "\\e[0Ksection_end:$(date +%s):prepare\\r\\e[0K"",
1449
- "echo -e "\\e[0Ksection_start:$(date +%s):pushToArtifactRegistry[collapsed=true]\\r\\e[0KPushing image to artifacts registry"",
1450
- "docker login --username gitlab-ci-token --password $CI_JOB_TOKEN $CI_REGISTRY",
1451
- "gcloud auth configure-docker europe-west6-docker.pkg.dev",
1452
- "docker pull $DOCKER_IMAGE:$DOCKER_IMAGE_TAG",
1453
- "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",
1454
- "docker push europe-west6-docker.pkg.dev/google-project-id/catladder-deploy/pan-test-app/prod/api:$DOCKER_IMAGE_TAG",
1455
- "echo -e "\\e[0Ksection_end:$(date +%s):pushToArtifactRegistry\\r\\e[0K"",
1456
1459
  "echo -e "\\e[0Ksection_start:$(date +%s):deploy[collapsed=true]\\r\\e[0KDeploy to cloud run"",
1457
1460
  "echo "$ENV_VARS" > ____envvars.yaml",
1458
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",
@@ -1460,6 +1463,7 @@ COPY --chown=node:node .yarn /app/.yarn",
1460
1463
  "echo -e "\\e[0Ksection_start:$(date +%s):cleanup[collapsed=true]\\r\\e[0KCleanup"",
1461
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",
1462
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",
1463
1467
  "echo -e "\\e[0Ksection_end:$(date +%s):cleanup\\r\\e[0K"",
1464
1468
  "echo Uploading SBOM to Dependency Track",
1465
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",
@@ -1480,14 +1484,12 @@ COPY --chown=node:node .yarn /app/.yarn",
1480
1484
  "BUILD_INFO_ID": "some-id",
1481
1485
  "CLOUDSDK_CORE_DISABLE_PROMPTS": "1",
1482
1486
  "DOCKER_BUILDKIT": "1",
1483
- "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",
1484
1488
  "DOCKER_DRIVER": "overlay2",
1485
1489
  "DOCKER_HOST": "tcp://0.0.0.0:2375",
1486
- "DOCKER_IMAGE": "$DOCKER_REGISTRY_IMAGE_PATH/$DOCKER_IMAGE_NAME",
1487
- "DOCKER_IMAGE_NAME": "prod/api",
1490
+ "DOCKER_IMAGE": "europe-west6-docker.pkg.dev/google-project-id/catladder-deploy/pan-test-app/prod/api",
1488
1491
  "DOCKER_IMAGE_TAG": "$CI_COMMIT_SHA",
1489
- "DOCKER_REGISTRY": "$CI_REGISTRY",
1490
- "DOCKER_REGISTRY_IMAGE_PATH": "$CI_REGISTRY_IMAGE",
1492
+ "DOCKER_REGISTRY": "europe-west6-docker.pkg.dev",
1491
1493
  "DOCKER_TLS_CERTDIR": "",
1492
1494
  "ENV_SHORT": "prod",
1493
1495
  "ENV_TYPE": "prod",
@@ -1564,13 +1566,6 @@ _ALL_ENV_VAR_KEYS: '["ENV_SHORT","APP_DIR","ENV_TYPE","BUILD_INFO_ID","BUILD_INF
1564
1566
  "export GCLOUD_PROJECT_NUMBER=$(gcloud projects describe google-project-id --format="value(projectNumber)")",
1565
1567
  "echo "GCLOUD_PROJECT_NUMBER: $GCLOUD_PROJECT_NUMBER"",
1566
1568
  "echo -e "\\e[0Ksection_end:$(date +%s):prepare\\r\\e[0K"",
1567
- "echo -e "\\e[0Ksection_start:$(date +%s):pushToArtifactRegistry[collapsed=true]\\r\\e[0KPushing image to artifacts registry"",
1568
- "docker login --username gitlab-ci-token --password $CI_JOB_TOKEN $CI_REGISTRY",
1569
- "gcloud auth configure-docker europe-west6-docker.pkg.dev",
1570
- "docker pull $DOCKER_IMAGE:$DOCKER_IMAGE_TAG",
1571
- "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",
1572
- "docker push europe-west6-docker.pkg.dev/google-project-id/catladder-deploy/pan-test-app/stage/api:$DOCKER_IMAGE_TAG",
1573
- "echo -e "\\e[0Ksection_end:$(date +%s):pushToArtifactRegistry\\r\\e[0K"",
1574
1569
  "echo -e "\\e[0Ksection_start:$(date +%s):deploy[collapsed=true]\\r\\e[0KDeploy to cloud run"",
1575
1570
  "echo "$ENV_VARS" > ____envvars.yaml",
1576
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",
@@ -1578,6 +1573,7 @@ _ALL_ENV_VAR_KEYS: '["ENV_SHORT","APP_DIR","ENV_TYPE","BUILD_INFO_ID","BUILD_INF
1578
1573
  "echo -e "\\e[0Ksection_start:$(date +%s):cleanup[collapsed=true]\\r\\e[0KCleanup"",
1579
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",
1580
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",
1581
1577
  "echo -e "\\e[0Ksection_end:$(date +%s):cleanup\\r\\e[0K"",
1582
1578
  "echo Uploading SBOM to Dependency Track",
1583
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",
@@ -1598,14 +1594,12 @@ _ALL_ENV_VAR_KEYS: '["ENV_SHORT","APP_DIR","ENV_TYPE","BUILD_INFO_ID","BUILD_INF
1598
1594
  "BUILD_INFO_ID": "some-id",
1599
1595
  "CLOUDSDK_CORE_DISABLE_PROMPTS": "1",
1600
1596
  "DOCKER_BUILDKIT": "1",
1601
- "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",
1602
1598
  "DOCKER_DRIVER": "overlay2",
1603
1599
  "DOCKER_HOST": "tcp://0.0.0.0:2375",
1604
- "DOCKER_IMAGE": "$DOCKER_REGISTRY_IMAGE_PATH/$DOCKER_IMAGE_NAME",
1605
- "DOCKER_IMAGE_NAME": "stage/api",
1600
+ "DOCKER_IMAGE": "europe-west6-docker.pkg.dev/google-project-id/catladder-deploy/pan-test-app/stage/api",
1606
1601
  "DOCKER_IMAGE_TAG": "$CI_COMMIT_SHA",
1607
- "DOCKER_REGISTRY": "$CI_REGISTRY",
1608
- "DOCKER_REGISTRY_IMAGE_PATH": "$CI_REGISTRY_IMAGE",
1602
+ "DOCKER_REGISTRY": "europe-west6-docker.pkg.dev",
1609
1603
  "DOCKER_TLS_CERTDIR": "",
1610
1604
  "ENV_SHORT": "stage",
1611
1605
  "ENV_TYPE": "stage",
@@ -1667,6 +1661,7 @@ _ALL_ENV_VAR_KEYS: '["ENV_SHORT","APP_DIR","ENV_TYPE","BUILD_INFO_ID","BUILD_INF
1667
1661
  "gcloud auth activate-service-account --key-file="./____keyfile.json"",
1668
1662
  "gcloud run services delete pan-test-app-prod-api --project=google-project-id --region=europe-west6",
1669
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",
1670
1665
  "echo Disabling component in Dependency Track",
1671
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",
1672
1667
  "set -e",
@@ -1715,6 +1710,7 @@ _ALL_ENV_VAR_KEYS: '["ENV_SHORT","APP_DIR","ENV_TYPE","BUILD_INFO_ID","BUILD_INF
1715
1710
  "gcloud auth activate-service-account --key-file="./____keyfile.json"",
1716
1711
  "gcloud run services delete pan-test-app-stage-api --project=google-project-id --region=europe-west6",
1717
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",
1718
1714
  "echo Disabling component in Dependency Track",
1719
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",
1720
1716
  "set -e",