@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-sbom-java.ts.snap CHANGED
@@ -72,7 +72,10 @@ exports[`matches snapshot 1`] = `
72
72
  },
73
73
  "script": [
74
74
  "echo -e "\\e[0Ksection_start:$(date +%s):docker-login[collapsed=true]\\r\\e[0KDocker Login"",
75
- "docker login --username gitlab-ci-token --password $CI_JOB_TOKEN $CI_REGISTRY",
75
+ "echo $CL_dev_app_GCLOUD_DEPLOY_credentialsKey > ./____keyfile.json
76
+ ",
77
+ "gcloud auth activate-service-account --key-file="./____keyfile.json"",
78
+ "gcloud auth configure-docker asia-east1-docker.pkg.dev",
76
79
  "echo -e "\\e[0Ksection_end:$(date +%s):docker-login\\r\\e[0K"",
77
80
  "echo -e "\\e[0Ksection_start:$(date +%s):docker-build[collapsed=true]\\r\\e[0KDocker build"",
78
81
  "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",
@@ -97,15 +100,13 @@ exports[`matches snapshot 1`] = `
97
100
  "DOCKERFILE_ADDITIONS": undefined,
98
101
  "DOCKERFILE_ADDITIONS_END": undefined,
99
102
  "DOCKER_BUILDKIT": "1",
100
- "DOCKER_CACHE_IMAGE": "$DOCKER_REGISTRY_IMAGE_PATH/caches/app",
103
+ "DOCKER_CACHE_IMAGE": "asia-east1-docker.pkg.dev/asdf/catladder-deploy/pan-test-app/caches/app",
101
104
  "DOCKER_DIR": ".",
102
105
  "DOCKER_DRIVER": "overlay2",
103
106
  "DOCKER_HOST": "tcp://0.0.0.0:2375",
104
- "DOCKER_IMAGE": "$DOCKER_REGISTRY_IMAGE_PATH/$DOCKER_IMAGE_NAME",
105
- "DOCKER_IMAGE_NAME": "dev/app",
107
+ "DOCKER_IMAGE": "asia-east1-docker.pkg.dev/asdf/catladder-deploy/pan-test-app/dev/app",
106
108
  "DOCKER_IMAGE_TAG": "$CI_COMMIT_SHA",
107
- "DOCKER_REGISTRY": "$CI_REGISTRY",
108
- "DOCKER_REGISTRY_IMAGE_PATH": "$CI_REGISTRY_IMAGE",
109
+ "DOCKER_REGISTRY": "asia-east1-docker.pkg.dev",
109
110
  "DOCKER_TLS_CERTDIR": "",
110
111
  "KUBERNETES_CPU_LIMIT": "1",
111
112
  "KUBERNETES_CPU_REQUEST": "0.5",
