@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.ts.snap CHANGED
@@ -71,7 +71,10 @@ exports[`matches snapshot 1`] = `
71
71
  "script": [
72
72
  "ensureNginxDockerfile",
73
73
  "echo -e "\\e[0Ksection_start:$(date +%s):docker-login[collapsed=true]\\r\\e[0KDocker Login"",
74
- "docker login --username gitlab-ci-token --password $CI_JOB_TOKEN $CI_REGISTRY",
74
+ "echo $CL_dev_www_GCLOUD_DEPLOY_credentialsKey > ./____keyfile.json
75
+ ",
76
+ "gcloud auth activate-service-account --key-file="./____keyfile.json"",
77
+ "gcloud auth configure-docker asia-east1-docker.pkg.dev",
75
78
  "echo -e "\\e[0Ksection_end:$(date +%s):docker-login\\r\\e[0K"",
76
79
  "echo -e "\\e[0Ksection_start:$(date +%s):docker-build[collapsed=true]\\r\\e[0KDocker build"",
77
80
  "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",
@@ -96,15 +99,13 @@ exports[`matches snapshot 1`] = `
96
99
  "DOCKERFILE_ADDITIONS": undefined,
97
100
  "DOCKERFILE_ADDITIONS_END": undefined,
98
101
  "DOCKER_BUILDKIT": "1",
99
- "DOCKER_CACHE_IMAGE": "$DOCKER_REGISTRY_IMAGE_PATH/caches/www",
102
+ "DOCKER_CACHE_IMAGE": "asia-east1-docker.pkg.dev/asdf/catladder-deploy/pan-test-app/caches/www",
100
103
  "DOCKER_DIR": ".",
101
104
  "DOCKER_DRIVER": "overlay2",
102
105
  "DOCKER_HOST": "tcp://0.0.0.0:2375",
103
- "DOCKER_IMAGE": "$DOCKER_REGISTRY_IMAGE_PATH/$DOCKER_IMAGE_NAME",
104
- "DOCKER_IMAGE_NAME": "dev/www",
106
+ "DOCKER_IMAGE": "asia-east1-docker.pkg.dev/asdf/catladder-deploy/pan-test-app/dev/www",
105
107
  "DOCKER_IMAGE_TAG": "$CI_COMMIT_SHA",
106
- "DOCKER_REGISTRY": "$CI_REGISTRY",
107
- "DOCKER_REGISTRY_IMAGE_PATH": "$CI_REGISTRY_IMAGE",
108
+ "DOCKER_REGISTRY": "asia-east1-docker.pkg.dev",
108
109
  "DOCKER_TLS_CERTDIR": "",
109
110
  "KUBERNETES_CPU_LIMIT": "1",
110
111
  "KUBERNETES_CPU_REQUEST": "0.5",
