@catladder/pipeline 1.124.0 → 1.124.2

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__/custom-build-job-with-tests.ts.snap CHANGED
@@ -118,7 +118,10 @@ exports[`matches snapshot 1`] = `
118
118
  "script": [
119
119
  "ensureNginxDockerfile",
120
120
  "echo -e "\\e[0Ksection_start:$(date +%s):docker-login[collapsed=true]\\r\\e[0KDocker Login"",
121
- "docker login --username gitlab-ci-token --password $CI_JOB_TOKEN $CI_REGISTRY",
121
+ "echo $CL_dev_www_GCLOUD_DEPLOY_credentialsKey > ./____keyfile.json
122
+ ",
123
+ "gcloud auth activate-service-account --key-file="./____keyfile.json"",
124
+ "gcloud auth configure-docker asia-east1-docker.pkg.dev",
122
125
  "echo -e "\\e[0Ksection_end:$(date +%s):docker-login\\r\\e[0K"",
123
126
  "echo -e "\\e[0Ksection_start:$(date +%s):docker-build[collapsed=true]\\r\\e[0KDocker build"",
124
127
  "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",
@@ -143,15 +146,13 @@ exports[`matches snapshot 1`] = `
143
146
  "DOCKERFILE_ADDITIONS": undefined,
144
147
  "DOCKERFILE_ADDITIONS_END": undefined,
145
148
  "DOCKER_BUILDKIT": "1",
146
- "DOCKER_CACHE_IMAGE": "$DOCKER_REGISTRY_IMAGE_PATH/caches/www",
149
+ "DOCKER_CACHE_IMAGE": "asia-east1-docker.pkg.dev/asdf/catladder-deploy/pan-test-app/caches/www",
147
150
  "DOCKER_DIR": ".",
148
151
  "DOCKER_DRIVER": "overlay2",
149
152
  "DOCKER_HOST": "tcp://0.0.0.0:2375",
150
- "DOCKER_IMAGE": "$DOCKER_REGISTRY_IMAGE_PATH/$DOCKER_IMAGE_NAME",
151
- "DOCKER_IMAGE_NAME": "dev/www",
153
+ "DOCKER_IMAGE": "asia-east1-docker.pkg.dev/asdf/catladder-deploy/pan-test-app/dev/www",
152
154
  "DOCKER_IMAGE_TAG": "$CI_COMMIT_SHA",
153
- "DOCKER_REGISTRY": "$CI_REGISTRY",
154
- "DOCKER_REGISTRY_IMAGE_PATH": "$CI_REGISTRY_IMAGE",
155
+ "DOCKER_REGISTRY": "asia-east1-docker.pkg.dev",
155
156
  "DOCKER_TLS_CERTDIR": "",
156
157
  "KUBERNETES_CPU_LIMIT": "1",
157
158
  "KUBERNETES_CPU_REQUEST": "0.5",