@@ -162,13 +163,6 @@ exports[`matches snapshot 1`] = `
162
163
  "export GCLOUD_PROJECT_NUMBER=$(gcloud projects describe asdf --format="value(projectNumber)")",
163
164
  "echo "GCLOUD_PROJECT_NUMBER: $GCLOUD_PROJECT_NUMBER"",
164
165
  "echo -e "\\e[0Ksection_end:$(date +%s):prepare\\r\\e[0K"",
165
- "echo -e "\\e[0Ksection_start:$(date +%s):pushToArtifactRegistry[collapsed=true]\\r\\e[0KPushing image to artifacts registry"",
166
- "docker login --username gitlab-ci-token --password $CI_JOB_TOKEN $CI_REGISTRY",
167
- "gcloud auth configure-docker asia-east1-docker.pkg.dev",
168
- "docker pull $DOCKER_IMAGE:$DOCKER_IMAGE_TAG",
169
- "docker tag $DOCKER_IMAGE:$DOCKER_IMAGE_TAG asia-east1-docker.pkg.dev/asdf/catladder-deploy/pan-test-app/dev/app:$DOCKER_IMAGE_TAG",
170
- "docker push asia-east1-docker.pkg.dev/asdf/catladder-deploy/pan-test-app/dev/app:$DOCKER_IMAGE_TAG",
171
- "echo -e "\\e[0Ksection_end:$(date +%s):pushToArtifactRegistry\\r\\e[0K"",
172
166
  "echo -e "\\e[0Ksection_start:$(date +%s):deploy[collapsed=true]\\r\\e[0KDeploy to cloud run"",
173
167
  "echo "$ENV_VARS" > ____envvars.yaml",
174
168
  "gcloud run deploy pan-test-app-dev-app --command="" --image=asia-east1-docker.pkg.dev/asdf/catladder-deploy/pan-test-app/dev/app:$DOCKER_IMAGE_TAG --project=asdf --region=asia-east1 --labels=customer-name=pan,component-name=app,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",
@@ -176,6 +170,7 @@ exports[`matches snapshot 1`] = `
176
170
  "echo -e "\\e[0Ksection_start:$(date +%s):cleanup[collapsed=true]\\r\\e[0KCleanup"",
177
171
  "gcloud run revisions list --project=asdf --region=asia-east1 --service=pan-test-app-dev-app --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",
178
172
  "gcloud artifacts docker images list asia-east1-docker.pkg.dev/asdf/catladder-deploy/pan-test-app/dev/app --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/app@$version --quiet --delete-tags; done",
173
+ "gcloud artifacts docker images list asia-east1-docker.pkg.dev/asdf/catladder-deploy/pan-test-app/caches/app --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/app@$version --quiet --delete-tags; done",
179
174
  "echo -e "\\e[0Ksection_end:$(date +%s):cleanup\\r\\e[0K"",
180
175
  "echo Uploading SBOM to Dependency Track",
181
176
  "/dtrackuploader https://dep.panter.swiss/ "$DT_KEY_PROD" upload "pan-test-app/app" "https://pan-test-app-dev-app-unknown-host.example.com" "__sbom.json" vex.json || true",
@@ -196,14 +191,12 @@ exports[`matches snapshot 1`] = `
196
191
  "BUILD_INFO_ID": "some-id",
197
192
  "CLOUDSDK_CORE_DISABLE_PROMPTS": "1",
198
193
  "DOCKER_BUILDKIT": "1",
199
- "DOCKER_CACHE_IMAGE": "$DOCKER_REGISTRY_IMAGE_PATH/caches/app",
194
+ "DOCKER_CACHE_IMAGE": "asia-east1-docker.pkg.dev/asdf/catladder-deploy/pan-test-app/caches/app",
200
195
  "DOCKER_DRIVER": "overlay2",
201
196
  "DOCKER_HOST": "tcp://0.0.0.0:2375",
202
- "DOCKER_IMAGE": "$DOCKER_REGISTRY_IMAGE_PATH/$DOCKER_IMAGE_NAME",
203
- "DOCKER_IMAGE_NAME": "dev/app",
197
+ "DOCKER_IMAGE": "asia-east1-docker.pkg.dev/asdf/catladder-deploy/pan-test-app/dev/app",
204
198
  "DOCKER_IMAGE_TAG": "$CI_COMMIT_SHA",
205
- "DOCKER_REGISTRY": "$CI_REGISTRY",
206
- "DOCKER_REGISTRY_IMAGE_PATH": "$CI_REGISTRY_IMAGE",
199
+ "DOCKER_REGISTRY": "asia-east1-docker.pkg.dev",
207
200
  "DOCKER_TLS_CERTDIR": "",
208
201
  "ENV_SHORT": "dev",
209
202
  "ENV_TYPE": "dev",
@@ -265,6 +258,7 @@ _ALL_ENV_VAR_KEYS: '["ENV_SHORT","APP_DIR","ENV_TYPE","BUILD_INFO_ID","BUILD_INF
265
258
  "gcloud auth activate-service-account --key-file="./____keyfile.json"",
266
259
  "gcloud run services delete pan-test-app-dev-app --project=asdf --region=asia-east1",
267
260
  "gcloud artifacts docker images delete asia-east1-docker.pkg.dev/asdf/catladder-deploy/pan-test-app/dev/app --quiet --delete-tags",
261
+ "gcloud artifacts docker images list asia-east1-docker.pkg.dev/asdf/catladder-deploy/pan-test-app/caches/app --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/app@$version --quiet --delete-tags; done",
268
262
  "echo Disabling component in Dependency Track",
269
263
  "/dtrackuploader https://dep.panter.swiss/ "$DT_KEY_PROD" disable "pan-test-app/app" "https://pan-test-app-dev-app-unknown-host.example.com" || true",
270
264
  "set -e",
@@ -443,7 +437,10 @@ _ALL_ENV_VAR_KEYS: '["ENV_SHORT","APP_DIR","ENV_TYPE","BUILD_INFO_ID","BUILD_INF
443
437
  },
444
438
  "script": [
445
439
  "echo -e "\\e[0Ksection_start:$(date +%s):docker-login[collapsed=true]\\r\\e[0KDocker Login"",
446
- "docker login --username gitlab-ci-token --password $CI_JOB_TOKEN $CI_REGISTRY",
440
+ "echo $CL_review_app_GCLOUD_DEPLOY_credentialsKey > ./____keyfile.json
441
+ ",
442
+ "gcloud auth activate-service-account --key-file="./____keyfile.json"",
443
+ "gcloud auth configure-docker asia-east1-docker.pkg.dev",
447
444
  "echo -e "\\e[0Ksection_end:$(date +%s):docker-login\\r\\e[0K"",
448
445
  "echo -e "\\e[0Ksection_start:$(date +%s):docker-build[collapsed=true]\\r\\e[0KDocker build"",
449
446
  "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",
@@ -468,15 +465,13 @@ _ALL_ENV_VAR_KEYS: '["ENV_SHORT","APP_DIR","ENV_TYPE","BUILD_INFO_ID","BUILD_INF
468
465
  "DOCKERFILE_ADDITIONS": undefined,
469
466
  "DOCKERFILE_ADDITIONS_END": undefined,
470
467
  "DOCKER_BUILDKIT": "1",
471
- "DOCKER_CACHE_IMAGE": "$DOCKER_REGISTRY_IMAGE_PATH/caches/app",
468
+ "DOCKER_CACHE_IMAGE": "asia-east1-docker.pkg.dev/asdf/catladder-deploy/pan-test-app/caches/app",
472
469
  "DOCKER_DIR": ".",
473
470
  "DOCKER_DRIVER": "overlay2",
474
471
  "DOCKER_HOST": "tcp://0.0.0.0:2375",
475
- "DOCKER_IMAGE": "$DOCKER_REGISTRY_IMAGE_PATH/$DOCKER_IMAGE_NAME",
476
- "DOCKER_IMAGE_NAME": "review/app",
472
+ "DOCKER_IMAGE": "asia-east1-docker.pkg.dev/asdf/catladder-deploy/pan-test-app/review/app/mr1234",
477
473
  "DOCKER_IMAGE_TAG": "$CI_COMMIT_SHA",
478
- "DOCKER_REGISTRY": "$CI_REGISTRY",
479
- "DOCKER_REGISTRY_IMAGE_PATH": "$CI_REGISTRY_IMAGE",
474
+ "DOCKER_REGISTRY": "asia-east1-docker.pkg.dev",
480
475
  "DOCKER_TLS_CERTDIR": "",
481
476
  "KUBERNETES_CPU_LIMIT": "1",
482
477
  "KUBERNETES_CPU_REQUEST": "0.5",
@@ -533,13 +528,6 @@ _ALL_ENV_VAR_KEYS: '["ENV_SHORT","APP_DIR","ENV_TYPE","BUILD_INFO_ID","BUILD_INF
533
528
  "export GCLOUD_PROJECT_NUMBER=$(gcloud projects describe asdf --format="value(projectNumber)")",
534
529
  "echo "GCLOUD_PROJECT_NUMBER: $GCLOUD_PROJECT_NUMBER"",
535
530
  "echo -e "\\e[0Ksection_end:$(date +%s):prepare\\r\\e[0K"",
536
- "echo -e "\\e[0Ksection_start:$(date +%s):pushToArtifactRegistry[collapsed=true]\\r\\e[0KPushing image to artifacts registry"",
537
- "docker login --username gitlab-ci-token --password $CI_JOB_TOKEN $CI_REGISTRY",
538
- "gcloud auth configure-docker asia-east1-docker.pkg.dev",
539
- "docker pull $DOCKER_IMAGE:$DOCKER_IMAGE_TAG",
540
- "docker tag $DOCKER_IMAGE:$DOCKER_IMAGE_TAG asia-east1-docker.pkg.dev/asdf/catladder-deploy/pan-test-app/review/app/mr1234:$DOCKER_IMAGE_TAG",
541
- "docker push asia-east1-docker.pkg.dev/asdf/catladder-deploy/pan-test-app/review/app/mr1234:$DOCKER_IMAGE_TAG",
542
- "echo -e "\\e[0Ksection_end:$(date +%s):pushToArtifactRegistry\\r\\e[0K"",
543
531
  "echo -e "\\e[0Ksection_start:$(date +%s):deploy[collapsed=true]\\r\\e[0KDeploy to cloud run"",
544
532
  "echo "$ENV_VARS" > ____envvars.yaml",
545
533
  "gcloud run deploy pan-test-app-review-mr1234-app --command="" --image=asia-east1-docker.pkg.dev/asdf/catladder-deploy/pan-test-app/review/app/mr1234:$DOCKER_IMAGE_TAG --project=asdf --region=asia-east1 --labels=customer-name=pan,component-name=app,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",
@@ -547,6 +535,7 @@ _ALL_ENV_VAR_KEYS: '["ENV_SHORT","APP_DIR","ENV_TYPE","BUILD_INFO_ID","BUILD_INF
547
535
  "echo -e "\\e[0Ksection_start:$(date +%s):cleanup[collapsed=true]\\r\\e[0KCleanup"",
548
536
  "gcloud run revisions list --project=asdf --region=asia-east1 --service=pan-test-app-review-mr1234-app --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",
549
537
  "gcloud artifacts docker images list asia-east1-docker.pkg.dev/asdf/catladder-deploy/pan-test-app/review/app/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/app/mr1234@$version --quiet --delete-tags; done",
538
+ "gcloud artifacts docker images list asia-east1-docker.pkg.dev/asdf/catladder-deploy/pan-test-app/caches/app --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/app@$version --quiet --delete-tags; done",
550
539
  "set +e",
551
540
  "gcloud artifacts docker images delete asia-east1-docker.pkg.dev/asdf/catladder-deploy/pan-test-app/review/app --quiet --delete-tags",
552
541
  "set -e",
@@ -570,14 +559,12 @@ _ALL_ENV_VAR_KEYS: '["ENV_SHORT","APP_DIR","ENV_TYPE","BUILD_INFO_ID","BUILD_INF
570
559
  "BUILD_INFO_ID": "some-id",
571
560
  "CLOUDSDK_CORE_DISABLE_PROMPTS": "1",
572
561
  "DOCKER_BUILDKIT": "1",
573
- "DOCKER_CACHE_IMAGE": "$DOCKER_REGISTRY_IMAGE_PATH/caches/app",
562
+ "DOCKER_CACHE_IMAGE": "asia-east1-docker.pkg.dev/asdf/catladder-deploy/pan-test-app/caches/app",
574
563
  "DOCKER_DRIVER": "overlay2",
575
564
  "DOCKER_HOST": "tcp://0.0.0.0:2375",
576
- "DOCKER_IMAGE": "$DOCKER_REGISTRY_IMAGE_PATH/$DOCKER_IMAGE_NAME",
577
- "DOCKER_IMAGE_NAME": "review/app",
565
+ "DOCKER_IMAGE": "asia-east1-docker.pkg.dev/asdf/catladder-deploy/pan-test-app/review/app/mr1234",
578
566
  "DOCKER_IMAGE_TAG": "$CI_COMMIT_SHA",
579
- "DOCKER_REGISTRY": "$CI_REGISTRY",
580
- "DOCKER_REGISTRY_IMAGE_PATH": "$CI_REGISTRY_IMAGE",
567
+ "DOCKER_REGISTRY": "asia-east1-docker.pkg.dev",
581
568
  "DOCKER_TLS_CERTDIR": "",
582
569
  "ENV_SHORT": "review",
583
570
  "ENV_TYPE": "review",
@@ -639,6 +626,7 @@ _ALL_ENV_VAR_KEYS: '["ENV_SHORT","APP_DIR","ENV_TYPE","BUILD_INFO_ID","BUILD_INF
639
626
  "gcloud auth activate-service-account --key-file="./____keyfile.json"",
640
627
  "gcloud run services delete pan-test-app-review-mr1234-app --project=asdf --region=asia-east1",
641
628
  "gcloud artifacts docker images delete asia-east1-docker.pkg.dev/asdf/catladder-deploy/pan-test-app/review/app/mr1234 --quiet --delete-tags",
629
+ "gcloud artifacts docker images list asia-east1-docker.pkg.dev/asdf/catladder-deploy/pan-test-app/caches/app --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/app@$version --quiet --delete-tags; done",
642
630
  "set +e",
643
631
  "gcloud artifacts docker images delete asia-east1-docker.pkg.dev/asdf/catladder-deploy/pan-test-app/review/app --quiet --delete-tags",
644
632
  "set -e",
@@ -872,7 +860,10 @@ _ALL_ENV_VAR_KEYS: '["ENV_SHORT","APP_DIR","ENV_TYPE","BUILD_INFO_ID","BUILD_INF
872
860
  },
873
861
  "script": [
874
862
  "echo -e "\\e[0Ksection_start:$(date +%s):docker-login[collapsed=true]\\r\\e[0KDocker Login"",
875
- "docker login --username gitlab-ci-token --password $CI_JOB_TOKEN $CI_REGISTRY",
863
+ "echo $CL_prod_app_GCLOUD_DEPLOY_credentialsKey > ./____keyfile.json
864
+ ",
865
+ "gcloud auth activate-service-account --key-file="./____keyfile.json"",
866
+ "gcloud auth configure-docker asia-east1-docker.pkg.dev",
876
867
  "echo -e "\\e[0Ksection_end:$(date +%s):docker-login\\r\\e[0K"",
877
868
  "echo -e "\\e[0Ksection_start:$(date +%s):docker-build[collapsed=true]\\r\\e[0KDocker build"",
878
869
  "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",
@@ -897,15 +888,13 @@ _ALL_ENV_VAR_KEYS: '["ENV_SHORT","APP_DIR","ENV_TYPE","BUILD_INFO_ID","BUILD_INF
897
888
  "DOCKERFILE_ADDITIONS": undefined,
898
889
  "DOCKERFILE_ADDITIONS_END": undefined,
899
890
  "DOCKER_BUILDKIT": "1",
900
- "DOCKER_CACHE_IMAGE": "$DOCKER_REGISTRY_IMAGE_PATH/caches/app",
891
+ "DOCKER_CACHE_IMAGE": "asia-east1-docker.pkg.dev/asdf/catladder-deploy/pan-test-app/caches/app",
901
892
  "DOCKER_DIR": ".",
902
893
  "DOCKER_DRIVER": "overlay2",
903
894
  "DOCKER_HOST": "tcp://0.0.0.0:2375",
904
- "DOCKER_IMAGE": "$DOCKER_REGISTRY_IMAGE_PATH/$DOCKER_IMAGE_NAME",
905
- "DOCKER_IMAGE_NAME": "prod/app",
895
+ "DOCKER_IMAGE": "asia-east1-docker.pkg.dev/asdf/catladder-deploy/pan-test-app/prod/app",
906
896
  "DOCKER_IMAGE_TAG": "$CI_COMMIT_SHA",
907
- "DOCKER_REGISTRY": "$CI_REGISTRY",
908
- "DOCKER_REGISTRY_IMAGE_PATH": "$CI_REGISTRY_IMAGE",
897
+ "DOCKER_REGISTRY": "asia-east1-docker.pkg.dev",
909
898
  "DOCKER_TLS_CERTDIR": "",
910
899
  "KUBERNETES_CPU_LIMIT": "1",
911
900
  "KUBERNETES_CPU_REQUEST": "0.5",
@@ -928,7 +917,10 @@ _ALL_ENV_VAR_KEYS: '["ENV_SHORT","APP_DIR","ENV_TYPE","BUILD_INFO_ID","BUILD_INF
928
917
  },
929
918
  "script": [
930
919
  "echo -e "\\e[0Ksection_start:$(date +%s):docker-login[collapsed=true]\\r\\e[0KDocker Login"",
931
- "docker login --username gitlab-ci-token --password $CI_JOB_TOKEN $CI_REGISTRY",
920
+ "echo $CL_stage_app_GCLOUD_DEPLOY_credentialsKey > ./____keyfile.json
921
+ ",
922
+ "gcloud auth activate-service-account --key-file="./____keyfile.json"",
923
+ "gcloud auth configure-docker asia-east1-docker.pkg.dev",
932
924
  "echo -e "\\e[0Ksection_end:$(date +%s):docker-login\\r\\e[0K"",
933
925
  "echo -e "\\e[0Ksection_start:$(date +%s):docker-build[collapsed=true]\\r\\e[0KDocker build"",
934
926
  "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",
@@ -953,15 +945,13 @@ _ALL_ENV_VAR_KEYS: '["ENV_SHORT","APP_DIR","ENV_TYPE","BUILD_INFO_ID","BUILD_INF
953
945
  "DOCKERFILE_ADDITIONS": undefined,
954
946
  "DOCKERFILE_ADDITIONS_END": undefined,
955
947
  "DOCKER_BUILDKIT": "1",
956
- "DOCKER_CACHE_IMAGE": "$DOCKER_REGISTRY_IMAGE_PATH/caches/app",
948
+ "DOCKER_CACHE_IMAGE": "asia-east1-docker.pkg.dev/asdf/catladder-deploy/pan-test-app/caches/app",
957
949
  "DOCKER_DIR": ".",
958
950
  "DOCKER_DRIVER": "overlay2",
959
951
  "DOCKER_HOST": "tcp://0.0.0.0:2375",
960
- "DOCKER_IMAGE": "$DOCKER_REGISTRY_IMAGE_PATH/$DOCKER_IMAGE_NAME",
961
- "DOCKER_IMAGE_NAME": "stage/app",
952
+ "DOCKER_IMAGE": "asia-east1-docker.pkg.dev/asdf/catladder-deploy/pan-test-app/stage/app",
962
953
  "DOCKER_IMAGE_TAG": "$CI_COMMIT_SHA",
963
- "DOCKER_REGISTRY": "$CI_REGISTRY",
964
- "DOCKER_REGISTRY_IMAGE_PATH": "$CI_REGISTRY_IMAGE",
954
+ "DOCKER_REGISTRY": "asia-east1-docker.pkg.dev",
965
955
  "DOCKER_TLS_CERTDIR": "",
966
956
  "KUBERNETES_CPU_LIMIT": "1",
967
957
  "KUBERNETES_CPU_REQUEST": "0.5",
@@ -1018,13 +1008,6 @@ _ALL_ENV_VAR_KEYS: '["ENV_SHORT","APP_DIR","ENV_TYPE","BUILD_INFO_ID","BUILD_INF
1018
1008
  "export GCLOUD_PROJECT_NUMBER=$(gcloud projects describe asdf --format="value(projectNumber)")",
1019
1009
  "echo "GCLOUD_PROJECT_NUMBER: $GCLOUD_PROJECT_NUMBER"",
1020
1010
  "echo -e "\\e[0Ksection_end:$(date +%s):prepare\\r\\e[0K"",
1021
- "echo -e "\\e[0Ksection_start:$(date +%s):pushToArtifactRegistry[collapsed=true]\\r\\e[0KPushing image to artifacts registry"",
1022
- "docker login --username gitlab-ci-token --password $CI_JOB_TOKEN $CI_REGISTRY",
1023
- "gcloud auth configure-docker asia-east1-docker.pkg.dev",
1024
- "docker pull $DOCKER_IMAGE:$DOCKER_IMAGE_TAG",
1025
- "docker tag $DOCKER_IMAGE:$DOCKER_IMAGE_TAG asia-east1-docker.pkg.dev/asdf/catladder-deploy/pan-test-app/prod/app:$DOCKER_IMAGE_TAG",
1026
- "docker push asia-east1-docker.pkg.dev/asdf/catladder-deploy/pan-test-app/prod/app:$DOCKER_IMAGE_TAG",
1027
- "echo -e "\\e[0Ksection_end:$(date +%s):pushToArtifactRegistry\\r\\e[0K"",
1028
1011
  "echo -e "\\e[0Ksection_start:$(date +%s):deploy[collapsed=true]\\r\\e[0KDeploy to cloud run"",
1029
1012
  "echo "$ENV_VARS" > ____envvars.yaml",
1030
1013
  "gcloud run deploy pan-test-app-prod-app --command="" --image=asia-east1-docker.pkg.dev/asdf/catladder-deploy/pan-test-app/prod/app:$DOCKER_IMAGE_TAG --project=asdf --region=asia-east1 --labels=customer-name=pan,component-name=app,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",
@@ -1032,6 +1015,7 @@ _ALL_ENV_VAR_KEYS: '["ENV_SHORT","APP_DIR","ENV_TYPE","BUILD_INFO_ID","BUILD_INF
1032
1015
  "echo -e "\\e[0Ksection_start:$(date +%s):cleanup[collapsed=true]\\r\\e[0KCleanup"",
1033
1016
  "gcloud run revisions list --project=asdf --region=asia-east1 --service=pan-test-app-prod-app --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",
1034
1017
  "gcloud artifacts docker images list asia-east1-docker.pkg.dev/asdf/catladder-deploy/pan-test-app/prod/app --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/app@$version --quiet --delete-tags; done",
1018
+ "gcloud artifacts docker images list asia-east1-docker.pkg.dev/asdf/catladder-deploy/pan-test-app/caches/app --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/app@$version --quiet --delete-tags; done",
1035
1019
  "echo -e "\\e[0Ksection_end:$(date +%s):cleanup\\r\\e[0K"",
1036
1020
  "echo Uploading SBOM to Dependency Track",
1037
1021
  "/dtrackuploader https://dep.panter.swiss/ "$DT_KEY_PROD" upload "pan-test-app/app" "https://pan-test-app-prod-app-unknown-host.example.com" "__sbom.json" vex.json || true",
@@ -1052,14 +1036,12 @@ _ALL_ENV_VAR_KEYS: '["ENV_SHORT","APP_DIR","ENV_TYPE","BUILD_INFO_ID","BUILD_INF
1052
1036
  "BUILD_INFO_ID": "some-id",
1053
1037
  "CLOUDSDK_CORE_DISABLE_PROMPTS": "1",
1054
1038
  "DOCKER_BUILDKIT": "1",
1055
- "DOCKER_CACHE_IMAGE": "$DOCKER_REGISTRY_IMAGE_PATH/caches/app",
1039
+ "DOCKER_CACHE_IMAGE": "asia-east1-docker.pkg.dev/asdf/catladder-deploy/pan-test-app/caches/app",
1056
1040
  "DOCKER_DRIVER": "overlay2",
1057
1041
  "DOCKER_HOST": "tcp://0.0.0.0:2375",
1058
- "DOCKER_IMAGE": "$DOCKER_REGISTRY_IMAGE_PATH/$DOCKER_IMAGE_NAME",
1059
- "DOCKER_IMAGE_NAME": "prod/app",
1042
+ "DOCKER_IMAGE": "asia-east1-docker.pkg.dev/asdf/catladder-deploy/pan-test-app/prod/app",
1060
1043
  "DOCKER_IMAGE_TAG": "$CI_COMMIT_SHA",
1061
- "DOCKER_REGISTRY": "$CI_REGISTRY",
1062
- "DOCKER_REGISTRY_IMAGE_PATH": "$CI_REGISTRY_IMAGE",
1044
+ "DOCKER_REGISTRY": "asia-east1-docker.pkg.dev",
1063
1045
  "DOCKER_TLS_CERTDIR": "",
1064
1046
  "ENV_SHORT": "prod",
1065
1047
  "ENV_TYPE": "prod",
@@ -1136,13 +1118,6 @@ _ALL_ENV_VAR_KEYS: '["ENV_SHORT","APP_DIR","ENV_TYPE","BUILD_INFO_ID","BUILD_INF
1136
1118
  "export GCLOUD_PROJECT_NUMBER=$(gcloud projects describe asdf --format="value(projectNumber)")",
1137
1119
  "echo "GCLOUD_PROJECT_NUMBER: $GCLOUD_PROJECT_NUMBER"",
1138
1120
  "echo -e "\\e[0Ksection_end:$(date +%s):prepare\\r\\e[0K"",
1139
- "echo -e "\\e[0Ksection_start:$(date +%s):pushToArtifactRegistry[collapsed=true]\\r\\e[0KPushing image to artifacts registry"",
1140
- "docker login --username gitlab-ci-token --password $CI_JOB_TOKEN $CI_REGISTRY",
1141
- "gcloud auth configure-docker asia-east1-docker.pkg.dev",
1142
- "docker pull $DOCKER_IMAGE:$DOCKER_IMAGE_TAG",
1143
- "docker tag $DOCKER_IMAGE:$DOCKER_IMAGE_TAG asia-east1-docker.pkg.dev/asdf/catladder-deploy/pan-test-app/stage/app:$DOCKER_IMAGE_TAG",
1144
- "docker push asia-east1-docker.pkg.dev/asdf/catladder-deploy/pan-test-app/stage/app:$DOCKER_IMAGE_TAG",
1145
- "echo -e "\\e[0Ksection_end:$(date +%s):pushToArtifactRegistry\\r\\e[0K"",
1146
1121
  "echo -e "\\e[0Ksection_start:$(date +%s):deploy[collapsed=true]\\r\\e[0KDeploy to cloud run"",
1147
1122
  "echo "$ENV_VARS" > ____envvars.yaml",
1148
1123
  "gcloud run deploy pan-test-app-stage-app --command="" --image=asia-east1-docker.pkg.dev/asdf/catladder-deploy/pan-test-app/stage/app:$DOCKER_IMAGE_TAG --project=asdf --region=asia-east1 --labels=customer-name=pan,component-name=app,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",
@@ -1150,6 +1125,7 @@ _ALL_ENV_VAR_KEYS: '["ENV_SHORT","APP_DIR","ENV_TYPE","BUILD_INFO_ID","BUILD_INF
1150
1125
  "echo -e "\\e[0Ksection_start:$(date +%s):cleanup[collapsed=true]\\r\\e[0KCleanup"",
1151
1126
  "gcloud run revisions list --project=asdf --region=asia-east1 --service=pan-test-app-stage-app --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",
1152
1127
  "gcloud artifacts docker images list asia-east1-docker.pkg.dev/asdf/catladder-deploy/pan-test-app/stage/app --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/app@$version --quiet --delete-tags; done",
1128
+ "gcloud artifacts docker images list asia-east1-docker.pkg.dev/asdf/catladder-deploy/pan-test-app/caches/app --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/app@$version --quiet --delete-tags; done",
1153
1129
  "echo -e "\\e[0Ksection_end:$(date +%s):cleanup\\r\\e[0K"",
1154
1130
  "echo Uploading SBOM to Dependency Track",
1155
1131
  "/dtrackuploader https://dep.panter.swiss/ "$DT_KEY_PROD" upload "pan-test-app/app" "https://pan-test-app-stage-app-unknown-host.example.com" "__sbom.json" vex.json || true",
@@ -1170,14 +1146,12 @@ _ALL_ENV_VAR_KEYS: '["ENV_SHORT","APP_DIR","ENV_TYPE","BUILD_INFO_ID","BUILD_INF
1170
1146
  "BUILD_INFO_ID": "some-id",
1171
1147
  "CLOUDSDK_CORE_DISABLE_PROMPTS": "1",
1172
1148
  "DOCKER_BUILDKIT": "1",
1173
- "DOCKER_CACHE_IMAGE": "$DOCKER_REGISTRY_IMAGE_PATH/caches/app",
1149
+ "DOCKER_CACHE_IMAGE": "asia-east1-docker.pkg.dev/asdf/catladder-deploy/pan-test-app/caches/app",
1174
1150
  "DOCKER_DRIVER": "overlay2",
1175
1151
  "DOCKER_HOST": "tcp://0.0.0.0:2375",
1176
- "DOCKER_IMAGE": "$DOCKER_REGISTRY_IMAGE_PATH/$DOCKER_IMAGE_NAME",
1177
- "DOCKER_IMAGE_NAME": "stage/app",
1152
+ "DOCKER_IMAGE": "asia-east1-docker.pkg.dev/asdf/catladder-deploy/pan-test-app/stage/app",
1178
1153
  "DOCKER_IMAGE_TAG": "$CI_COMMIT_SHA",
1179
- "DOCKER_REGISTRY": "$CI_REGISTRY",
1180
- "DOCKER_REGISTRY_IMAGE_PATH": "$CI_REGISTRY_IMAGE",
1154
+ "DOCKER_REGISTRY": "asia-east1-docker.pkg.dev",
1181
1155
  "DOCKER_TLS_CERTDIR": "",
1182
1156
  "ENV_SHORT": "stage",
1183
1157
  "ENV_TYPE": "stage",
@@ -1239,6 +1213,7 @@ _ALL_ENV_VAR_KEYS: '["ENV_SHORT","APP_DIR","ENV_TYPE","BUILD_INFO_ID","BUILD_INF
1239
1213
  "gcloud auth activate-service-account --key-file="./____keyfile.json"",
1240
1214
  "gcloud run services delete pan-test-app-prod-app --project=asdf --region=asia-east1",
1241
1215
  "gcloud artifacts docker images delete asia-east1-docker.pkg.dev/asdf/catladder-deploy/pan-test-app/prod/app --quiet --delete-tags",
1216
+ "gcloud artifacts docker images list asia-east1-docker.pkg.dev/asdf/catladder-deploy/pan-test-app/caches/app --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/app@$version --quiet --delete-tags; done",
1242
1217
  "echo Disabling component in Dependency Track",
1243
1218
  "/dtrackuploader https://dep.panter.swiss/ "$DT_KEY_PROD" disable "pan-test-app/app" "https://pan-test-app-prod-app-unknown-host.example.com" || true",
1244
1219
  "set -e",
@@ -1287,6 +1262,7 @@ _ALL_ENV_VAR_KEYS: '["ENV_SHORT","APP_DIR","ENV_TYPE","BUILD_INFO_ID","BUILD_INF
1287
1262
  "gcloud auth activate-service-account --key-file="./____keyfile.json"",
1288
1263
  "gcloud run services delete pan-test-app-stage-app --project=asdf --region=asia-east1",
1289
1264
  "gcloud artifacts docker images delete asia-east1-docker.pkg.dev/asdf/catladder-deploy/pan-test-app/stage/app --quiet --delete-tags",
1265
+ "gcloud artifacts docker images list asia-east1-docker.pkg.dev/asdf/catladder-deploy/pan-test-app/caches/app --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/app@$version --quiet --delete-tags; done",
1290
1266
  "echo Disabling component in Dependency Track",
1291
1267
  "/dtrackuploader https://dep.panter.swiss/ "$DT_KEY_PROD" disable "pan-test-app/app" "https://pan-test-app-stage-app-unknown-host.example.com" || true",
1292
1268
  "set -e",
package/examples/__snapshots__/kubernetes-application-customization.ts.snap CHANGED
@@ -286,7 +286,7 @@ application:
286
286
  "DOCKERFILE_ADDITIONS": undefined,
287
287
  "DOCKERFILE_ADDITIONS_END": undefined,
288
288
  "DOCKER_BUILDKIT": "1",
289
- "DOCKER_CACHE_IMAGE": "$DOCKER_REGISTRY_IMAGE_PATH/caches/api",
289
+ "DOCKER_CACHE_IMAGE": "$CI_REGISTRY_IMAGE/caches/api",
290
290
  "DOCKER_COPY_AND_INSTALL_APP": "COPY --chown=node:node $APP_DIR .
291
291
  RUN yarn plugin import workspace-tools
292
292
  RUN yarn workspaces focus --production && yarn rebuild",
@@ -297,11 +297,10 @@ COPY --chown=node:node .yarn /app/.yarn",
297
297
  "DOCKER_DIR": ".",
298
298
  "DOCKER_DRIVER": "overlay2",
299
299
  "DOCKER_HOST": "tcp://0.0.0.0:2375",
300
- "DOCKER_IMAGE": "$DOCKER_REGISTRY_IMAGE_PATH/$DOCKER_IMAGE_NAME",
300
+ "DOCKER_IMAGE": "$CI_REGISTRY_IMAGE/$DOCKER_IMAGE_NAME",
301
301
  "DOCKER_IMAGE_NAME": "dev/api",
302
302
  "DOCKER_IMAGE_TAG": "$CI_COMMIT_SHA",
303
303
  "DOCKER_REGISTRY": "$CI_REGISTRY",
304
- "DOCKER_REGISTRY_IMAGE_PATH": "$CI_REGISTRY_IMAGE",
305
304
  "DOCKER_TLS_CERTDIR": "",
306
305
  "KUBERNETES_CPU_LIMIT": "1",
307
306
  "KUBERNETES_CPU_REQUEST": "0.5",
@@ -376,12 +375,11 @@ COPY --chown=node:node .yarn /app/.yarn",
376
375
  "BUILD_INFO_CURRENT_VERSION": "3.2.1",
377
376
  "BUILD_INFO_ID": "some-id",
378
377
  "COMPONENT_NAME": "api",
379
- "DOCKER_CACHE_IMAGE": "$DOCKER_REGISTRY_IMAGE_PATH/caches/api",
380
- "DOCKER_IMAGE": "$DOCKER_REGISTRY_IMAGE_PATH/$DOCKER_IMAGE_NAME",
378
+ "DOCKER_CACHE_IMAGE": "$CI_REGISTRY_IMAGE/caches/api",
379
+ "DOCKER_IMAGE": "$CI_REGISTRY_IMAGE/$DOCKER_IMAGE_NAME",
381
380
  "DOCKER_IMAGE_NAME": "dev/api",
382
381
  "DOCKER_IMAGE_TAG": "$CI_COMMIT_SHA",
383
382
  "DOCKER_REGISTRY": "$CI_REGISTRY",
384
- "DOCKER_REGISTRY_IMAGE_PATH": "$CI_REGISTRY_IMAGE",
385
383
  "ENV_SHORT": "dev",
386
384
  "ENV_TYPE": "dev",
387
385
  "HELM_ARGS": "",
@@ -1002,7 +1000,7 @@ application:
1002
1000
  "DOCKERFILE_ADDITIONS": undefined,
1003
1001
  "DOCKERFILE_ADDITIONS_END": undefined,
1004
1002
  "DOCKER_BUILDKIT": "1",
1005
- "DOCKER_CACHE_IMAGE": "$DOCKER_REGISTRY_IMAGE_PATH/caches/api",
1003
+ "DOCKER_CACHE_IMAGE": "$CI_REGISTRY_IMAGE/caches/api",
1006
1004
  "DOCKER_COPY_AND_INSTALL_APP": "COPY --chown=node:node $APP_DIR .
1007
1005
  RUN yarn plugin import workspace-tools
1008
1006
  RUN yarn workspaces focus --production && yarn rebuild",
@@ -1013,11 +1011,10 @@ COPY --chown=node:node .yarn /app/.yarn",
1013
1011
  "DOCKER_DIR": ".",
1014
1012
  "DOCKER_DRIVER": "overlay2",
1015
1013
  "DOCKER_HOST": "tcp://0.0.0.0:2375",
1016
- "DOCKER_IMAGE": "$DOCKER_REGISTRY_IMAGE_PATH/$DOCKER_IMAGE_NAME",
1014
+ "DOCKER_IMAGE": "$CI_REGISTRY_IMAGE/$DOCKER_IMAGE_NAME",
1017
1015
  "DOCKER_IMAGE_NAME": "review/api",
1018
1016
  "DOCKER_IMAGE_TAG": "$CI_COMMIT_SHA",
1019
1017
  "DOCKER_REGISTRY": "$CI_REGISTRY",
1020
- "DOCKER_REGISTRY_IMAGE_PATH": "$CI_REGISTRY_IMAGE",
1021
1018
  "DOCKER_TLS_CERTDIR": "",
1022
1019
  "KUBERNETES_CPU_LIMIT": "1",
1023
1020
  "KUBERNETES_CPU_REQUEST": "0.5",
@@ -1092,12 +1089,11 @@ COPY --chown=node:node .yarn /app/.yarn",
1092
1089
  "BUILD_INFO_CURRENT_VERSION": "3.2.1",
1093
1090
  "BUILD_INFO_ID": "some-id",
1094
1091
  "COMPONENT_NAME": "api",
1095
- "DOCKER_CACHE_IMAGE": "$DOCKER_REGISTRY_IMAGE_PATH/caches/api",
1096
- "DOCKER_IMAGE": "$DOCKER_REGISTRY_IMAGE_PATH/$DOCKER_IMAGE_NAME",
1092
+ "DOCKER_CACHE_IMAGE": "$CI_REGISTRY_IMAGE/caches/api",
1093
+ "DOCKER_IMAGE": "$CI_REGISTRY_IMAGE/$DOCKER_IMAGE_NAME",
1097
1094
  "DOCKER_IMAGE_NAME": "review/api",
1098
1095
  "DOCKER_IMAGE_TAG": "$CI_COMMIT_SHA",
1099
1096
  "DOCKER_REGISTRY": "$CI_REGISTRY",
1100
- "DOCKER_REGISTRY_IMAGE_PATH": "$CI_REGISTRY_IMAGE",
1101
1097
  "ENV_SHORT": "review",
1102
1098
  "ENV_TYPE": "review",
1103
1099
  "HELM_ARGS": "",
@@ -1855,7 +1851,7 @@ application:
1855
1851
  "DOCKERFILE_ADDITIONS": undefined,
1856
1852
  "DOCKERFILE_ADDITIONS_END": undefined,
1857
1853
  "DOCKER_BUILDKIT": "1",
1858
- "DOCKER_CACHE_IMAGE": "$DOCKER_REGISTRY_IMAGE_PATH/caches/api",
1854
+ "DOCKER_CACHE_IMAGE": "$CI_REGISTRY_IMAGE/caches/api",
1859
1855
  "DOCKER_COPY_AND_INSTALL_APP": "COPY --chown=node:node $APP_DIR .
1860
1856
  RUN yarn plugin import workspace-tools
1861
1857
  RUN yarn workspaces focus --production && yarn rebuild",
@@ -1866,11 +1862,10 @@ COPY --chown=node:node .yarn /app/.yarn",
1866
1862
  "DOCKER_DIR": ".",
1867
1863
  "DOCKER_DRIVER": "overlay2",
1868
1864
  "DOCKER_HOST": "tcp://0.0.0.0:2375",
1869
- "DOCKER_IMAGE": "$DOCKER_REGISTRY_IMAGE_PATH/$DOCKER_IMAGE_NAME",
1865
+ "DOCKER_IMAGE": "$CI_REGISTRY_IMAGE/$DOCKER_IMAGE_NAME",
1870
1866
  "DOCKER_IMAGE_NAME": "prod/api",
1871
1867
  "DOCKER_IMAGE_TAG": "$CI_COMMIT_SHA",
1872
1868
  "DOCKER_REGISTRY": "$CI_REGISTRY",
1873
- "DOCKER_REGISTRY_IMAGE_PATH": "$CI_REGISTRY_IMAGE",
1874
1869
  "DOCKER_TLS_CERTDIR": "",
1875
1870
  "KUBERNETES_CPU_LIMIT": "1",
1876
1871
  "KUBERNETES_CPU_REQUEST": "0.5",
@@ -1928,7 +1923,7 @@ COPY --chown=node:node .yarn /app/.yarn",
1928
1923
  "DOCKERFILE_ADDITIONS": undefined,
1929
1924
  "DOCKERFILE_ADDITIONS_END": undefined,
1930
1925
  "DOCKER_BUILDKIT": "1",
1931
- "DOCKER_CACHE_IMAGE": "$DOCKER_REGISTRY_IMAGE_PATH/caches/api",
1926
+ "DOCKER_CACHE_IMAGE": "$CI_REGISTRY_IMAGE/caches/api",
1932
1927
  "DOCKER_COPY_AND_INSTALL_APP": "COPY --chown=node:node $APP_DIR .
1933
1928
  RUN yarn plugin import workspace-tools
1934
1929
  RUN yarn workspaces focus --production && yarn rebuild",
@@ -1939,11 +1934,10 @@ COPY --chown=node:node .yarn /app/.yarn",
1939
1934
  "DOCKER_DIR": ".",
1940
1935
  "DOCKER_DRIVER": "overlay2",
1941
1936
  "DOCKER_HOST": "tcp://0.0.0.0:2375",
1942
- "DOCKER_IMAGE": "$DOCKER_REGISTRY_IMAGE_PATH/$DOCKER_IMAGE_NAME",
1937
+ "DOCKER_IMAGE": "$CI_REGISTRY_IMAGE/$DOCKER_IMAGE_NAME",
1943
1938
  "DOCKER_IMAGE_NAME": "stage/api",
1944
1939
  "DOCKER_IMAGE_TAG": "$CI_COMMIT_SHA",
1945
1940
  "DOCKER_REGISTRY": "$CI_REGISTRY",
1946
- "DOCKER_REGISTRY_IMAGE_PATH": "$CI_REGISTRY_IMAGE",
1947
1941
  "DOCKER_TLS_CERTDIR": "",
1948
1942
  "KUBERNETES_CPU_LIMIT": "1",
1949
1943
  "KUBERNETES_CPU_REQUEST": "0.5",
@@ -2006,12 +2000,11 @@ COPY --chown=node:node .yarn /app/.yarn",
2006
2000
  "BUILD_INFO_CURRENT_VERSION": "3.2.1",
2007
2001
  "BUILD_INFO_ID": "some-id",
2008
2002
  "COMPONENT_NAME": "api",
2009
- "DOCKER_CACHE_IMAGE": "$DOCKER_REGISTRY_IMAGE_PATH/caches/api",
2010
- "DOCKER_IMAGE": "$DOCKER_REGISTRY_IMAGE_PATH/$DOCKER_IMAGE_NAME",
2003
+ "DOCKER_CACHE_IMAGE": "$CI_REGISTRY_IMAGE/caches/api",
2004
+ "DOCKER_IMAGE": "$CI_REGISTRY_IMAGE/$DOCKER_IMAGE_NAME",
2011
2005
  "DOCKER_IMAGE_NAME": "prod/api",
2012
2006
  "DOCKER_IMAGE_TAG": "$CI_COMMIT_SHA",
2013
2007
  "DOCKER_REGISTRY": "$CI_REGISTRY",
2014
- "DOCKER_REGISTRY_IMAGE_PATH": "$CI_REGISTRY_IMAGE",
2015
2008
  "ENV_SHORT": "prod",
2016
2009
  "ENV_TYPE": "prod",
2017
2010
  "HELM_ARGS": "",
@@ -2130,12 +2123,11 @@ application:
2130
2123
  "BUILD_INFO_CURRENT_VERSION": "3.2.1",
2131
2124
  "BUILD_INFO_ID": "some-id",
2132
2125
  "COMPONENT_NAME": "api",
2133
- "DOCKER_CACHE_IMAGE": "$DOCKER_REGISTRY_IMAGE_PATH/caches/api",
2134
- "DOCKER_IMAGE": "$DOCKER_REGISTRY_IMAGE_PATH/$DOCKER_IMAGE_NAME",
2126
+ "DOCKER_CACHE_IMAGE": "$CI_REGISTRY_IMAGE/caches/api",
2127
+ "DOCKER_IMAGE": "$CI_REGISTRY_IMAGE/$DOCKER_IMAGE_NAME",
2135
2128
  "DOCKER_IMAGE_NAME": "stage/api",
2136
2129
  "DOCKER_IMAGE_TAG": "$CI_COMMIT_SHA",
2137
2130
  "DOCKER_REGISTRY": "$CI_REGISTRY",
2138
- "DOCKER_REGISTRY_IMAGE_PATH": "$CI_REGISTRY_IMAGE",
2139
2131
  "ENV_SHORT": "stage",
2140
2132
  "ENV_TYPE": "stage",
2141
2133
  "HELM_ARGS": "",
package/examples/__snapshots__/kubernetes-with-cloud-sql-legacy.ts.snap CHANGED
@@ -284,7 +284,7 @@ cloudsql:
284
284
  "DOCKERFILE_ADDITIONS": undefined,
285
285
  "DOCKERFILE_ADDITIONS_END": undefined,
286
286
  "DOCKER_BUILDKIT": "1",
287
- "DOCKER_CACHE_IMAGE": "$DOCKER_REGISTRY_IMAGE_PATH/caches/api",
287
+ "DOCKER_CACHE_IMAGE": "$CI_REGISTRY_IMAGE/caches/api",
288
288
  "DOCKER_COPY_AND_INSTALL_APP": "COPY --chown=node:node $APP_DIR .
289
289
  RUN yarn plugin import workspace-tools
290
290
  RUN yarn workspaces focus --production && yarn rebuild",
@@ -295,11 +295,10 @@ COPY --chown=node:node .yarn /app/.yarn",
295
295
  "DOCKER_DIR": ".",
296
296
  "DOCKER_DRIVER": "overlay2",
297
297
  "DOCKER_HOST": "tcp://0.0.0.0:2375",
298
- "DOCKER_IMAGE": "$DOCKER_REGISTRY_IMAGE_PATH/$DOCKER_IMAGE_NAME",
298
+ "DOCKER_IMAGE": "$CI_REGISTRY_IMAGE/$DOCKER_IMAGE_NAME",
299
299
  "DOCKER_IMAGE_NAME": "dev/api",
300
300
  "DOCKER_IMAGE_TAG": "$CI_COMMIT_SHA",
301
301
  "DOCKER_REGISTRY": "$CI_REGISTRY",
302
- "DOCKER_REGISTRY_IMAGE_PATH": "$CI_REGISTRY_IMAGE",
303
302
  "DOCKER_TLS_CERTDIR": "",
304
303
  "KUBERNETES_CPU_LIMIT": "1",
305
304
  "KUBERNETES_CPU_REQUEST": "0.5",
@@ -374,12 +373,11 @@ COPY --chown=node:node .yarn /app/.yarn",
374
373
  "BUILD_INFO_CURRENT_VERSION": "3.2.1",
375
374
  "BUILD_INFO_ID": "some-id",
376
375
  "COMPONENT_NAME": "api",
377
- "DOCKER_CACHE_IMAGE": "$DOCKER_REGISTRY_IMAGE_PATH/caches/api",
378
- "DOCKER_IMAGE": "$DOCKER_REGISTRY_IMAGE_PATH/$DOCKER_IMAGE_NAME",
376
+ "DOCKER_CACHE_IMAGE": "$CI_REGISTRY_IMAGE/caches/api",
377
+ "DOCKER_IMAGE": "$CI_REGISTRY_IMAGE/$DOCKER_IMAGE_NAME",
379
378
  "DOCKER_IMAGE_NAME": "dev/api",
380
379
  "DOCKER_IMAGE_TAG": "$CI_COMMIT_SHA",
381
380
  "DOCKER_REGISTRY": "$CI_REGISTRY",
382
- "DOCKER_REGISTRY_IMAGE_PATH": "$CI_REGISTRY_IMAGE",
383
381
  "ENV_SHORT": "dev",
384
382
  "ENV_TYPE": "dev",
385
383
  "HELM_ARGS": "",
@@ -990,7 +988,7 @@ cloudsql:
990
988
  "DOCKERFILE_ADDITIONS": undefined,
991
989
  "DOCKERFILE_ADDITIONS_END": undefined,
992
990
  "DOCKER_BUILDKIT": "1",
993
- "DOCKER_CACHE_IMAGE": "$DOCKER_REGISTRY_IMAGE_PATH/caches/api",
991
+ "DOCKER_CACHE_IMAGE": "$CI_REGISTRY_IMAGE/caches/api",
994
992
  "DOCKER_COPY_AND_INSTALL_APP": "COPY --chown=node:node $APP_DIR .
995
993
  RUN yarn plugin import workspace-tools
996
994
  RUN yarn workspaces focus --production && yarn rebuild",
@@ -1001,11 +999,10 @@ COPY --chown=node:node .yarn /app/.yarn",
1001
999
  "DOCKER_DIR": ".",
1002
1000
  "DOCKER_DRIVER": "overlay2",
1003
1001
  "DOCKER_HOST": "tcp://0.0.0.0:2375",
1004
- "DOCKER_IMAGE": "$DOCKER_REGISTRY_IMAGE_PATH/$DOCKER_IMAGE_NAME",
1002
+ "DOCKER_IMAGE": "$CI_REGISTRY_IMAGE/$DOCKER_IMAGE_NAME",
1005
1003
  "DOCKER_IMAGE_NAME": "review/api",
1006
1004
  "DOCKER_IMAGE_TAG": "$CI_COMMIT_SHA",
1007
1005
  "DOCKER_REGISTRY": "$CI_REGISTRY",
1008
- "DOCKER_REGISTRY_IMAGE_PATH": "$CI_REGISTRY_IMAGE",
1009
1006
  "DOCKER_TLS_CERTDIR": "",
1010
1007
  "KUBERNETES_CPU_LIMIT": "1",
1011
1008
  "KUBERNETES_CPU_REQUEST": "0.5",
@@ -1080,12 +1077,11 @@ COPY --chown=node:node .yarn /app/.yarn",
1080
1077
  "BUILD_INFO_CURRENT_VERSION": "3.2.1",
1081
1078
  "BUILD_INFO_ID": "some-id",
1082
1079
  "COMPONENT_NAME": "api",
1083
- "DOCKER_CACHE_IMAGE": "$DOCKER_REGISTRY_IMAGE_PATH/caches/api",
1084
- "DOCKER_IMAGE": "$DOCKER_REGISTRY_IMAGE_PATH/$DOCKER_IMAGE_NAME",
1080
+ "DOCKER_CACHE_IMAGE": "$CI_REGISTRY_IMAGE/caches/api",
1081
+ "DOCKER_IMAGE": "$CI_REGISTRY_IMAGE/$DOCKER_IMAGE_NAME",
1085
1082
  "DOCKER_IMAGE_NAME": "review/api",
1086
1083
  "DOCKER_IMAGE_TAG": "$CI_COMMIT_SHA",
1087
1084
  "DOCKER_REGISTRY": "$CI_REGISTRY",
1088
- "DOCKER_REGISTRY_IMAGE_PATH": "$CI_REGISTRY_IMAGE",
1089
1085
  "ENV_SHORT": "review",
1090
1086
  "ENV_TYPE": "review",
1091
1087
  "HELM_ARGS": "",
@@ -1831,7 +1827,7 @@ cloudsql:
1831
1827
  "DOCKERFILE_ADDITIONS": undefined,
1832
1828
  "DOCKERFILE_ADDITIONS_END": undefined,
1833
1829
  "DOCKER_BUILDKIT": "1",
1834
- "DOCKER_CACHE_IMAGE": "$DOCKER_REGISTRY_IMAGE_PATH/caches/api",
1830
+ "DOCKER_CACHE_IMAGE": "$CI_REGISTRY_IMAGE/caches/api",
1835
1831
  "DOCKER_COPY_AND_INSTALL_APP": "COPY --chown=node:node $APP_DIR .
1836
1832
  RUN yarn plugin import workspace-tools
1837
1833
  RUN yarn workspaces focus --production && yarn rebuild",
@@ -1842,11 +1838,10 @@ COPY --chown=node:node .yarn /app/.yarn",
1842
1838
  "DOCKER_DIR": ".",
1843
1839
  "DOCKER_DRIVER": "overlay2",
1844
1840
  "DOCKER_HOST": "tcp://0.0.0.0:2375",
1845
- "DOCKER_IMAGE": "$DOCKER_REGISTRY_IMAGE_PATH/$DOCKER_IMAGE_NAME",
1841
+ "DOCKER_IMAGE": "$CI_REGISTRY_IMAGE/$DOCKER_IMAGE_NAME",
1846
1842
  "DOCKER_IMAGE_NAME": "prod/api",
1847
1843
  "DOCKER_IMAGE_TAG": "$CI_COMMIT_SHA",
1848
1844
  "DOCKER_REGISTRY": "$CI_REGISTRY",
1849
- "DOCKER_REGISTRY_IMAGE_PATH": "$CI_REGISTRY_IMAGE",
1850
1845
  "DOCKER_TLS_CERTDIR": "",
1851
1846
  "KUBERNETES_CPU_LIMIT": "1",
1852
1847
  "KUBERNETES_CPU_REQUEST": "0.5",
@@ -1904,7 +1899,7 @@ COPY --chown=node:node .yarn /app/.yarn",
1904
1899
  "DOCKERFILE_ADDITIONS": undefined,
1905
1900
  "DOCKERFILE_ADDITIONS_END": undefined,
1906
1901
  "DOCKER_BUILDKIT": "1",
1907
- "DOCKER_CACHE_IMAGE": "$DOCKER_REGISTRY_IMAGE_PATH/caches/api",
1902
+ "DOCKER_CACHE_IMAGE": "$CI_REGISTRY_IMAGE/caches/api",
1908
1903
  "DOCKER_COPY_AND_INSTALL_APP": "COPY --chown=node:node $APP_DIR .
1909
1904
  RUN yarn plugin import workspace-tools
1910
1905
  RUN yarn workspaces focus --production && yarn rebuild",
@@ -1915,11 +1910,10 @@ COPY --chown=node:node .yarn /app/.yarn",
1915
1910
  "DOCKER_DIR": ".",
1916
1911
  "DOCKER_DRIVER": "overlay2",
1917
1912
  "DOCKER_HOST": "tcp://0.0.0.0:2375",
1918
- "DOCKER_IMAGE": "$DOCKER_REGISTRY_IMAGE_PATH/$DOCKER_IMAGE_NAME",
1913
+ "DOCKER_IMAGE": "$CI_REGISTRY_IMAGE/$DOCKER_IMAGE_NAME",
1919
1914
  "DOCKER_IMAGE_NAME": "stage/api",
1920
1915
  "DOCKER_IMAGE_TAG": "$CI_COMMIT_SHA",
1921
1916
  "DOCKER_REGISTRY": "$CI_REGISTRY",
1922
- "DOCKER_REGISTRY_IMAGE_PATH": "$CI_REGISTRY_IMAGE",
1923
1917
  "DOCKER_TLS_CERTDIR": "",
1924
1918
  "KUBERNETES_CPU_LIMIT": "1",
1925
1919
  "KUBERNETES_CPU_REQUEST": "0.5",
@@ -1982,12 +1976,11 @@ COPY --chown=node:node .yarn /app/.yarn",
1982
1976
  "BUILD_INFO_CURRENT_VERSION": "3.2.1",
1983
1977
  "BUILD_INFO_ID": "some-id",
1984
1978
  "COMPONENT_NAME": "api",
1985
- "DOCKER_CACHE_IMAGE": "$DOCKER_REGISTRY_IMAGE_PATH/caches/api",
1986
- "DOCKER_IMAGE": "$DOCKER_REGISTRY_IMAGE_PATH/$DOCKER_IMAGE_NAME",
1979
+ "DOCKER_CACHE_IMAGE": "$CI_REGISTRY_IMAGE/caches/api",
1980
+ "DOCKER_IMAGE": "$CI_REGISTRY_IMAGE/$DOCKER_IMAGE_NAME",
1987
1981
  "DOCKER_IMAGE_NAME": "prod/api",
1988
1982
  "DOCKER_IMAGE_TAG": "$CI_COMMIT_SHA",
1989
1983
  "DOCKER_REGISTRY": "$CI_REGISTRY",
1990
- "DOCKER_REGISTRY_IMAGE_PATH": "$CI_REGISTRY_IMAGE",
1991
1984
  "ENV_SHORT": "prod",
1992
1985
  "ENV_TYPE": "prod",
1993
1986
  "HELM_ARGS": "",
@@ -2102,12 +2095,11 @@ cloudsql:
2102
2095
  "BUILD_INFO_CURRENT_VERSION": "3.2.1",
2103
2096
  "BUILD_INFO_ID": "some-id",
2104
2097
  "COMPONENT_NAME": "api",
2105
- "DOCKER_CACHE_IMAGE": "$DOCKER_REGISTRY_IMAGE_PATH/caches/api",
2106
- "DOCKER_IMAGE": "$DOCKER_REGISTRY_IMAGE_PATH/$DOCKER_IMAGE_NAME",
2098
+ "DOCKER_CACHE_IMAGE": "$CI_REGISTRY_IMAGE/caches/api",
2099
+ "DOCKER_IMAGE": "$CI_REGISTRY_IMAGE/$DOCKER_IMAGE_NAME",
2107
2100
  "DOCKER_IMAGE_NAME": "stage/api",
2108
2101
  "DOCKER_IMAGE_TAG": "$CI_COMMIT_SHA",
2109
2102
  "DOCKER_REGISTRY": "$CI_REGISTRY",
2110
- "DOCKER_REGISTRY_IMAGE_PATH": "$CI_REGISTRY_IMAGE",
2111
2103
  "ENV_SHORT": "stage",
2112
2104
  "ENV_TYPE": "stage",
2113
2105
  "HELM_ARGS": "",