@@ -161,13 +162,6 @@ exports[`matches snapshot 1`] = `
161
162
  "export GCLOUD_PROJECT_NUMBER=$(gcloud projects describe asdf --format="value(projectNumber)")",
162
163
  "echo "GCLOUD_PROJECT_NUMBER: $GCLOUD_PROJECT_NUMBER"",
163
164
  "echo -e "\\e[0Ksection_end:$(date +%s):prepare\\r\\e[0K"",
164
- "echo -e "\\e[0Ksection_start:$(date +%s):pushToArtifactRegistry[collapsed=true]\\r\\e[0KPushing image to artifacts registry"",
165
- "docker login --username gitlab-ci-token --password $CI_JOB_TOKEN $CI_REGISTRY",
166
- "gcloud auth configure-docker asia-east1-docker.pkg.dev",
167
- "docker pull $DOCKER_IMAGE:$DOCKER_IMAGE_TAG",
168
- "docker tag $DOCKER_IMAGE:$DOCKER_IMAGE_TAG asia-east1-docker.pkg.dev/asdf/catladder-deploy/pan-test-app/dev/www:$DOCKER_IMAGE_TAG",
169
- "docker push asia-east1-docker.pkg.dev/asdf/catladder-deploy/pan-test-app/dev/www:$DOCKER_IMAGE_TAG",
170
- "echo -e "\\e[0Ksection_end:$(date +%s):pushToArtifactRegistry\\r\\e[0K"",
171
165
  "echo -e "\\e[0Ksection_start:$(date +%s):deploy[collapsed=true]\\r\\e[0KDeploy to cloud run"",
172
166
  "echo "$ENV_VARS" > ____envvars.yaml",
173
167
  "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",
@@ -175,6 +169,7 @@ exports[`matches snapshot 1`] = `
175
169
  "echo -e "\\e[0Ksection_start:$(date +%s):cleanup[collapsed=true]\\r\\e[0KCleanup"",
176
170
  "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",
177
171
  "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",
172
+ "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",
178
173
  "echo -e "\\e[0Ksection_end:$(date +%s):cleanup\\r\\e[0K"",
179
174
  "echo Uploading SBOM to Dependency Track",
180
175
  "/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",
@@ -195,14 +190,12 @@ exports[`matches snapshot 1`] = `
195
190
  "BUILD_INFO_ID": "some-id",
196
191
  "CLOUDSDK_CORE_DISABLE_PROMPTS": "1",
197
192
  "DOCKER_BUILDKIT": "1",
198
- "DOCKER_CACHE_IMAGE": "$DOCKER_REGISTRY_IMAGE_PATH/caches/www",
193
+ "DOCKER_CACHE_IMAGE": "asia-east1-docker.pkg.dev/asdf/catladder-deploy/pan-test-app/caches/www",
199
194
  "DOCKER_DRIVER": "overlay2",
200
195
  "DOCKER_HOST": "tcp://0.0.0.0:2375",
201
- "DOCKER_IMAGE": "$DOCKER_REGISTRY_IMAGE_PATH/$DOCKER_IMAGE_NAME",
202
- "DOCKER_IMAGE_NAME": "dev/www",
196
+ "DOCKER_IMAGE": "asia-east1-docker.pkg.dev/asdf/catladder-deploy/pan-test-app/dev/www",
203
197
  "DOCKER_IMAGE_TAG": "$CI_COMMIT_SHA",
204
- "DOCKER_REGISTRY": "$CI_REGISTRY",
205
- "DOCKER_REGISTRY_IMAGE_PATH": "$CI_REGISTRY_IMAGE",
198
+ "DOCKER_REGISTRY": "asia-east1-docker.pkg.dev",
206
199
  "DOCKER_TLS_CERTDIR": "",
207
200
  "ENV_SHORT": "dev",
208
201
  "ENV_TYPE": "dev",
@@ -264,6 +257,7 @@ _ALL_ENV_VAR_KEYS: '["ENV_SHORT","APP_DIR","ENV_TYPE","BUILD_INFO_ID","BUILD_INF
264
257
  "gcloud auth activate-service-account --key-file="./____keyfile.json"",
265
258
  "gcloud run services delete pan-test-app-dev-www --project=asdf --region=asia-east1",
266
259
  "gcloud artifacts docker images delete asia-east1-docker.pkg.dev/asdf/catladder-deploy/pan-test-app/dev/www --quiet --delete-tags",
260
+ "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",
267
261
  "echo Disabling component in Dependency Track",
268
262
  "/dtrackuploader https://dep.panter.swiss/ "$DT_KEY_PROD" disable "pan-test-app/www" "https://pan-test-app-dev-www-unknown-host.example.com" || true",
269
263
  "set -e",
@@ -440,7 +434,10 @@ _ALL_ENV_VAR_KEYS: '["ENV_SHORT","APP_DIR","ENV_TYPE","BUILD_INFO_ID","BUILD_INF
440
434
  "script": [
441
435
  "ensureNginxDockerfile",
442
436
  "echo -e "\\e[0Ksection_start:$(date +%s):docker-login[collapsed=true]\\r\\e[0KDocker Login"",
443
- "docker login --username gitlab-ci-token --password $CI_JOB_TOKEN $CI_REGISTRY",
437
+ "echo $CL_review_www_GCLOUD_DEPLOY_credentialsKey > ./____keyfile.json
438
+ ",
439
+ "gcloud auth activate-service-account --key-file="./____keyfile.json"",
440
+ "gcloud auth configure-docker asia-east1-docker.pkg.dev",
444
441
  "echo -e "\\e[0Ksection_end:$(date +%s):docker-login\\r\\e[0K"",
445
442
  "echo -e "\\e[0Ksection_start:$(date +%s):docker-build[collapsed=true]\\r\\e[0KDocker build"",
446
443
  "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",
@@ -465,15 +462,13 @@ _ALL_ENV_VAR_KEYS: '["ENV_SHORT","APP_DIR","ENV_TYPE","BUILD_INFO_ID","BUILD_INF
465
462
  "DOCKERFILE_ADDITIONS": undefined,
466
463
  "DOCKERFILE_ADDITIONS_END": undefined,
467
464
  "DOCKER_BUILDKIT": "1",
468
- "DOCKER_CACHE_IMAGE": "$DOCKER_REGISTRY_IMAGE_PATH/caches/www",
465
+ "DOCKER_CACHE_IMAGE": "asia-east1-docker.pkg.dev/asdf/catladder-deploy/pan-test-app/caches/www",
469
466
  "DOCKER_DIR": ".",
470
467
  "DOCKER_DRIVER": "overlay2",
471
468
  "DOCKER_HOST": "tcp://0.0.0.0:2375",
472
- "DOCKER_IMAGE": "$DOCKER_REGISTRY_IMAGE_PATH/$DOCKER_IMAGE_NAME",
473
- "DOCKER_IMAGE_NAME": "review/www",
469
+ "DOCKER_IMAGE": "asia-east1-docker.pkg.dev/asdf/catladder-deploy/pan-test-app/review/www/mr1234",
474
470
  "DOCKER_IMAGE_TAG": "$CI_COMMIT_SHA",
475
- "DOCKER_REGISTRY": "$CI_REGISTRY",
476
- "DOCKER_REGISTRY_IMAGE_PATH": "$CI_REGISTRY_IMAGE",
471
+ "DOCKER_REGISTRY": "asia-east1-docker.pkg.dev",
477
472
  "DOCKER_TLS_CERTDIR": "",
478
473
  "KUBERNETES_CPU_LIMIT": "1",
479
474
  "KUBERNETES_CPU_REQUEST": "0.5",
@@ -530,13 +525,6 @@ _ALL_ENV_VAR_KEYS: '["ENV_SHORT","APP_DIR","ENV_TYPE","BUILD_INFO_ID","BUILD_INF
530
525
  "export GCLOUD_PROJECT_NUMBER=$(gcloud projects describe asdf --format="value(projectNumber)")",
531
526
  "echo "GCLOUD_PROJECT_NUMBER: $GCLOUD_PROJECT_NUMBER"",
532
527
  "echo -e "\\e[0Ksection_end:$(date +%s):prepare\\r\\e[0K"",
533
- "echo -e "\\e[0Ksection_start:$(date +%s):pushToArtifactRegistry[collapsed=true]\\r\\e[0KPushing image to artifacts registry"",
534
- "docker login --username gitlab-ci-token --password $CI_JOB_TOKEN $CI_REGISTRY",
535
- "gcloud auth configure-docker asia-east1-docker.pkg.dev",
536
- "docker pull $DOCKER_IMAGE:$DOCKER_IMAGE_TAG",
537
- "docker tag $DOCKER_IMAGE:$DOCKER_IMAGE_TAG asia-east1-docker.pkg.dev/asdf/catladder-deploy/pan-test-app/review/www/mr1234:$DOCKER_IMAGE_TAG",
538
- "docker push asia-east1-docker.pkg.dev/asdf/catladder-deploy/pan-test-app/review/www/mr1234:$DOCKER_IMAGE_TAG",
539
- "echo -e "\\e[0Ksection_end:$(date +%s):pushToArtifactRegistry\\r\\e[0K"",
540
528
  "echo -e "\\e[0Ksection_start:$(date +%s):deploy[collapsed=true]\\r\\e[0KDeploy to cloud run"",
541
529
  "echo "$ENV_VARS" > ____envvars.yaml",
542
530
  "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",
@@ -544,6 +532,7 @@ _ALL_ENV_VAR_KEYS: '["ENV_SHORT","APP_DIR","ENV_TYPE","BUILD_INFO_ID","BUILD_INF
544
532
  "echo -e "\\e[0Ksection_start:$(date +%s):cleanup[collapsed=true]\\r\\e[0KCleanup"",
545
533
  "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",
546
534
  "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",
535
+ "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",
547
536
  "set +e",
548
537
  "gcloud artifacts docker images delete asia-east1-docker.pkg.dev/asdf/catladder-deploy/pan-test-app/review/www --quiet --delete-tags",
549
538
  "set -e",
@@ -567,14 +556,12 @@ _ALL_ENV_VAR_KEYS: '["ENV_SHORT","APP_DIR","ENV_TYPE","BUILD_INFO_ID","BUILD_INF
567
556
  "BUILD_INFO_ID": "some-id",
568
557
  "CLOUDSDK_CORE_DISABLE_PROMPTS": "1",
569
558
  "DOCKER_BUILDKIT": "1",
570
- "DOCKER_CACHE_IMAGE": "$DOCKER_REGISTRY_IMAGE_PATH/caches/www",
559
+ "DOCKER_CACHE_IMAGE": "asia-east1-docker.pkg.dev/asdf/catladder-deploy/pan-test-app/caches/www",
571
560
  "DOCKER_DRIVER": "overlay2",
572
561
  "DOCKER_HOST": "tcp://0.0.0.0:2375",
573
- "DOCKER_IMAGE": "$DOCKER_REGISTRY_IMAGE_PATH/$DOCKER_IMAGE_NAME",
574
- "DOCKER_IMAGE_NAME": "review/www",
562
+ "DOCKER_IMAGE": "asia-east1-docker.pkg.dev/asdf/catladder-deploy/pan-test-app/review/www/mr1234",
575
563
  "DOCKER_IMAGE_TAG": "$CI_COMMIT_SHA",
576
- "DOCKER_REGISTRY": "$CI_REGISTRY",
577
- "DOCKER_REGISTRY_IMAGE_PATH": "$CI_REGISTRY_IMAGE",
564
+ "DOCKER_REGISTRY": "asia-east1-docker.pkg.dev",
578
565
  "DOCKER_TLS_CERTDIR": "",
579
566
  "ENV_SHORT": "review",
580
567
  "ENV_TYPE": "review",
@@ -636,6 +623,7 @@ _ALL_ENV_VAR_KEYS: '["ENV_SHORT","APP_DIR","ENV_TYPE","BUILD_INFO_ID","BUILD_INF
636
623
  "gcloud auth activate-service-account --key-file="./____keyfile.json"",
637
624
  "gcloud run services delete pan-test-app-review-mr1234-www --project=asdf --region=asia-east1",
638
625
  "gcloud artifacts docker images delete asia-east1-docker.pkg.dev/asdf/catladder-deploy/pan-test-app/review/www/mr1234 --quiet --delete-tags",
626
+ "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",
639
627
  "set +e",
640
628
  "gcloud artifacts docker images delete asia-east1-docker.pkg.dev/asdf/catladder-deploy/pan-test-app/review/www --quiet --delete-tags",
641
629
  "set -e",
@@ -865,7 +853,10 @@ _ALL_ENV_VAR_KEYS: '["ENV_SHORT","APP_DIR","ENV_TYPE","BUILD_INFO_ID","BUILD_INF
865
853
  "script": [
866
854
  "ensureNginxDockerfile",
867
855
  "echo -e "\\e[0Ksection_start:$(date +%s):docker-login[collapsed=true]\\r\\e[0KDocker Login"",
868
- "docker login --username gitlab-ci-token --password $CI_JOB_TOKEN $CI_REGISTRY",
856
+ "echo $CL_prod_www_GCLOUD_DEPLOY_credentialsKey > ./____keyfile.json
857
+ ",
858
+ "gcloud auth activate-service-account --key-file="./____keyfile.json"",
859
+ "gcloud auth configure-docker asia-east1-docker.pkg.dev",
869
860
  "echo -e "\\e[0Ksection_end:$(date +%s):docker-login\\r\\e[0K"",
870
861
  "echo -e "\\e[0Ksection_start:$(date +%s):docker-build[collapsed=true]\\r\\e[0KDocker build"",
871
862
  "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",
@@ -890,15 +881,13 @@ _ALL_ENV_VAR_KEYS: '["ENV_SHORT","APP_DIR","ENV_TYPE","BUILD_INFO_ID","BUILD_INF
890
881
  "DOCKERFILE_ADDITIONS": undefined,
891
882
  "DOCKERFILE_ADDITIONS_END": undefined,
892
883
  "DOCKER_BUILDKIT": "1",
893
- "DOCKER_CACHE_IMAGE": "$DOCKER_REGISTRY_IMAGE_PATH/caches/www",
884
+ "DOCKER_CACHE_IMAGE": "asia-east1-docker.pkg.dev/asdf/catladder-deploy/pan-test-app/caches/www",
894
885
  "DOCKER_DIR": ".",
895
886
  "DOCKER_DRIVER": "overlay2",
896
887
  "DOCKER_HOST": "tcp://0.0.0.0:2375",
897
- "DOCKER_IMAGE": "$DOCKER_REGISTRY_IMAGE_PATH/$DOCKER_IMAGE_NAME",
898
- "DOCKER_IMAGE_NAME": "prod/www",
888
+ "DOCKER_IMAGE": "asia-east1-docker.pkg.dev/asdf/catladder-deploy/pan-test-app/prod/www",
899
889
  "DOCKER_IMAGE_TAG": "$CI_COMMIT_SHA",
900
- "DOCKER_REGISTRY": "$CI_REGISTRY",
901
- "DOCKER_REGISTRY_IMAGE_PATH": "$CI_REGISTRY_IMAGE",
890
+ "DOCKER_REGISTRY": "asia-east1-docker.pkg.dev",
902
891
  "DOCKER_TLS_CERTDIR": "",
903
892
  "KUBERNETES_CPU_LIMIT": "1",
904
893
  "KUBERNETES_CPU_REQUEST": "0.5",
@@ -922,7 +911,10 @@ _ALL_ENV_VAR_KEYS: '["ENV_SHORT","APP_DIR","ENV_TYPE","BUILD_INFO_ID","BUILD_INF
922
911
  "script": [
923
912
  "ensureNginxDockerfile",
924
913
  "echo -e "\\e[0Ksection_start:$(date +%s):docker-login[collapsed=true]\\r\\e[0KDocker Login"",
925
- "docker login --username gitlab-ci-token --password $CI_JOB_TOKEN $CI_REGISTRY",
914
+ "echo $CL_stage_www_GCLOUD_DEPLOY_credentialsKey > ./____keyfile.json
915
+ ",
916
+ "gcloud auth activate-service-account --key-file="./____keyfile.json"",
917
+ "gcloud auth configure-docker asia-east1-docker.pkg.dev",
926
918
  "echo -e "\\e[0Ksection_end:$(date +%s):docker-login\\r\\e[0K"",
927
919
  "echo -e "\\e[0Ksection_start:$(date +%s):docker-build[collapsed=true]\\r\\e[0KDocker build"",
928
920
  "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",
@@ -947,15 +939,13 @@ _ALL_ENV_VAR_KEYS: '["ENV_SHORT","APP_DIR","ENV_TYPE","BUILD_INFO_ID","BUILD_INF
947
939
  "DOCKERFILE_ADDITIONS": undefined,
948
940
  "DOCKERFILE_ADDITIONS_END": undefined,
949
941
  "DOCKER_BUILDKIT": "1",
950
- "DOCKER_CACHE_IMAGE": "$DOCKER_REGISTRY_IMAGE_PATH/caches/www",
942
+ "DOCKER_CACHE_IMAGE": "asia-east1-docker.pkg.dev/asdf/catladder-deploy/pan-test-app/caches/www",
951
943
  "DOCKER_DIR": ".",
952
944
  "DOCKER_DRIVER": "overlay2",
953
945
  "DOCKER_HOST": "tcp://0.0.0.0:2375",
954
- "DOCKER_IMAGE": "$DOCKER_REGISTRY_IMAGE_PATH/$DOCKER_IMAGE_NAME",
955
- "DOCKER_IMAGE_NAME": "stage/www",
946
+ "DOCKER_IMAGE": "asia-east1-docker.pkg.dev/asdf/catladder-deploy/pan-test-app/stage/www",
956
947
  "DOCKER_IMAGE_TAG": "$CI_COMMIT_SHA",
957
- "DOCKER_REGISTRY": "$CI_REGISTRY",
958
- "DOCKER_REGISTRY_IMAGE_PATH": "$CI_REGISTRY_IMAGE",
948
+ "DOCKER_REGISTRY": "asia-east1-docker.pkg.dev",
959
949
  "DOCKER_TLS_CERTDIR": "",
960
950
  "KUBERNETES_CPU_LIMIT": "1",
961
951
  "KUBERNETES_CPU_REQUEST": "0.5",
@@ -1012,13 +1002,6 @@ _ALL_ENV_VAR_KEYS: '["ENV_SHORT","APP_DIR","ENV_TYPE","BUILD_INFO_ID","BUILD_INF
1012
1002
  "export GCLOUD_PROJECT_NUMBER=$(gcloud projects describe asdf --format="value(projectNumber)")",
1013
1003
  "echo "GCLOUD_PROJECT_NUMBER: $GCLOUD_PROJECT_NUMBER"",
1014
1004
  "echo -e "\\e[0Ksection_end:$(date +%s):prepare\\r\\e[0K"",
1015
- "echo -e "\\e[0Ksection_start:$(date +%s):pushToArtifactRegistry[collapsed=true]\\r\\e[0KPushing image to artifacts registry"",
1016
- "docker login --username gitlab-ci-token --password $CI_JOB_TOKEN $CI_REGISTRY",
1017
- "gcloud auth configure-docker asia-east1-docker.pkg.dev",
1018
- "docker pull $DOCKER_IMAGE:$DOCKER_IMAGE_TAG",
1019
- "docker tag $DOCKER_IMAGE:$DOCKER_IMAGE_TAG asia-east1-docker.pkg.dev/asdf/catladder-deploy/pan-test-app/prod/www:$DOCKER_IMAGE_TAG",
1020
- "docker push asia-east1-docker.pkg.dev/asdf/catladder-deploy/pan-test-app/prod/www:$DOCKER_IMAGE_TAG",
1021
- "echo -e "\\e[0Ksection_end:$(date +%s):pushToArtifactRegistry\\r\\e[0K"",
1022
1005
  "echo -e "\\e[0Ksection_start:$(date +%s):deploy[collapsed=true]\\r\\e[0KDeploy to cloud run"",
1023
1006
  "echo "$ENV_VARS" > ____envvars.yaml",
1024
1007
  "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",
@@ -1026,6 +1009,7 @@ _ALL_ENV_VAR_KEYS: '["ENV_SHORT","APP_DIR","ENV_TYPE","BUILD_INFO_ID","BUILD_INF
1026
1009
  "echo -e "\\e[0Ksection_start:$(date +%s):cleanup[collapsed=true]\\r\\e[0KCleanup"",
1027
1010
  "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",
1028
1011
  "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",
1012
+ "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",
1029
1013
  "echo -e "\\e[0Ksection_end:$(date +%s):cleanup\\r\\e[0K"",
1030
1014
  "echo Uploading SBOM to Dependency Track",
1031
1015
  "/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",
@@ -1046,14 +1030,12 @@ _ALL_ENV_VAR_KEYS: '["ENV_SHORT","APP_DIR","ENV_TYPE","BUILD_INFO_ID","BUILD_INF
1046
1030
  "BUILD_INFO_ID": "some-id",
1047
1031
  "CLOUDSDK_CORE_DISABLE_PROMPTS": "1",
1048
1032
  "DOCKER_BUILDKIT": "1",
1049
- "DOCKER_CACHE_IMAGE": "$DOCKER_REGISTRY_IMAGE_PATH/caches/www",
1033
+ "DOCKER_CACHE_IMAGE": "asia-east1-docker.pkg.dev/asdf/catladder-deploy/pan-test-app/caches/www",
1050
1034
  "DOCKER_DRIVER": "overlay2",
1051
1035
  "DOCKER_HOST": "tcp://0.0.0.0:2375",
1052
- "DOCKER_IMAGE": "$DOCKER_REGISTRY_IMAGE_PATH/$DOCKER_IMAGE_NAME",
1053
- "DOCKER_IMAGE_NAME": "prod/www",
1036
+ "DOCKER_IMAGE": "asia-east1-docker.pkg.dev/asdf/catladder-deploy/pan-test-app/prod/www",
1054
1037
  "DOCKER_IMAGE_TAG": "$CI_COMMIT_SHA",
1055
- "DOCKER_REGISTRY": "$CI_REGISTRY",
1056
- "DOCKER_REGISTRY_IMAGE_PATH": "$CI_REGISTRY_IMAGE",
1038
+ "DOCKER_REGISTRY": "asia-east1-docker.pkg.dev",
1057
1039
  "DOCKER_TLS_CERTDIR": "",
1058
1040
  "ENV_SHORT": "prod",
1059
1041
  "ENV_TYPE": "prod",
@@ -1130,13 +1112,6 @@ _ALL_ENV_VAR_KEYS: '["ENV_SHORT","APP_DIR","ENV_TYPE","BUILD_INFO_ID","BUILD_INF
1130
1112
  "export GCLOUD_PROJECT_NUMBER=$(gcloud projects describe asdf --format="value(projectNumber)")",
1131
1113
  "echo "GCLOUD_PROJECT_NUMBER: $GCLOUD_PROJECT_NUMBER"",
1132
1114
  "echo -e "\\e[0Ksection_end:$(date +%s):prepare\\r\\e[0K"",
1133
- "echo -e "\\e[0Ksection_start:$(date +%s):pushToArtifactRegistry[collapsed=true]\\r\\e[0KPushing image to artifacts registry"",
1134
- "docker login --username gitlab-ci-token --password $CI_JOB_TOKEN $CI_REGISTRY",
1135
- "gcloud auth configure-docker asia-east1-docker.pkg.dev",
1136
- "docker pull $DOCKER_IMAGE:$DOCKER_IMAGE_TAG",
1137
- "docker tag $DOCKER_IMAGE:$DOCKER_IMAGE_TAG asia-east1-docker.pkg.dev/asdf/catladder-deploy/pan-test-app/stage/www:$DOCKER_IMAGE_TAG",
1138
- "docker push asia-east1-docker.pkg.dev/asdf/catladder-deploy/pan-test-app/stage/www:$DOCKER_IMAGE_TAG",
1139
- "echo -e "\\e[0Ksection_end:$(date +%s):pushToArtifactRegistry\\r\\e[0K"",
1140
1115
  "echo -e "\\e[0Ksection_start:$(date +%s):deploy[collapsed=true]\\r\\e[0KDeploy to cloud run"",
1141
1116
  "echo "$ENV_VARS" > ____envvars.yaml",
1142
1117
  "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",
@@ -1144,6 +1119,7 @@ _ALL_ENV_VAR_KEYS: '["ENV_SHORT","APP_DIR","ENV_TYPE","BUILD_INFO_ID","BUILD_INF
1144
1119
  "echo -e "\\e[0Ksection_start:$(date +%s):cleanup[collapsed=true]\\r\\e[0KCleanup"",
1145
1120
  "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",
1146
1121
  "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",
1122
+ "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",
1147
1123
  "echo -e "\\e[0Ksection_end:$(date +%s):cleanup\\r\\e[0K"",
1148
1124
  "echo Uploading SBOM to Dependency Track",
1149
1125
  "/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",
@@ -1164,14 +1140,12 @@ _ALL_ENV_VAR_KEYS: '["ENV_SHORT","APP_DIR","ENV_TYPE","BUILD_INFO_ID","BUILD_INF
1164
1140
  "BUILD_INFO_ID": "some-id",
1165
1141
  "CLOUDSDK_CORE_DISABLE_PROMPTS": "1",
1166
1142
  "DOCKER_BUILDKIT": "1",
1167
- "DOCKER_CACHE_IMAGE": "$DOCKER_REGISTRY_IMAGE_PATH/caches/www",
1143
+ "DOCKER_CACHE_IMAGE": "asia-east1-docker.pkg.dev/asdf/catladder-deploy/pan-test-app/caches/www",
1168
1144
  "DOCKER_DRIVER": "overlay2",
1169
1145
  "DOCKER_HOST": "tcp://0.0.0.0:2375",
1170
- "DOCKER_IMAGE": "$DOCKER_REGISTRY_IMAGE_PATH/$DOCKER_IMAGE_NAME",
1171
- "DOCKER_IMAGE_NAME": "stage/www",
1146
+ "DOCKER_IMAGE": "asia-east1-docker.pkg.dev/asdf/catladder-deploy/pan-test-app/stage/www",
1172
1147
  "DOCKER_IMAGE_TAG": "$CI_COMMIT_SHA",
1173
- "DOCKER_REGISTRY": "$CI_REGISTRY",
1174
- "DOCKER_REGISTRY_IMAGE_PATH": "$CI_REGISTRY_IMAGE",
1148
+ "DOCKER_REGISTRY": "asia-east1-docker.pkg.dev",
1175
1149
  "DOCKER_TLS_CERTDIR": "",
1176
1150
  "ENV_SHORT": "stage",
1177
1151
  "ENV_TYPE": "stage",
@@ -1233,6 +1207,7 @@ _ALL_ENV_VAR_KEYS: '["ENV_SHORT","APP_DIR","ENV_TYPE","BUILD_INFO_ID","BUILD_INF
1233
1207
  "gcloud auth activate-service-account --key-file="./____keyfile.json"",
1234
1208
  "gcloud run services delete pan-test-app-prod-www --project=asdf --region=asia-east1",
1235
1209
  "gcloud artifacts docker images delete asia-east1-docker.pkg.dev/asdf/catladder-deploy/pan-test-app/prod/www --quiet --delete-tags",
1210
+ "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",
1236
1211
  "echo Disabling component in Dependency Track",
1237
1212
  "/dtrackuploader https://dep.panter.swiss/ "$DT_KEY_PROD" disable "pan-test-app/www" "https://pan-test-app-prod-www-unknown-host.example.com" || true",
1238
1213
  "set -e",
@@ -1281,6 +1256,7 @@ _ALL_ENV_VAR_KEYS: '["ENV_SHORT","APP_DIR","ENV_TYPE","BUILD_INFO_ID","BUILD_INF
1281
1256
  "gcloud auth activate-service-account --key-file="./____keyfile.json"",
1282
1257
  "gcloud run services delete pan-test-app-stage-www --project=asdf --region=asia-east1",
1283
1258
  "gcloud artifacts docker images delete asia-east1-docker.pkg.dev/asdf/catladder-deploy/pan-test-app/stage/www --quiet --delete-tags",
1259
+ "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",
1284
1260
  "echo Disabling component in Dependency Track",
1285
1261
  "/dtrackuploader https://dep.panter.swiss/ "$DT_KEY_PROD" disable "pan-test-app/www" "https://pan-test-app-stage-www-unknown-host.example.com" || true",
1286
1262
  "set -e",
package/examples/__snapshots__/custom-deploy.ts.snap CHANGED
@@ -181,7 +181,7 @@ exports[`matches snapshot 1`] = `
181
181
  "DOCKERFILE_ADDITIONS": undefined,
182
182
  "DOCKERFILE_ADDITIONS_END": undefined,
183
183
  "DOCKER_BUILDKIT": "1",
184
- "DOCKER_CACHE_IMAGE": "$DOCKER_REGISTRY_IMAGE_PATH/caches/www",
184
+ "DOCKER_CACHE_IMAGE": "$CI_REGISTRY_IMAGE/caches/www",
185
185
  "DOCKER_COPY_AND_INSTALL_APP": "COPY --chown=node:node $APP_DIR .
186
186
  RUN yarn plugin import workspace-tools
187
187
  RUN yarn workspaces focus --production && yarn rebuild",
@@ -192,11 +192,10 @@ COPY --chown=node:node .yarn /app/.yarn",
192
192
  "DOCKER_DIR": ".",
193
193
  "DOCKER_DRIVER": "overlay2",
194
194
  "DOCKER_HOST": "tcp://0.0.0.0:2375",
195
- "DOCKER_IMAGE": "$DOCKER_REGISTRY_IMAGE_PATH/$DOCKER_IMAGE_NAME",
195
+ "DOCKER_IMAGE": "$CI_REGISTRY_IMAGE/$DOCKER_IMAGE_NAME",
196
196
  "DOCKER_IMAGE_NAME": "dev/www",
197
197
  "DOCKER_IMAGE_TAG": "$CI_COMMIT_SHA",
198
198
  "DOCKER_REGISTRY": "$CI_REGISTRY",
199
- "DOCKER_REGISTRY_IMAGE_PATH": "$CI_REGISTRY_IMAGE",
200
199
  "DOCKER_TLS_CERTDIR": "",
201
200
  "KUBERNETES_CPU_LIMIT": "1",
202
201
  "KUBERNETES_CPU_REQUEST": "0.5",
@@ -266,12 +265,11 @@ COPY --chown=node:node .yarn /app/.yarn",
266
265
  "BUILD_INFO_CURRENT_VERSION": "3.2.1",
267
266
  "BUILD_INFO_ID": "some-id",
268
267
  "DEPLOY_API_KEY": "$CL_dev_www_DEPLOY_API_KEY",
269
- "DOCKER_CACHE_IMAGE": "$DOCKER_REGISTRY_IMAGE_PATH/caches/www",
270
- "DOCKER_IMAGE": "$DOCKER_REGISTRY_IMAGE_PATH/$DOCKER_IMAGE_NAME",
268
+ "DOCKER_CACHE_IMAGE": "$CI_REGISTRY_IMAGE/caches/www",
269
+ "DOCKER_IMAGE": "$CI_REGISTRY_IMAGE/$DOCKER_IMAGE_NAME",
271
270
  "DOCKER_IMAGE_NAME": "dev/www",
272
271
  "DOCKER_IMAGE_TAG": "$CI_COMMIT_SHA",
273
272
  "DOCKER_REGISTRY": "$CI_REGISTRY",
274
- "DOCKER_REGISTRY_IMAGE_PATH": "$CI_REGISTRY_IMAGE",
275
273
  "ENV_SHORT": "dev",
276
274
  "ENV_TYPE": "dev",
277
275
  "HOST": "unknown-host.example.com",
@@ -669,7 +667,7 @@ COPY --chown=node:node .yarn /app/.yarn",
669
667
  "DOCKERFILE_ADDITIONS": undefined,
670
668
  "DOCKERFILE_ADDITIONS_END": undefined,
671
669
  "DOCKER_BUILDKIT": "1",
672
- "DOCKER_CACHE_IMAGE": "$DOCKER_REGISTRY_IMAGE_PATH/caches/www",
670
+ "DOCKER_CACHE_IMAGE": "$CI_REGISTRY_IMAGE/caches/www",
673
671
  "DOCKER_COPY_AND_INSTALL_APP": "COPY --chown=node:node $APP_DIR .
674
672
  RUN yarn plugin import workspace-tools
675
673
  RUN yarn workspaces focus --production && yarn rebuild",
@@ -680,11 +678,10 @@ COPY --chown=node:node .yarn /app/.yarn",
680
678
  "DOCKER_DIR": ".",
681
679
  "DOCKER_DRIVER": "overlay2",
682
680
  "DOCKER_HOST": "tcp://0.0.0.0:2375",
683
- "DOCKER_IMAGE": "$DOCKER_REGISTRY_IMAGE_PATH/$DOCKER_IMAGE_NAME",
681
+ "DOCKER_IMAGE": "$CI_REGISTRY_IMAGE/$DOCKER_IMAGE_NAME",
684
682
  "DOCKER_IMAGE_NAME": "review/www",
685
683
  "DOCKER_IMAGE_TAG": "$CI_COMMIT_SHA",
686
684
  "DOCKER_REGISTRY": "$CI_REGISTRY",
687
- "DOCKER_REGISTRY_IMAGE_PATH": "$CI_REGISTRY_IMAGE",
688
685
  "DOCKER_TLS_CERTDIR": "",
689
686
  "KUBERNETES_CPU_LIMIT": "1",
690
687
  "KUBERNETES_CPU_REQUEST": "0.5",
@@ -754,12 +751,11 @@ COPY --chown=node:node .yarn /app/.yarn",
754
751
  "BUILD_INFO_CURRENT_VERSION": "3.2.1",
755
752
  "BUILD_INFO_ID": "some-id",
756
753
  "DEPLOY_API_KEY": "$CL_review_www_DEPLOY_API_KEY",
757
- "DOCKER_CACHE_IMAGE": "$DOCKER_REGISTRY_IMAGE_PATH/caches/www",
758
- "DOCKER_IMAGE": "$DOCKER_REGISTRY_IMAGE_PATH/$DOCKER_IMAGE_NAME",
754
+ "DOCKER_CACHE_IMAGE": "$CI_REGISTRY_IMAGE/caches/www",
755
+ "DOCKER_IMAGE": "$CI_REGISTRY_IMAGE/$DOCKER_IMAGE_NAME",
759
756
  "DOCKER_IMAGE_NAME": "review/www",
760
757
  "DOCKER_IMAGE_TAG": "$CI_COMMIT_SHA",
761
758
  "DOCKER_REGISTRY": "$CI_REGISTRY",
762
- "DOCKER_REGISTRY_IMAGE_PATH": "$CI_REGISTRY_IMAGE",
763
759
  "ENV_SHORT": "review",
764
760
  "ENV_TYPE": "review",
765
761
  "HOST": "unknown-host.example.com",
@@ -1189,7 +1185,7 @@ COPY --chown=node:node .yarn /app/.yarn",
1189
1185
  "DOCKERFILE_ADDITIONS": undefined,
1190
1186
  "DOCKERFILE_ADDITIONS_END": undefined,
1191
1187
  "DOCKER_BUILDKIT": "1",
1192
- "DOCKER_CACHE_IMAGE": "$DOCKER_REGISTRY_IMAGE_PATH/caches/www",
1188
+ "DOCKER_CACHE_IMAGE": "$CI_REGISTRY_IMAGE/caches/www",
1193
1189
  "DOCKER_COPY_AND_INSTALL_APP": "COPY --chown=node:node $APP_DIR .
1194
1190
  RUN yarn plugin import workspace-tools
1195
1191
  RUN yarn workspaces focus --production && yarn rebuild",
@@ -1200,11 +1196,10 @@ COPY --chown=node:node .yarn /app/.yarn",
1200
1196
  "DOCKER_DIR": ".",
1201
1197
  "DOCKER_DRIVER": "overlay2",
1202
1198
  "DOCKER_HOST": "tcp://0.0.0.0:2375",
1203
- "DOCKER_IMAGE": "$DOCKER_REGISTRY_IMAGE_PATH/$DOCKER_IMAGE_NAME",
1199
+ "DOCKER_IMAGE": "$CI_REGISTRY_IMAGE/$DOCKER_IMAGE_NAME",
1204
1200
  "DOCKER_IMAGE_NAME": "prod/www",
1205
1201
  "DOCKER_IMAGE_TAG": "$CI_COMMIT_SHA",
1206
1202
  "DOCKER_REGISTRY": "$CI_REGISTRY",
1207
- "DOCKER_REGISTRY_IMAGE_PATH": "$CI_REGISTRY_IMAGE",
1208
1203
  "DOCKER_TLS_CERTDIR": "",
1209
1204
  "KUBERNETES_CPU_LIMIT": "1",
1210
1205
  "KUBERNETES_CPU_REQUEST": "0.5",
@@ -1262,7 +1257,7 @@ COPY --chown=node:node .yarn /app/.yarn",
1262
1257
  "DOCKERFILE_ADDITIONS": undefined,
1263
1258
  "DOCKERFILE_ADDITIONS_END": undefined,
1264
1259
  "DOCKER_BUILDKIT": "1",
1265
- "DOCKER_CACHE_IMAGE": "$DOCKER_REGISTRY_IMAGE_PATH/caches/www",
1260
+ "DOCKER_CACHE_IMAGE": "$CI_REGISTRY_IMAGE/caches/www",
1266
1261
  "DOCKER_COPY_AND_INSTALL_APP": "COPY --chown=node:node $APP_DIR .
1267
1262
  RUN yarn plugin import workspace-tools
1268
1263
  RUN yarn workspaces focus --production && yarn rebuild",
@@ -1273,11 +1268,10 @@ COPY --chown=node:node .yarn /app/.yarn",
1273
1268
  "DOCKER_DIR": ".",
1274
1269
  "DOCKER_DRIVER": "overlay2",
1275
1270
  "DOCKER_HOST": "tcp://0.0.0.0:2375",
1276
- "DOCKER_IMAGE": "$DOCKER_REGISTRY_IMAGE_PATH/$DOCKER_IMAGE_NAME",
1271
+ "DOCKER_IMAGE": "$CI_REGISTRY_IMAGE/$DOCKER_IMAGE_NAME",
1277
1272
  "DOCKER_IMAGE_NAME": "stage/www",
1278
1273
  "DOCKER_IMAGE_TAG": "$CI_COMMIT_SHA",
1279
1274
  "DOCKER_REGISTRY": "$CI_REGISTRY",
1280
- "DOCKER_REGISTRY_IMAGE_PATH": "$CI_REGISTRY_IMAGE",
1281
1275
  "DOCKER_TLS_CERTDIR": "",
1282
1276
  "KUBERNETES_CPU_LIMIT": "1",
1283
1277
  "KUBERNETES_CPU_REQUEST": "0.5",
@@ -1335,12 +1329,11 @@ COPY --chown=node:node .yarn /app/.yarn",
1335
1329
  "BUILD_INFO_CURRENT_VERSION": "3.2.1",
1336
1330
  "BUILD_INFO_ID": "some-id",
1337
1331
  "DEPLOY_API_KEY": "$CL_prod_www_DEPLOY_API_KEY",
1338
- "DOCKER_CACHE_IMAGE": "$DOCKER_REGISTRY_IMAGE_PATH/caches/www",
1339
- "DOCKER_IMAGE": "$DOCKER_REGISTRY_IMAGE_PATH/$DOCKER_IMAGE_NAME",
1332
+ "DOCKER_CACHE_IMAGE": "$CI_REGISTRY_IMAGE/caches/www",
1333
+ "DOCKER_IMAGE": "$CI_REGISTRY_IMAGE/$DOCKER_IMAGE_NAME",
1340
1334
  "DOCKER_IMAGE_NAME": "prod/www",
1341
1335
  "DOCKER_IMAGE_TAG": "$CI_COMMIT_SHA",
1342
1336
  "DOCKER_REGISTRY": "$CI_REGISTRY",
1343
- "DOCKER_REGISTRY_IMAGE_PATH": "$CI_REGISTRY_IMAGE",
1344
1337
  "ENV_SHORT": "prod",
1345
1338
  "ENV_TYPE": "prod",
1346
1339
  "HOST": "unknown-host.example.com",
@@ -1402,12 +1395,11 @@ COPY --chown=node:node .yarn /app/.yarn",
1402
1395
  "BUILD_INFO_CURRENT_VERSION": "3.2.1",
1403
1396
  "BUILD_INFO_ID": "some-id",
1404
1397
  "DEPLOY_API_KEY": "$CL_stage_www_DEPLOY_API_KEY",
1405
- "DOCKER_CACHE_IMAGE": "$DOCKER_REGISTRY_IMAGE_PATH/caches/www",
1406
- "DOCKER_IMAGE": "$DOCKER_REGISTRY_IMAGE_PATH/$DOCKER_IMAGE_NAME",
1398
+ "DOCKER_CACHE_IMAGE": "$CI_REGISTRY_IMAGE/caches/www",
1399
+ "DOCKER_IMAGE": "$CI_REGISTRY_IMAGE/$DOCKER_IMAGE_NAME",
1407
1400
  "DOCKER_IMAGE_NAME": "stage/www",
1408
1401
  "DOCKER_IMAGE_TAG": "$CI_COMMIT_SHA",
1409
1402
  "DOCKER_REGISTRY": "$CI_REGISTRY",
1410
- "DOCKER_REGISTRY_IMAGE_PATH": "$CI_REGISTRY_IMAGE",
1411
1403
  "ENV_SHORT": "stage",
1412
1404
  "ENV_TYPE": "stage",
1413
1405
  "HOST": "unknown-host.example.com",