@@ -220,13 +221,6 @@ exports[`matches snapshot 1`] = `
220
221
  "export GCLOUD_PROJECT_NUMBER=$(gcloud projects describe asdf --format="value(projectNumber)")",
221
222
  "echo "GCLOUD_PROJECT_NUMBER: $GCLOUD_PROJECT_NUMBER"",
222
223
  "echo -e "\\e[0Ksection_end:$(date +%s):prepare\\r\\e[0K"",
223
- "echo -e "\\e[0Ksection_start:$(date +%s):pushToArtifactRegistry[collapsed=true]\\r\\e[0KPushing image to artifacts registry"",
224
- "docker login --username gitlab-ci-token --password $CI_JOB_TOKEN $CI_REGISTRY",
225
- "gcloud auth configure-docker asia-east1-docker.pkg.dev",
226
- "docker pull $DOCKER_IMAGE:$DOCKER_IMAGE_TAG",
227
- "docker tag $DOCKER_IMAGE:$DOCKER_IMAGE_TAG asia-east1-docker.pkg.dev/asdf/catladder-deploy/pan-test-app/dev/www:$DOCKER_IMAGE_TAG",
228
- "docker push asia-east1-docker.pkg.dev/asdf/catladder-deploy/pan-test-app/dev/www:$DOCKER_IMAGE_TAG",
229
- "echo -e "\\e[0Ksection_end:$(date +%s):pushToArtifactRegistry\\r\\e[0K"",
230
224
  "echo -e "\\e[0Ksection_start:$(date +%s):deploy[collapsed=true]\\r\\e[0KDeploy to cloud run"",
231
225
  "echo "$ENV_VARS" > ____envvars.yaml",
232
226
  "gcloud run deploy pan-test-app-dev-www --command="" --image=asia-east1-docker.pkg.dev/asdf/catladder-deploy/pan-test-app/dev/www:$DOCKER_IMAGE_TAG --project=asdf --region=asia-east1 --labels=customer-name=pan,component-name=www,app-name=test-app,env-type=dev,env-name=dev,build-type=custom --env-vars-file=____envvars.yaml --min-instances=0 --max-instances=100 --cpu-throttling --allow-unauthenticated --ingress=all --cpu-boost",
@@ -234,6 +228,7 @@ exports[`matches snapshot 1`] = `
234
228
  "echo -e "\\e[0Ksection_start:$(date +%s):cleanup[collapsed=true]\\r\\e[0KCleanup"",
235
229
  "gcloud run revisions list --project=asdf --region=asia-east1 --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=asdf --region=asia-east1 --quiet $revisionname ; done",
236
230
  "gcloud artifacts docker images list asia-east1-docker.pkg.dev/asdf/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 asia-east1-docker.pkg.dev/asdf/catladder-deploy/pan-test-app/dev/www@$version --quiet --delete-tags; done",
231
+ "gcloud artifacts docker images list asia-east1-docker.pkg.dev/asdf/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 asia-east1-docker.pkg.dev/asdf/catladder-deploy/pan-test-app/caches/www@$version --quiet --delete-tags; done",
237
232
  "echo -e "\\e[0Ksection_end:$(date +%s):cleanup\\r\\e[0K"",
238
233
  "echo Uploading SBOM to Dependency Track",
239
234
  "/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",
@@ -254,14 +249,12 @@ exports[`matches snapshot 1`] = `
254
249
  "BUILD_INFO_ID": "some-id",
255
250
  "CLOUDSDK_CORE_DISABLE_PROMPTS": "1",
256
251
  "DOCKER_BUILDKIT": "1",
257
- "DOCKER_CACHE_IMAGE": "$DOCKER_REGISTRY_IMAGE_PATH/caches/www",
252
+ "DOCKER_CACHE_IMAGE": "asia-east1-docker.pkg.dev/asdf/catladder-deploy/pan-test-app/caches/www",
258
253
  "DOCKER_DRIVER": "overlay2",
259
254
  "DOCKER_HOST": "tcp://0.0.0.0:2375",
260
- "DOCKER_IMAGE": "$DOCKER_REGISTRY_IMAGE_PATH/$DOCKER_IMAGE_NAME",
261
- "DOCKER_IMAGE_NAME": "dev/www",
255
+ "DOCKER_IMAGE": "asia-east1-docker.pkg.dev/asdf/catladder-deploy/pan-test-app/dev/www",
262
256
  "DOCKER_IMAGE_TAG": "$CI_COMMIT_SHA",
263
- "DOCKER_REGISTRY": "$CI_REGISTRY",
264
- "DOCKER_REGISTRY_IMAGE_PATH": "$CI_REGISTRY_IMAGE",
257
+ "DOCKER_REGISTRY": "asia-east1-docker.pkg.dev",
265
258
  "DOCKER_TLS_CERTDIR": "",
266
259
  "ENV_SHORT": "dev",
267
260
  "ENV_TYPE": "dev",
@@ -323,6 +316,7 @@ _ALL_ENV_VAR_KEYS: '["ENV_SHORT","APP_DIR","ENV_TYPE","BUILD_INFO_ID","BUILD_INF
323
316
  "gcloud auth activate-service-account --key-file="./____keyfile.json"",
324
317
  "gcloud run services delete pan-test-app-dev-www --project=asdf --region=asia-east1",
325
318
  "gcloud artifacts docker images delete asia-east1-docker.pkg.dev/asdf/catladder-deploy/pan-test-app/dev/www --quiet --delete-tags",
319
+ "gcloud artifacts docker images list asia-east1-docker.pkg.dev/asdf/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 asia-east1-docker.pkg.dev/asdf/catladder-deploy/pan-test-app/caches/www@$version --quiet --delete-tags; done",
326
320
  "echo Disabling component in Dependency Track",
327
321
  "/dtrackuploader https://dep.panter.swiss/ "$DT_KEY_PROD" disable "pan-test-app/www" "https://pan-test-app-dev-www-unknown-host.example.com" || true",
328
322
  "set -e",
@@ -626,7 +620,10 @@ _ALL_ENV_VAR_KEYS: '["ENV_SHORT","APP_DIR","ENV_TYPE","BUILD_INFO_ID","BUILD_INF
626
620
  "script": [
627
621
  "ensureNginxDockerfile",
628
622
  "echo -e "\\e[0Ksection_start:$(date +%s):docker-login[collapsed=true]\\r\\e[0KDocker Login"",
629
- "docker login --username gitlab-ci-token --password $CI_JOB_TOKEN $CI_REGISTRY",
623
+ "echo $CL_review_www_GCLOUD_DEPLOY_credentialsKey > ./____keyfile.json
624
+ ",
625
+ "gcloud auth activate-service-account --key-file="./____keyfile.json"",
626
+ "gcloud auth configure-docker asia-east1-docker.pkg.dev",
630
627
  "echo -e "\\e[0Ksection_end:$(date +%s):docker-login\\r\\e[0K"",
631
628
  "echo -e "\\e[0Ksection_start:$(date +%s):docker-build[collapsed=true]\\r\\e[0KDocker build"",
632
629
  "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",
@@ -651,15 +648,13 @@ _ALL_ENV_VAR_KEYS: '["ENV_SHORT","APP_DIR","ENV_TYPE","BUILD_INFO_ID","BUILD_INF
651
648
  "DOCKERFILE_ADDITIONS": undefined,
652
649
  "DOCKERFILE_ADDITIONS_END": undefined,
653
650
  "DOCKER_BUILDKIT": "1",
654
- "DOCKER_CACHE_IMAGE": "$DOCKER_REGISTRY_IMAGE_PATH/caches/www",
651
+ "DOCKER_CACHE_IMAGE": "asia-east1-docker.pkg.dev/asdf/catladder-deploy/pan-test-app/caches/www",
655
652
  "DOCKER_DIR": ".",
656
653
  "DOCKER_DRIVER": "overlay2",
657
654
  "DOCKER_HOST": "tcp://0.0.0.0:2375",
658
- "DOCKER_IMAGE": "$DOCKER_REGISTRY_IMAGE_PATH/$DOCKER_IMAGE_NAME",
659
- "DOCKER_IMAGE_NAME": "review/www",
655
+ "DOCKER_IMAGE": "asia-east1-docker.pkg.dev/asdf/catladder-deploy/pan-test-app/review/www/mr1234",
660
656
  "DOCKER_IMAGE_TAG": "$CI_COMMIT_SHA",
661
- "DOCKER_REGISTRY": "$CI_REGISTRY",
662
- "DOCKER_REGISTRY_IMAGE_PATH": "$CI_REGISTRY_IMAGE",
657
+ "DOCKER_REGISTRY": "asia-east1-docker.pkg.dev",
663
658
  "DOCKER_TLS_CERTDIR": "",
664
659
  "KUBERNETES_CPU_LIMIT": "1",
665
660
  "KUBERNETES_CPU_REQUEST": "0.5",
@@ -728,13 +723,6 @@ _ALL_ENV_VAR_KEYS: '["ENV_SHORT","APP_DIR","ENV_TYPE","BUILD_INFO_ID","BUILD_INF
728
723
  "export GCLOUD_PROJECT_NUMBER=$(gcloud projects describe asdf --format="value(projectNumber)")",
729
724
  "echo "GCLOUD_PROJECT_NUMBER: $GCLOUD_PROJECT_NUMBER"",
730
725
  "echo -e "\\e[0Ksection_end:$(date +%s):prepare\\r\\e[0K"",
731
- "echo -e "\\e[0Ksection_start:$(date +%s):pushToArtifactRegistry[collapsed=true]\\r\\e[0KPushing image to artifacts registry"",
732
- "docker login --username gitlab-ci-token --password $CI_JOB_TOKEN $CI_REGISTRY",
733
- "gcloud auth configure-docker asia-east1-docker.pkg.dev",
734
- "docker pull $DOCKER_IMAGE:$DOCKER_IMAGE_TAG",
735
- "docker tag $DOCKER_IMAGE:$DOCKER_IMAGE_TAG asia-east1-docker.pkg.dev/asdf/catladder-deploy/pan-test-app/review/www/mr1234:$DOCKER_IMAGE_TAG",
736
- "docker push asia-east1-docker.pkg.dev/asdf/catladder-deploy/pan-test-app/review/www/mr1234:$DOCKER_IMAGE_TAG",
737
- "echo -e "\\e[0Ksection_end:$(date +%s):pushToArtifactRegistry\\r\\e[0K"",
738
726
  "echo -e "\\e[0Ksection_start:$(date +%s):deploy[collapsed=true]\\r\\e[0KDeploy to cloud run"",
739
727
  "echo "$ENV_VARS" > ____envvars.yaml",
740
728
  "gcloud run deploy pan-test-app-review-mr1234-www --command="" --image=asia-east1-docker.pkg.dev/asdf/catladder-deploy/pan-test-app/review/www/mr1234:$DOCKER_IMAGE_TAG --project=asdf --region=asia-east1 --labels=customer-name=pan,component-name=www,app-name=test-app,env-type=review,env-name=review,build-type=custom --env-vars-file=____envvars.yaml --min-instances=0 --max-instances=100 --cpu-throttling --allow-unauthenticated --ingress=all --cpu-boost",
@@ -742,6 +730,7 @@ _ALL_ENV_VAR_KEYS: '["ENV_SHORT","APP_DIR","ENV_TYPE","BUILD_INFO_ID","BUILD_INF
742
730
  "echo -e "\\e[0Ksection_start:$(date +%s):cleanup[collapsed=true]\\r\\e[0KCleanup"",
743
731
  "gcloud run revisions list --project=asdf --region=asia-east1 --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=asdf --region=asia-east1 --quiet $revisionname ; done",
744
732
  "gcloud artifacts docker images list asia-east1-docker.pkg.dev/asdf/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 asia-east1-docker.pkg.dev/asdf/catladder-deploy/pan-test-app/review/www/mr1234@$version --quiet --delete-tags; done",
733
+ "gcloud artifacts docker images list asia-east1-docker.pkg.dev/asdf/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 asia-east1-docker.pkg.dev/asdf/catladder-deploy/pan-test-app/caches/www@$version --quiet --delete-tags; done",
745
734
  "set +e",
746
735
  "gcloud artifacts docker images delete asia-east1-docker.pkg.dev/asdf/catladder-deploy/pan-test-app/review/www --quiet --delete-tags",
747
736
  "set -e",
@@ -765,14 +754,12 @@ _ALL_ENV_VAR_KEYS: '["ENV_SHORT","APP_DIR","ENV_TYPE","BUILD_INFO_ID","BUILD_INF
765
754
  "BUILD_INFO_ID": "some-id",
766
755
  "CLOUDSDK_CORE_DISABLE_PROMPTS": "1",
767
756
  "DOCKER_BUILDKIT": "1",
768
- "DOCKER_CACHE_IMAGE": "$DOCKER_REGISTRY_IMAGE_PATH/caches/www",
757
+ "DOCKER_CACHE_IMAGE": "asia-east1-docker.pkg.dev/asdf/catladder-deploy/pan-test-app/caches/www",
769
758
  "DOCKER_DRIVER": "overlay2",
770
759
  "DOCKER_HOST": "tcp://0.0.0.0:2375",
771
- "DOCKER_IMAGE": "$DOCKER_REGISTRY_IMAGE_PATH/$DOCKER_IMAGE_NAME",
772
- "DOCKER_IMAGE_NAME": "review/www",
760
+ "DOCKER_IMAGE": "asia-east1-docker.pkg.dev/asdf/catladder-deploy/pan-test-app/review/www/mr1234",
773
761
  "DOCKER_IMAGE_TAG": "$CI_COMMIT_SHA",
774
- "DOCKER_REGISTRY": "$CI_REGISTRY",
775
- "DOCKER_REGISTRY_IMAGE_PATH": "$CI_REGISTRY_IMAGE",
762
+ "DOCKER_REGISTRY": "asia-east1-docker.pkg.dev",
776
763
  "DOCKER_TLS_CERTDIR": "",
777
764
  "ENV_SHORT": "review",
778
765
  "ENV_TYPE": "review",
@@ -834,6 +821,7 @@ _ALL_ENV_VAR_KEYS: '["ENV_SHORT","APP_DIR","ENV_TYPE","BUILD_INFO_ID","BUILD_INF
834
821
  "gcloud auth activate-service-account --key-file="./____keyfile.json"",
835
822
  "gcloud run services delete pan-test-app-review-mr1234-www --project=asdf --region=asia-east1",
836
823
  "gcloud artifacts docker images delete asia-east1-docker.pkg.dev/asdf/catladder-deploy/pan-test-app/review/www/mr1234 --quiet --delete-tags",
824
+ "gcloud artifacts docker images list asia-east1-docker.pkg.dev/asdf/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 asia-east1-docker.pkg.dev/asdf/catladder-deploy/pan-test-app/caches/www@$version --quiet --delete-tags; done",
837
825
  "set +e",
838
826
  "gcloud artifacts docker images delete asia-east1-docker.pkg.dev/asdf/catladder-deploy/pan-test-app/review/www --quiet --delete-tags",
839
827
  "set -e",
@@ -1159,7 +1147,10 @@ _ALL_ENV_VAR_KEYS: '["ENV_SHORT","APP_DIR","ENV_TYPE","BUILD_INFO_ID","BUILD_INF
1159
1147
  "script": [
1160
1148
  "ensureNginxDockerfile",
1161
1149
  "echo -e "\\e[0Ksection_start:$(date +%s):docker-login[collapsed=true]\\r\\e[0KDocker Login"",
1162
- "docker login --username gitlab-ci-token --password $CI_JOB_TOKEN $CI_REGISTRY",
1150
+ "echo $CL_prod_www_GCLOUD_DEPLOY_credentialsKey > ./____keyfile.json
1151
+ ",
1152
+ "gcloud auth activate-service-account --key-file="./____keyfile.json"",
1153
+ "gcloud auth configure-docker asia-east1-docker.pkg.dev",
1163
1154
  "echo -e "\\e[0Ksection_end:$(date +%s):docker-login\\r\\e[0K"",
1164
1155
  "echo -e "\\e[0Ksection_start:$(date +%s):docker-build[collapsed=true]\\r\\e[0KDocker build"",
1165
1156
  "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",
@@ -1184,15 +1175,13 @@ _ALL_ENV_VAR_KEYS: '["ENV_SHORT","APP_DIR","ENV_TYPE","BUILD_INFO_ID","BUILD_INF
1184
1175
  "DOCKERFILE_ADDITIONS": undefined,
1185
1176
  "DOCKERFILE_ADDITIONS_END": undefined,
1186
1177
  "DOCKER_BUILDKIT": "1",
1187
- "DOCKER_CACHE_IMAGE": "$DOCKER_REGISTRY_IMAGE_PATH/caches/www",
1178
+ "DOCKER_CACHE_IMAGE": "asia-east1-docker.pkg.dev/asdf/catladder-deploy/pan-test-app/caches/www",
1188
1179
  "DOCKER_DIR": ".",
1189
1180
  "DOCKER_DRIVER": "overlay2",
1190
1181
  "DOCKER_HOST": "tcp://0.0.0.0:2375",
1191
- "DOCKER_IMAGE": "$DOCKER_REGISTRY_IMAGE_PATH/$DOCKER_IMAGE_NAME",
1192
- "DOCKER_IMAGE_NAME": "prod/www",
1182
+ "DOCKER_IMAGE": "asia-east1-docker.pkg.dev/asdf/catladder-deploy/pan-test-app/prod/www",
1193
1183
  "DOCKER_IMAGE_TAG": "$CI_COMMIT_SHA",
1194
- "DOCKER_REGISTRY": "$CI_REGISTRY",
1195
- "DOCKER_REGISTRY_IMAGE_PATH": "$CI_REGISTRY_IMAGE",
1184
+ "DOCKER_REGISTRY": "asia-east1-docker.pkg.dev",
1196
1185
  "DOCKER_TLS_CERTDIR": "",
1197
1186
  "KUBERNETES_CPU_LIMIT": "1",
1198
1187
  "KUBERNETES_CPU_REQUEST": "0.5",
@@ -1216,7 +1205,10 @@ _ALL_ENV_VAR_KEYS: '["ENV_SHORT","APP_DIR","ENV_TYPE","BUILD_INFO_ID","BUILD_INF
1216
1205
  "script": [
1217
1206
  "ensureNginxDockerfile",
1218
1207
  "echo -e "\\e[0Ksection_start:$(date +%s):docker-login[collapsed=true]\\r\\e[0KDocker Login"",
1219
- "docker login --username gitlab-ci-token --password $CI_JOB_TOKEN $CI_REGISTRY",
1208
+ "echo $CL_stage_www_GCLOUD_DEPLOY_credentialsKey > ./____keyfile.json
1209
+ ",
1210
+ "gcloud auth activate-service-account --key-file="./____keyfile.json"",
1211
+ "gcloud auth configure-docker asia-east1-docker.pkg.dev",
1220
1212
  "echo -e "\\e[0Ksection_end:$(date +%s):docker-login\\r\\e[0K"",
1221
1213
  "echo -e "\\e[0Ksection_start:$(date +%s):docker-build[collapsed=true]\\r\\e[0KDocker build"",
1222
1214
  "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",
@@ -1241,15 +1233,13 @@ _ALL_ENV_VAR_KEYS: '["ENV_SHORT","APP_DIR","ENV_TYPE","BUILD_INFO_ID","BUILD_INF
1241
1233
  "DOCKERFILE_ADDITIONS": undefined,
1242
1234
  "DOCKERFILE_ADDITIONS_END": undefined,
1243
1235
  "DOCKER_BUILDKIT": "1",
1244
- "DOCKER_CACHE_IMAGE": "$DOCKER_REGISTRY_IMAGE_PATH/caches/www",
1236
+ "DOCKER_CACHE_IMAGE": "asia-east1-docker.pkg.dev/asdf/catladder-deploy/pan-test-app/caches/www",
1245
1237
  "DOCKER_DIR": ".",
1246
1238
  "DOCKER_DRIVER": "overlay2",
1247
1239
  "DOCKER_HOST": "tcp://0.0.0.0:2375",
1248
- "DOCKER_IMAGE": "$DOCKER_REGISTRY_IMAGE_PATH/$DOCKER_IMAGE_NAME",
1249
- "DOCKER_IMAGE_NAME": "stage/www",
1240
+ "DOCKER_IMAGE": "asia-east1-docker.pkg.dev/asdf/catladder-deploy/pan-test-app/stage/www",
1250
1241
  "DOCKER_IMAGE_TAG": "$CI_COMMIT_SHA",
1251
- "DOCKER_REGISTRY": "$CI_REGISTRY",
1252
- "DOCKER_REGISTRY_IMAGE_PATH": "$CI_REGISTRY_IMAGE",
1242
+ "DOCKER_REGISTRY": "asia-east1-docker.pkg.dev",
1253
1243
  "DOCKER_TLS_CERTDIR": "",
1254
1244
  "KUBERNETES_CPU_LIMIT": "1",
1255
1245
  "KUBERNETES_CPU_REQUEST": "0.5",
@@ -1306,13 +1296,6 @@ _ALL_ENV_VAR_KEYS: '["ENV_SHORT","APP_DIR","ENV_TYPE","BUILD_INFO_ID","BUILD_INF
1306
1296
  "export GCLOUD_PROJECT_NUMBER=$(gcloud projects describe asdf --format="value(projectNumber)")",
1307
1297
  "echo "GCLOUD_PROJECT_NUMBER: $GCLOUD_PROJECT_NUMBER"",
1308
1298
  "echo -e "\\e[0Ksection_end:$(date +%s):prepare\\r\\e[0K"",
1309
- "echo -e "\\e[0Ksection_start:$(date +%s):pushToArtifactRegistry[collapsed=true]\\r\\e[0KPushing image to artifacts registry"",
1310
- "docker login --username gitlab-ci-token --password $CI_JOB_TOKEN $CI_REGISTRY",
1311
- "gcloud auth configure-docker asia-east1-docker.pkg.dev",
1312
- "docker pull $DOCKER_IMAGE:$DOCKER_IMAGE_TAG",
1313
- "docker tag $DOCKER_IMAGE:$DOCKER_IMAGE_TAG asia-east1-docker.pkg.dev/asdf/catladder-deploy/pan-test-app/prod/www:$DOCKER_IMAGE_TAG",
1314
- "docker push asia-east1-docker.pkg.dev/asdf/catladder-deploy/pan-test-app/prod/www:$DOCKER_IMAGE_TAG",
1315
- "echo -e "\\e[0Ksection_end:$(date +%s):pushToArtifactRegistry\\r\\e[0K"",
1316
1299
  "echo -e "\\e[0Ksection_start:$(date +%s):deploy[collapsed=true]\\r\\e[0KDeploy to cloud run"",
1317
1300
  "echo "$ENV_VARS" > ____envvars.yaml",
1318
1301
  "gcloud run deploy pan-test-app-prod-www --command="" --image=asia-east1-docker.pkg.dev/asdf/catladder-deploy/pan-test-app/prod/www:$DOCKER_IMAGE_TAG --project=asdf --region=asia-east1 --labels=customer-name=pan,component-name=www,app-name=test-app,env-type=prod,env-name=prod,build-type=custom --env-vars-file=____envvars.yaml --min-instances=0 --max-instances=100 --cpu-throttling --allow-unauthenticated --ingress=all --cpu-boost",
@@ -1320,6 +1303,7 @@ _ALL_ENV_VAR_KEYS: '["ENV_SHORT","APP_DIR","ENV_TYPE","BUILD_INFO_ID","BUILD_INF
1320
1303
  "echo -e "\\e[0Ksection_start:$(date +%s):cleanup[collapsed=true]\\r\\e[0KCleanup"",
1321
1304
  "gcloud run revisions list --project=asdf --region=asia-east1 --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=asdf --region=asia-east1 --quiet $revisionname ; done",
1322
1305
  "gcloud artifacts docker images list asia-east1-docker.pkg.dev/asdf/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 asia-east1-docker.pkg.dev/asdf/catladder-deploy/pan-test-app/prod/www@$version --quiet --delete-tags; done",
1306
+ "gcloud artifacts docker images list asia-east1-docker.pkg.dev/asdf/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 asia-east1-docker.pkg.dev/asdf/catladder-deploy/pan-test-app/caches/www@$version --quiet --delete-tags; done",
1323
1307
  "echo -e "\\e[0Ksection_end:$(date +%s):cleanup\\r\\e[0K"",
1324
1308
  "echo Uploading SBOM to Dependency Track",
1325
1309
  "/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",
@@ -1340,14 +1324,12 @@ _ALL_ENV_VAR_KEYS: '["ENV_SHORT","APP_DIR","ENV_TYPE","BUILD_INFO_ID","BUILD_INF
1340
1324
  "BUILD_INFO_ID": "some-id",
1341
1325
  "CLOUDSDK_CORE_DISABLE_PROMPTS": "1",
1342
1326
  "DOCKER_BUILDKIT": "1",
1343
- "DOCKER_CACHE_IMAGE": "$DOCKER_REGISTRY_IMAGE_PATH/caches/www",
1327
+ "DOCKER_CACHE_IMAGE": "asia-east1-docker.pkg.dev/asdf/catladder-deploy/pan-test-app/caches/www",
1344
1328
  "DOCKER_DRIVER": "overlay2",
1345
1329
  "DOCKER_HOST": "tcp://0.0.0.0:2375",
1346
- "DOCKER_IMAGE": "$DOCKER_REGISTRY_IMAGE_PATH/$DOCKER_IMAGE_NAME",
1347
- "DOCKER_IMAGE_NAME": "prod/www",
1330
+ "DOCKER_IMAGE": "asia-east1-docker.pkg.dev/asdf/catladder-deploy/pan-test-app/prod/www",
1348
1331
  "DOCKER_IMAGE_TAG": "$CI_COMMIT_SHA",
1349
- "DOCKER_REGISTRY": "$CI_REGISTRY",
1350
- "DOCKER_REGISTRY_IMAGE_PATH": "$CI_REGISTRY_IMAGE",
1332
+ "DOCKER_REGISTRY": "asia-east1-docker.pkg.dev",
1351
1333
  "DOCKER_TLS_CERTDIR": "",
1352
1334
  "ENV_SHORT": "prod",
1353
1335
  "ENV_TYPE": "prod",
@@ -1424,13 +1406,6 @@ _ALL_ENV_VAR_KEYS: '["ENV_SHORT","APP_DIR","ENV_TYPE","BUILD_INFO_ID","BUILD_INF
1424
1406
  "export GCLOUD_PROJECT_NUMBER=$(gcloud projects describe asdf --format="value(projectNumber)")",
1425
1407
  "echo "GCLOUD_PROJECT_NUMBER: $GCLOUD_PROJECT_NUMBER"",
1426
1408
  "echo -e "\\e[0Ksection_end:$(date +%s):prepare\\r\\e[0K"",
1427
- "echo -e "\\e[0Ksection_start:$(date +%s):pushToArtifactRegistry[collapsed=true]\\r\\e[0KPushing image to artifacts registry"",
1428
- "docker login --username gitlab-ci-token --password $CI_JOB_TOKEN $CI_REGISTRY",
1429
- "gcloud auth configure-docker asia-east1-docker.pkg.dev",
1430
- "docker pull $DOCKER_IMAGE:$DOCKER_IMAGE_TAG",
1431
- "docker tag $DOCKER_IMAGE:$DOCKER_IMAGE_TAG asia-east1-docker.pkg.dev/asdf/catladder-deploy/pan-test-app/stage/www:$DOCKER_IMAGE_TAG",
1432
- "docker push asia-east1-docker.pkg.dev/asdf/catladder-deploy/pan-test-app/stage/www:$DOCKER_IMAGE_TAG",
1433
- "echo -e "\\e[0Ksection_end:$(date +%s):pushToArtifactRegistry\\r\\e[0K"",
1434
1409
  "echo -e "\\e[0Ksection_start:$(date +%s):deploy[collapsed=true]\\r\\e[0KDeploy to cloud run"",
1435
1410
  "echo "$ENV_VARS" > ____envvars.yaml",
1436
1411
  "gcloud run deploy pan-test-app-stage-www --command="" --image=asia-east1-docker.pkg.dev/asdf/catladder-deploy/pan-test-app/stage/www:$DOCKER_IMAGE_TAG --project=asdf --region=asia-east1 --labels=customer-name=pan,component-name=www,app-name=test-app,env-type=stage,env-name=stage,build-type=custom --env-vars-file=____envvars.yaml --min-instances=0 --max-instances=100 --cpu-throttling --allow-unauthenticated --ingress=all --cpu-boost",
@@ -1438,6 +1413,7 @@ _ALL_ENV_VAR_KEYS: '["ENV_SHORT","APP_DIR","ENV_TYPE","BUILD_INFO_ID","BUILD_INF
1438
1413
  "echo -e "\\e[0Ksection_start:$(date +%s):cleanup[collapsed=true]\\r\\e[0KCleanup"",
1439
1414
  "gcloud run revisions list --project=asdf --region=asia-east1 --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=asdf --region=asia-east1 --quiet $revisionname ; done",
1440
1415
  "gcloud artifacts docker images list asia-east1-docker.pkg.dev/asdf/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 asia-east1-docker.pkg.dev/asdf/catladder-deploy/pan-test-app/stage/www@$version --quiet --delete-tags; done",
1416
+ "gcloud artifacts docker images list asia-east1-docker.pkg.dev/asdf/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 asia-east1-docker.pkg.dev/asdf/catladder-deploy/pan-test-app/caches/www@$version --quiet --delete-tags; done",
1441
1417
  "echo -e "\\e[0Ksection_end:$(date +%s):cleanup\\r\\e[0K"",
1442
1418
  "echo Uploading SBOM to Dependency Track",
1443
1419
  "/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",
@@ -1458,14 +1434,12 @@ _ALL_ENV_VAR_KEYS: '["ENV_SHORT","APP_DIR","ENV_TYPE","BUILD_INFO_ID","BUILD_INF
1458
1434
  "BUILD_INFO_ID": "some-id",
1459
1435
  "CLOUDSDK_CORE_DISABLE_PROMPTS": "1",
1460
1436
  "DOCKER_BUILDKIT": "1",
1461
- "DOCKER_CACHE_IMAGE": "$DOCKER_REGISTRY_IMAGE_PATH/caches/www",
1437
+ "DOCKER_CACHE_IMAGE": "asia-east1-docker.pkg.dev/asdf/catladder-deploy/pan-test-app/caches/www",
1462
1438
  "DOCKER_DRIVER": "overlay2",
1463
1439
  "DOCKER_HOST": "tcp://0.0.0.0:2375",
1464
- "DOCKER_IMAGE": "$DOCKER_REGISTRY_IMAGE_PATH/$DOCKER_IMAGE_NAME",
1465
- "DOCKER_IMAGE_NAME": "stage/www",
1440
+ "DOCKER_IMAGE": "asia-east1-docker.pkg.dev/asdf/catladder-deploy/pan-test-app/stage/www",
1466
1441
  "DOCKER_IMAGE_TAG": "$CI_COMMIT_SHA",
1467
- "DOCKER_REGISTRY": "$CI_REGISTRY",
1468
- "DOCKER_REGISTRY_IMAGE_PATH": "$CI_REGISTRY_IMAGE",
1442
+ "DOCKER_REGISTRY": "asia-east1-docker.pkg.dev",
1469
1443
  "DOCKER_TLS_CERTDIR": "",
1470
1444
  "ENV_SHORT": "stage",
1471
1445
  "ENV_TYPE": "stage",
@@ -1527,6 +1501,7 @@ _ALL_ENV_VAR_KEYS: '["ENV_SHORT","APP_DIR","ENV_TYPE","BUILD_INFO_ID","BUILD_INF
1527
1501
  "gcloud auth activate-service-account --key-file="./____keyfile.json"",
1528
1502
  "gcloud run services delete pan-test-app-prod-www --project=asdf --region=asia-east1",
1529
1503
  "gcloud artifacts docker images delete asia-east1-docker.pkg.dev/asdf/catladder-deploy/pan-test-app/prod/www --quiet --delete-tags",
1504
+ "gcloud artifacts docker images list asia-east1-docker.pkg.dev/asdf/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 asia-east1-docker.pkg.dev/asdf/catladder-deploy/pan-test-app/caches/www@$version --quiet --delete-tags; done",
1530
1505
  "echo Disabling component in Dependency Track",
1531
1506
  "/dtrackuploader https://dep.panter.swiss/ "$DT_KEY_PROD" disable "pan-test-app/www" "https://pan-test-app-prod-www-unknown-host.example.com" || true",
1532
1507
  "set -e",
@@ -1575,6 +1550,7 @@ _ALL_ENV_VAR_KEYS: '["ENV_SHORT","APP_DIR","ENV_TYPE","BUILD_INFO_ID","BUILD_INF
1575
1550
  "gcloud auth activate-service-account --key-file="./____keyfile.json"",
1576
1551
  "gcloud run services delete pan-test-app-stage-www --project=asdf --region=asia-east1",
1577
1552
  "gcloud artifacts docker images delete asia-east1-docker.pkg.dev/asdf/catladder-deploy/pan-test-app/stage/www --quiet --delete-tags",
1553
+ "gcloud artifacts docker images list asia-east1-docker.pkg.dev/asdf/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 asia-east1-docker.pkg.dev/asdf/catladder-deploy/pan-test-app/caches/www@$version --quiet --delete-tags; done",
1578
1554
  "echo Disabling component in Dependency Track",
1579
1555
  "/dtrackuploader https://dep.panter.swiss/ "$DT_KEY_PROD" disable "pan-test-app/www" "https://pan-test-app-stage-www-unknown-host.example.com" || true",
1580
1556
  "set -e",