@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__/node-build-with-custom-image.ts.snap CHANGED
@@ -159,7 +159,10 @@ exports[`matches snapshot 1`] = `
159
159
  "script": [
160
160
  "ensureNodeDockerfile",
161
161
  "echo -e "\\e[0Ksection_start:$(date +%s):docker-login[collapsed=true]\\r\\e[0KDocker Login"",
162
- "docker login --username gitlab-ci-token --password $CI_JOB_TOKEN $CI_REGISTRY",
162
+ "echo $CL_dev_www_GCLOUD_DEPLOY_credentialsKey > ./____keyfile.json
163
+ ",
164
+ "gcloud auth activate-service-account --key-file="./____keyfile.json"",
165
+ "gcloud auth configure-docker asia-east1-docker.pkg.dev",
163
166
  "echo -e "\\e[0Ksection_end:$(date +%s):docker-login\\r\\e[0K"",
164
167
  "echo -e "\\e[0Ksection_start:$(date +%s):docker-build[collapsed=true]\\r\\e[0KDocker build"",
165
168
  "docker build --network host --cache-from $DOCKER_CACHE_IMAGE --tag $DOCKER_IMAGE:$DOCKER_IMAGE_TAG -f $APP_DIR/Dockerfile . --build-arg BUILDKIT_INLINE_CACHE=1",
@@ -184,7 +187,7 @@ exports[`matches snapshot 1`] = `
184
187
  "DOCKERFILE_ADDITIONS": undefined,
185
188
  "DOCKERFILE_ADDITIONS_END": undefined,
186
189
  "DOCKER_BUILDKIT": "1",
187
- "DOCKER_CACHE_IMAGE": "$DOCKER_REGISTRY_IMAGE_PATH/caches/www",
190
+ "DOCKER_CACHE_IMAGE": "asia-east1-docker.pkg.dev/asdf/catladder-deploy/pan-test-app/caches/www",
188
191
  "DOCKER_COPY_AND_INSTALL_APP": "COPY --chown=node:node $APP_DIR .
189
192
  RUN yarn plugin import workspace-tools
190
193
  RUN yarn workspaces focus --production && yarn rebuild",
@@ -195,11 +198,9 @@ COPY --chown=node:node .yarn /app/.yarn",
195
198
  "DOCKER_DIR": ".",
196
199
  "DOCKER_DRIVER": "overlay2",
197
200
  "DOCKER_HOST": "tcp://0.0.0.0:2375",
198
- "DOCKER_IMAGE": "$DOCKER_REGISTRY_IMAGE_PATH/$DOCKER_IMAGE_NAME",
199
- "DOCKER_IMAGE_NAME": "dev/www",
201
+ "DOCKER_IMAGE": "asia-east1-docker.pkg.dev/asdf/catladder-deploy/pan-test-app/dev/www",
200
202
  "DOCKER_IMAGE_TAG": "$CI_COMMIT_SHA",
201
- "DOCKER_REGISTRY": "$CI_REGISTRY",
202
- "DOCKER_REGISTRY_IMAGE_PATH": "$CI_REGISTRY_IMAGE",
203
+ "DOCKER_REGISTRY": "asia-east1-docker.pkg.dev",
203
204
  "DOCKER_TLS_CERTDIR": "",
204
205
  "KUBERNETES_CPU_LIMIT": "1",
205
206
  "KUBERNETES_CPU_REQUEST": "0.5",
@@ -268,13 +269,6 @@ COPY --chown=node:node .yarn /app/.yarn",
268
269
  "export GCLOUD_PROJECT_NUMBER=$(gcloud projects describe asdf --format="value(projectNumber)")",
269
270
  "echo "GCLOUD_PROJECT_NUMBER: $GCLOUD_PROJECT_NUMBER"",
270
271
  "echo -e "\\e[0Ksection_end:$(date +%s):prepare\\r\\e[0K"",
271
- "echo -e "\\e[0Ksection_start:$(date +%s):pushToArtifactRegistry[collapsed=true]\\r\\e[0KPushing image to artifacts registry"",
272
- "docker login --username gitlab-ci-token --password $CI_JOB_TOKEN $CI_REGISTRY",
273
- "gcloud auth configure-docker asia-east1-docker.pkg.dev",
274
- "docker pull $DOCKER_IMAGE:$DOCKER_IMAGE_TAG",
275
- "docker tag $DOCKER_IMAGE:$DOCKER_IMAGE_TAG asia-east1-docker.pkg.dev/asdf/catladder-deploy/pan-test-app/dev/www:$DOCKER_IMAGE_TAG",
276
- "docker push asia-east1-docker.pkg.dev/asdf/catladder-deploy/pan-test-app/dev/www:$DOCKER_IMAGE_TAG",
277
- "echo -e "\\e[0Ksection_end:$(date +%s):pushToArtifactRegistry\\r\\e[0K"",
278
272
  "echo -e "\\e[0Ksection_start:$(date +%s):deploy[collapsed=true]\\r\\e[0KDeploy to cloud run"",
279
273
  "echo "$ENV_VARS" > ____envvars.yaml",
280
274
  "gcloud run deploy pan-test-app-dev-www --command="yarn,start" --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=node --env-vars-file=____envvars.yaml --min-instances=0 --max-instances=100 --cpu-throttling --allow-unauthenticated --ingress=all --cpu-boost",
@@ -282,6 +276,7 @@ COPY --chown=node:node .yarn /app/.yarn",
282
276
  "echo -e "\\e[0Ksection_start:$(date +%s):cleanup[collapsed=true]\\r\\e[0KCleanup"",
283
277
  "gcloud run revisions list --project=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",
284
278
  "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",
279
+ "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",
285
280
  "echo -e "\\e[0Ksection_end:$(date +%s):cleanup\\r\\e[0K"",
286
281
  "echo Uploading SBOM to Dependency Track",
287
282
  "/dtrackuploader https://dep.panter.swiss/ "$DT_KEY_PROD" upload "pan-test-app/www" "https://pan-test-app-dev-www-unknown-host.example.com" "__sbom.json" vex.json || true",
@@ -302,14 +297,12 @@ COPY --chown=node:node .yarn /app/.yarn",
302
297
  "BUILD_INFO_ID": "some-id",
303
298
  "CLOUDSDK_CORE_DISABLE_PROMPTS": "1",
304
299
  "DOCKER_BUILDKIT": "1",
305
- "DOCKER_CACHE_IMAGE": "$DOCKER_REGISTRY_IMAGE_PATH/caches/www",
300
+ "DOCKER_CACHE_IMAGE": "asia-east1-docker.pkg.dev/asdf/catladder-deploy/pan-test-app/caches/www",
306
301
  "DOCKER_DRIVER": "overlay2",
307
302
  "DOCKER_HOST": "tcp://0.0.0.0:2375",
308
- "DOCKER_IMAGE": "$DOCKER_REGISTRY_IMAGE_PATH/$DOCKER_IMAGE_NAME",
309
- "DOCKER_IMAGE_NAME": "dev/www",
303
+ "DOCKER_IMAGE": "asia-east1-docker.pkg.dev/asdf/catladder-deploy/pan-test-app/dev/www",
310
304
  "DOCKER_IMAGE_TAG": "$CI_COMMIT_SHA",
311
- "DOCKER_REGISTRY": "$CI_REGISTRY",
312
- "DOCKER_REGISTRY_IMAGE_PATH": "$CI_REGISTRY_IMAGE",
305
+ "DOCKER_REGISTRY": "asia-east1-docker.pkg.dev",
313
306
  "DOCKER_TLS_CERTDIR": "",
314
307
  "ENV_SHORT": "dev",
315
308
  "ENV_TYPE": "dev",
@@ -371,6 +364,7 @@ _ALL_ENV_VAR_KEYS: '["ENV_SHORT","APP_DIR","ENV_TYPE","BUILD_INFO_ID","BUILD_INF
371
364
  "gcloud auth activate-service-account --key-file="./____keyfile.json"",
372
365
  "gcloud run services delete pan-test-app-dev-www --project=asdf --region=asia-east1",
373
366
  "gcloud artifacts docker images delete asia-east1-docker.pkg.dev/asdf/catladder-deploy/pan-test-app/dev/www --quiet --delete-tags",
367
+ "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",
374
368
  "echo Disabling component in Dependency Track",
375
369
  "/dtrackuploader https://dep.panter.swiss/ "$DT_KEY_PROD" disable "pan-test-app/www" "https://pan-test-app-dev-www-unknown-host.example.com" || true",
376
370
  "set -e",
@@ -707,7 +701,10 @@ _ALL_ENV_VAR_KEYS: '["ENV_SHORT","APP_DIR","ENV_TYPE","BUILD_INFO_ID","BUILD_INF
707
701
  "script": [
708
702
  "ensureNodeDockerfile",
709
703
  "echo -e "\\e[0Ksection_start:$(date +%s):docker-login[collapsed=true]\\r\\e[0KDocker Login"",
710
- "docker login --username gitlab-ci-token --password $CI_JOB_TOKEN $CI_REGISTRY",
704
+ "echo $CL_review_www_GCLOUD_DEPLOY_credentialsKey > ./____keyfile.json
705
+ ",
706
+ "gcloud auth activate-service-account --key-file="./____keyfile.json"",
707
+ "gcloud auth configure-docker asia-east1-docker.pkg.dev",
711
708
  "echo -e "\\e[0Ksection_end:$(date +%s):docker-login\\r\\e[0K"",
712
709
  "echo -e "\\e[0Ksection_start:$(date +%s):docker-build[collapsed=true]\\r\\e[0KDocker build"",
713
710
  "docker build --network host --cache-from $DOCKER_CACHE_IMAGE --tag $DOCKER_IMAGE:$DOCKER_IMAGE_TAG -f $APP_DIR/Dockerfile . --build-arg BUILDKIT_INLINE_CACHE=1",
@@ -732,7 +729,7 @@ _ALL_ENV_VAR_KEYS: '["ENV_SHORT","APP_DIR","ENV_TYPE","BUILD_INFO_ID","BUILD_INF
732
729
  "DOCKERFILE_ADDITIONS": undefined,
733
730
  "DOCKERFILE_ADDITIONS_END": undefined,
734
731
  "DOCKER_BUILDKIT": "1",
735
- "DOCKER_CACHE_IMAGE": "$DOCKER_REGISTRY_IMAGE_PATH/caches/www",
732
+ "DOCKER_CACHE_IMAGE": "asia-east1-docker.pkg.dev/asdf/catladder-deploy/pan-test-app/caches/www",
736
733
  "DOCKER_COPY_AND_INSTALL_APP": "COPY --chown=node:node $APP_DIR .
737
734
  RUN yarn plugin import workspace-tools
738
735
  RUN yarn workspaces focus --production && yarn rebuild",
@@ -743,11 +740,9 @@ COPY --chown=node:node .yarn /app/.yarn",
743
740
  "DOCKER_DIR": ".",
744
741
  "DOCKER_DRIVER": "overlay2",
745
742
  "DOCKER_HOST": "tcp://0.0.0.0:2375",
746
- "DOCKER_IMAGE": "$DOCKER_REGISTRY_IMAGE_PATH/$DOCKER_IMAGE_NAME",
747
- "DOCKER_IMAGE_NAME": "review/www",
743
+ "DOCKER_IMAGE": "asia-east1-docker.pkg.dev/asdf/catladder-deploy/pan-test-app/review/www/mr1234",
748
744
  "DOCKER_IMAGE_TAG": "$CI_COMMIT_SHA",
749
- "DOCKER_REGISTRY": "$CI_REGISTRY",
750
- "DOCKER_REGISTRY_IMAGE_PATH": "$CI_REGISTRY_IMAGE",
745
+ "DOCKER_REGISTRY": "asia-east1-docker.pkg.dev",
751
746
  "DOCKER_TLS_CERTDIR": "",
752
747
  "KUBERNETES_CPU_LIMIT": "1",
753
748
  "KUBERNETES_CPU_REQUEST": "0.5",
@@ -816,13 +811,6 @@ COPY --chown=node:node .yarn /app/.yarn",
816
811
  "export GCLOUD_PROJECT_NUMBER=$(gcloud projects describe asdf --format="value(projectNumber)")",
817
812
  "echo "GCLOUD_PROJECT_NUMBER: $GCLOUD_PROJECT_NUMBER"",
818
813
  "echo -e "\\e[0Ksection_end:$(date +%s):prepare\\r\\e[0K"",
819
- "echo -e "\\e[0Ksection_start:$(date +%s):pushToArtifactRegistry[collapsed=true]\\r\\e[0KPushing image to artifacts registry"",
820
- "docker login --username gitlab-ci-token --password $CI_JOB_TOKEN $CI_REGISTRY",
821
- "gcloud auth configure-docker asia-east1-docker.pkg.dev",
822
- "docker pull $DOCKER_IMAGE:$DOCKER_IMAGE_TAG",
823
- "docker tag $DOCKER_IMAGE:$DOCKER_IMAGE_TAG asia-east1-docker.pkg.dev/asdf/catladder-deploy/pan-test-app/review/www/mr1234:$DOCKER_IMAGE_TAG",
824
- "docker push asia-east1-docker.pkg.dev/asdf/catladder-deploy/pan-test-app/review/www/mr1234:$DOCKER_IMAGE_TAG",
825
- "echo -e "\\e[0Ksection_end:$(date +%s):pushToArtifactRegistry\\r\\e[0K"",
826
814
  "echo -e "\\e[0Ksection_start:$(date +%s):deploy[collapsed=true]\\r\\e[0KDeploy to cloud run"",
827
815
  "echo "$ENV_VARS" > ____envvars.yaml",
828
816
  "gcloud run deploy pan-test-app-review-mr1234-www --command="yarn,start" --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=node --env-vars-file=____envvars.yaml --min-instances=0 --max-instances=100 --cpu-throttling --allow-unauthenticated --ingress=all --cpu-boost",
@@ -830,6 +818,7 @@ COPY --chown=node:node .yarn /app/.yarn",
830
818
  "echo -e "\\e[0Ksection_start:$(date +%s):cleanup[collapsed=true]\\r\\e[0KCleanup"",
831
819
  "gcloud run revisions list --project=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",
832
820
  "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",
821
+ "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",
833
822
  "set +e",
834
823
  "gcloud artifacts docker images delete asia-east1-docker.pkg.dev/asdf/catladder-deploy/pan-test-app/review/www --quiet --delete-tags",
835
824
  "set -e",
@@ -853,14 +842,12 @@ COPY --chown=node:node .yarn /app/.yarn",
853
842
  "BUILD_INFO_ID": "some-id",
854
843
  "CLOUDSDK_CORE_DISABLE_PROMPTS": "1",
855
844
  "DOCKER_BUILDKIT": "1",
856
- "DOCKER_CACHE_IMAGE": "$DOCKER_REGISTRY_IMAGE_PATH/caches/www",
845
+ "DOCKER_CACHE_IMAGE": "asia-east1-docker.pkg.dev/asdf/catladder-deploy/pan-test-app/caches/www",
857
846
  "DOCKER_DRIVER": "overlay2",
858
847
  "DOCKER_HOST": "tcp://0.0.0.0:2375",
859
- "DOCKER_IMAGE": "$DOCKER_REGISTRY_IMAGE_PATH/$DOCKER_IMAGE_NAME",
860
- "DOCKER_IMAGE_NAME": "review/www",
848
+ "DOCKER_IMAGE": "asia-east1-docker.pkg.dev/asdf/catladder-deploy/pan-test-app/review/www/mr1234",
861
849
  "DOCKER_IMAGE_TAG": "$CI_COMMIT_SHA",
862
- "DOCKER_REGISTRY": "$CI_REGISTRY",
863
- "DOCKER_REGISTRY_IMAGE_PATH": "$CI_REGISTRY_IMAGE",
850
+ "DOCKER_REGISTRY": "asia-east1-docker.pkg.dev",
864
851
  "DOCKER_TLS_CERTDIR": "",
865
852
  "ENV_SHORT": "review",
866
853
  "ENV_TYPE": "review",
@@ -922,6 +909,7 @@ _ALL_ENV_VAR_KEYS: '["ENV_SHORT","APP_DIR","ENV_TYPE","BUILD_INFO_ID","BUILD_INF
922
909
  "gcloud auth activate-service-account --key-file="./____keyfile.json"",
923
910
  "gcloud run services delete pan-test-app-review-mr1234-www --project=asdf --region=asia-east1",
924
911
  "gcloud artifacts docker images delete asia-east1-docker.pkg.dev/asdf/catladder-deploy/pan-test-app/review/www/mr1234 --quiet --delete-tags",
912
+ "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",
925
913
  "set +e",
926
914
  "gcloud artifacts docker images delete asia-east1-docker.pkg.dev/asdf/catladder-deploy/pan-test-app/review/www --quiet --delete-tags",
927
915
  "set -e",
@@ -1296,7 +1284,10 @@ _ALL_ENV_VAR_KEYS: '["ENV_SHORT","APP_DIR","ENV_TYPE","BUILD_INFO_ID","BUILD_INF
1296
1284
  "script": [
1297
1285
  "ensureNodeDockerfile",
1298
1286
  "echo -e "\\e[0Ksection_start:$(date +%s):docker-login[collapsed=true]\\r\\e[0KDocker Login"",
1299
- "docker login --username gitlab-ci-token --password $CI_JOB_TOKEN $CI_REGISTRY",
1287
+ "echo $CL_prod_www_GCLOUD_DEPLOY_credentialsKey > ./____keyfile.json
1288
+ ",
1289
+ "gcloud auth activate-service-account --key-file="./____keyfile.json"",
1290
+ "gcloud auth configure-docker asia-east1-docker.pkg.dev",
1300
1291
  "echo -e "\\e[0Ksection_end:$(date +%s):docker-login\\r\\e[0K"",
1301
1292
  "echo -e "\\e[0Ksection_start:$(date +%s):docker-build[collapsed=true]\\r\\e[0KDocker build"",
1302
1293
  "docker build --network host --cache-from $DOCKER_CACHE_IMAGE --tag $DOCKER_IMAGE:$DOCKER_IMAGE_TAG -f $APP_DIR/Dockerfile . --build-arg BUILDKIT_INLINE_CACHE=1",
@@ -1321,7 +1312,7 @@ _ALL_ENV_VAR_KEYS: '["ENV_SHORT","APP_DIR","ENV_TYPE","BUILD_INFO_ID","BUILD_INF
1321
1312
  "DOCKERFILE_ADDITIONS": undefined,
1322
1313
  "DOCKERFILE_ADDITIONS_END": undefined,
1323
1314
  "DOCKER_BUILDKIT": "1",
1324
- "DOCKER_CACHE_IMAGE": "$DOCKER_REGISTRY_IMAGE_PATH/caches/www",
1315
+ "DOCKER_CACHE_IMAGE": "asia-east1-docker.pkg.dev/asdf/catladder-deploy/pan-test-app/caches/www",
1325
1316
  "DOCKER_COPY_AND_INSTALL_APP": "COPY --chown=node:node $APP_DIR .
1326
1317
  RUN yarn plugin import workspace-tools
1327
1318
  RUN yarn workspaces focus --production && yarn rebuild",
@@ -1332,11 +1323,9 @@ COPY --chown=node:node .yarn /app/.yarn",
1332
1323
  "DOCKER_DIR": ".",
1333
1324
  "DOCKER_DRIVER": "overlay2",
1334
1325
  "DOCKER_HOST": "tcp://0.0.0.0:2375",
1335
- "DOCKER_IMAGE": "$DOCKER_REGISTRY_IMAGE_PATH/$DOCKER_IMAGE_NAME",
1336
- "DOCKER_IMAGE_NAME": "prod/www",
1326
+ "DOCKER_IMAGE": "asia-east1-docker.pkg.dev/asdf/catladder-deploy/pan-test-app/prod/www",
1337
1327
  "DOCKER_IMAGE_TAG": "$CI_COMMIT_SHA",
1338
- "DOCKER_REGISTRY": "$CI_REGISTRY",
1339
- "DOCKER_REGISTRY_IMAGE_PATH": "$CI_REGISTRY_IMAGE",
1328
+ "DOCKER_REGISTRY": "asia-east1-docker.pkg.dev",
1340
1329
  "DOCKER_TLS_CERTDIR": "",
1341
1330
  "KUBERNETES_CPU_LIMIT": "1",
1342
1331
  "KUBERNETES_CPU_REQUEST": "0.5",
@@ -1369,7 +1358,10 @@ COPY --chown=node:node .yarn /app/.yarn",
1369
1358
  "script": [
1370
1359
  "ensureNodeDockerfile",
1371
1360
  "echo -e "\\e[0Ksection_start:$(date +%s):docker-login[collapsed=true]\\r\\e[0KDocker Login"",
1372
- "docker login --username gitlab-ci-token --password $CI_JOB_TOKEN $CI_REGISTRY",
1361
+ "echo $CL_stage_www_GCLOUD_DEPLOY_credentialsKey > ./____keyfile.json
1362
+ ",
1363
+ "gcloud auth activate-service-account --key-file="./____keyfile.json"",
1364
+ "gcloud auth configure-docker asia-east1-docker.pkg.dev",
1373
1365
  "echo -e "\\e[0Ksection_end:$(date +%s):docker-login\\r\\e[0K"",
1374
1366
  "echo -e "\\e[0Ksection_start:$(date +%s):docker-build[collapsed=true]\\r\\e[0KDocker build"",
1375
1367
  "docker build --network host --cache-from $DOCKER_CACHE_IMAGE --tag $DOCKER_IMAGE:$DOCKER_IMAGE_TAG -f $APP_DIR/Dockerfile . --build-arg BUILDKIT_INLINE_CACHE=1",
@@ -1394,7 +1386,7 @@ COPY --chown=node:node .yarn /app/.yarn",
1394
1386
  "DOCKERFILE_ADDITIONS": undefined,
1395
1387
  "DOCKERFILE_ADDITIONS_END": undefined,
1396
1388
  "DOCKER_BUILDKIT": "1",
1397
- "DOCKER_CACHE_IMAGE": "$DOCKER_REGISTRY_IMAGE_PATH/caches/www",
1389
+ "DOCKER_CACHE_IMAGE": "asia-east1-docker.pkg.dev/asdf/catladder-deploy/pan-test-app/caches/www",
1398
1390
  "DOCKER_COPY_AND_INSTALL_APP": "COPY --chown=node:node $APP_DIR .
1399
1391
  RUN yarn plugin import workspace-tools
1400
1392
  RUN yarn workspaces focus --production && yarn rebuild",
@@ -1405,11 +1397,9 @@ COPY --chown=node:node .yarn /app/.yarn",
1405
1397
  "DOCKER_DIR": ".",
1406
1398
  "DOCKER_DRIVER": "overlay2",
1407
1399
  "DOCKER_HOST": "tcp://0.0.0.0:2375",
1408
- "DOCKER_IMAGE": "$DOCKER_REGISTRY_IMAGE_PATH/$DOCKER_IMAGE_NAME",
1409
- "DOCKER_IMAGE_NAME": "stage/www",
1400
+ "DOCKER_IMAGE": "asia-east1-docker.pkg.dev/asdf/catladder-deploy/pan-test-app/stage/www",
1410
1401
  "DOCKER_IMAGE_TAG": "$CI_COMMIT_SHA",
1411
- "DOCKER_REGISTRY": "$CI_REGISTRY",
1412
- "DOCKER_REGISTRY_IMAGE_PATH": "$CI_REGISTRY_IMAGE",
1402
+ "DOCKER_REGISTRY": "asia-east1-docker.pkg.dev",
1413
1403
  "DOCKER_TLS_CERTDIR": "",
1414
1404
  "KUBERNETES_CPU_LIMIT": "1",
1415
1405
  "KUBERNETES_CPU_REQUEST": "0.5",
@@ -1466,13 +1456,6 @@ COPY --chown=node:node .yarn /app/.yarn",
1466
1456
  "export GCLOUD_PROJECT_NUMBER=$(gcloud projects describe asdf --format="value(projectNumber)")",
1467
1457
  "echo "GCLOUD_PROJECT_NUMBER: $GCLOUD_PROJECT_NUMBER"",
1468
1458
  "echo -e "\\e[0Ksection_end:$(date +%s):prepare\\r\\e[0K"",
1469
- "echo -e "\\e[0Ksection_start:$(date +%s):pushToArtifactRegistry[collapsed=true]\\r\\e[0KPushing image to artifacts registry"",
1470
- "docker login --username gitlab-ci-token --password $CI_JOB_TOKEN $CI_REGISTRY",
1471
- "gcloud auth configure-docker asia-east1-docker.pkg.dev",
1472
- "docker pull $DOCKER_IMAGE:$DOCKER_IMAGE_TAG",
1473
- "docker tag $DOCKER_IMAGE:$DOCKER_IMAGE_TAG asia-east1-docker.pkg.dev/asdf/catladder-deploy/pan-test-app/prod/www:$DOCKER_IMAGE_TAG",
1474
- "docker push asia-east1-docker.pkg.dev/asdf/catladder-deploy/pan-test-app/prod/www:$DOCKER_IMAGE_TAG",
1475
- "echo -e "\\e[0Ksection_end:$(date +%s):pushToArtifactRegistry\\r\\e[0K"",
1476
1459
  "echo -e "\\e[0Ksection_start:$(date +%s):deploy[collapsed=true]\\r\\e[0KDeploy to cloud run"",
1477
1460
  "echo "$ENV_VARS" > ____envvars.yaml",
1478
1461
  "gcloud run deploy pan-test-app-prod-www --command="yarn,start" --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=node --env-vars-file=____envvars.yaml --min-instances=0 --max-instances=100 --cpu-throttling --allow-unauthenticated --ingress=all --cpu-boost",
@@ -1480,6 +1463,7 @@ COPY --chown=node:node .yarn /app/.yarn",
1480
1463
  "echo -e "\\e[0Ksection_start:$(date +%s):cleanup[collapsed=true]\\r\\e[0KCleanup"",
1481
1464
  "gcloud run revisions list --project=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",
1482
1465
  "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",
1466
+ "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",
1483
1467
  "echo -e "\\e[0Ksection_end:$(date +%s):cleanup\\r\\e[0K"",
1484
1468
  "echo Uploading SBOM to Dependency Track",
1485
1469
  "/dtrackuploader https://dep.panter.swiss/ "$DT_KEY_PROD" upload "pan-test-app/www" "https://pan-test-app-prod-www-unknown-host.example.com" "__sbom.json" vex.json || true",
@@ -1500,14 +1484,12 @@ COPY --chown=node:node .yarn /app/.yarn",
1500
1484
  "BUILD_INFO_ID": "some-id",
1501
1485
  "CLOUDSDK_CORE_DISABLE_PROMPTS": "1",
1502
1486
  "DOCKER_BUILDKIT": "1",
1503
- "DOCKER_CACHE_IMAGE": "$DOCKER_REGISTRY_IMAGE_PATH/caches/www",
1487
+ "DOCKER_CACHE_IMAGE": "asia-east1-docker.pkg.dev/asdf/catladder-deploy/pan-test-app/caches/www",
1504
1488
  "DOCKER_DRIVER": "overlay2",
1505
1489
  "DOCKER_HOST": "tcp://0.0.0.0:2375",
1506
- "DOCKER_IMAGE": "$DOCKER_REGISTRY_IMAGE_PATH/$DOCKER_IMAGE_NAME",
1507
- "DOCKER_IMAGE_NAME": "prod/www",
1490
+ "DOCKER_IMAGE": "asia-east1-docker.pkg.dev/asdf/catladder-deploy/pan-test-app/prod/www",
1508
1491
  "DOCKER_IMAGE_TAG": "$CI_COMMIT_SHA",
1509
- "DOCKER_REGISTRY": "$CI_REGISTRY",
1510
- "DOCKER_REGISTRY_IMAGE_PATH": "$CI_REGISTRY_IMAGE",
1492
+ "DOCKER_REGISTRY": "asia-east1-docker.pkg.dev",
1511
1493
  "DOCKER_TLS_CERTDIR": "",
1512
1494
  "ENV_SHORT": "prod",
1513
1495
  "ENV_TYPE": "prod",
@@ -1584,13 +1566,6 @@ _ALL_ENV_VAR_KEYS: '["ENV_SHORT","APP_DIR","ENV_TYPE","BUILD_INFO_ID","BUILD_INF
1584
1566
  "export GCLOUD_PROJECT_NUMBER=$(gcloud projects describe asdf --format="value(projectNumber)")",
1585
1567
  "echo "GCLOUD_PROJECT_NUMBER: $GCLOUD_PROJECT_NUMBER"",
1586
1568
  "echo -e "\\e[0Ksection_end:$(date +%s):prepare\\r\\e[0K"",
1587
- "echo -e "\\e[0Ksection_start:$(date +%s):pushToArtifactRegistry[collapsed=true]\\r\\e[0KPushing image to artifacts registry"",
1588
- "docker login --username gitlab-ci-token --password $CI_JOB_TOKEN $CI_REGISTRY",
1589
- "gcloud auth configure-docker asia-east1-docker.pkg.dev",
1590
- "docker pull $DOCKER_IMAGE:$DOCKER_IMAGE_TAG",
1591
- "docker tag $DOCKER_IMAGE:$DOCKER_IMAGE_TAG asia-east1-docker.pkg.dev/asdf/catladder-deploy/pan-test-app/stage/www:$DOCKER_IMAGE_TAG",
1592
- "docker push asia-east1-docker.pkg.dev/asdf/catladder-deploy/pan-test-app/stage/www:$DOCKER_IMAGE_TAG",
1593
- "echo -e "\\e[0Ksection_end:$(date +%s):pushToArtifactRegistry\\r\\e[0K"",
1594
1569
  "echo -e "\\e[0Ksection_start:$(date +%s):deploy[collapsed=true]\\r\\e[0KDeploy to cloud run"",
1595
1570
  "echo "$ENV_VARS" > ____envvars.yaml",
1596
1571
  "gcloud run deploy pan-test-app-stage-www --command="yarn,start" --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=node --env-vars-file=____envvars.yaml --min-instances=0 --max-instances=100 --cpu-throttling --allow-unauthenticated --ingress=all --cpu-boost",
@@ -1598,6 +1573,7 @@ _ALL_ENV_VAR_KEYS: '["ENV_SHORT","APP_DIR","ENV_TYPE","BUILD_INFO_ID","BUILD_INF
1598
1573
  "echo -e "\\e[0Ksection_start:$(date +%s):cleanup[collapsed=true]\\r\\e[0KCleanup"",
1599
1574
  "gcloud run revisions list --project=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",
1600
1575
  "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",
1576
+ "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",
1601
1577
  "echo -e "\\e[0Ksection_end:$(date +%s):cleanup\\r\\e[0K"",
1602
1578
  "echo Uploading SBOM to Dependency Track",
1603
1579
  "/dtrackuploader https://dep.panter.swiss/ "$DT_KEY_PROD" upload "pan-test-app/www" "https://pan-test-app-stage-www-unknown-host.example.com" "__sbom.json" vex.json || true",
@@ -1618,14 +1594,12 @@ _ALL_ENV_VAR_KEYS: '["ENV_SHORT","APP_DIR","ENV_TYPE","BUILD_INFO_ID","BUILD_INF
1618
1594
  "BUILD_INFO_ID": "some-id",
1619
1595
  "CLOUDSDK_CORE_DISABLE_PROMPTS": "1",
1620
1596
  "DOCKER_BUILDKIT": "1",
1621
- "DOCKER_CACHE_IMAGE": "$DOCKER_REGISTRY_IMAGE_PATH/caches/www",
1597
+ "DOCKER_CACHE_IMAGE": "asia-east1-docker.pkg.dev/asdf/catladder-deploy/pan-test-app/caches/www",
1622
1598
  "DOCKER_DRIVER": "overlay2",
1623
1599
  "DOCKER_HOST": "tcp://0.0.0.0:2375",
1624
- "DOCKER_IMAGE": "$DOCKER_REGISTRY_IMAGE_PATH/$DOCKER_IMAGE_NAME",
1625
- "DOCKER_IMAGE_NAME": "stage/www",
1600
+ "DOCKER_IMAGE": "asia-east1-docker.pkg.dev/asdf/catladder-deploy/pan-test-app/stage/www",
1626
1601
  "DOCKER_IMAGE_TAG": "$CI_COMMIT_SHA",
1627
- "DOCKER_REGISTRY": "$CI_REGISTRY",
1628
- "DOCKER_REGISTRY_IMAGE_PATH": "$CI_REGISTRY_IMAGE",
1602
+ "DOCKER_REGISTRY": "asia-east1-docker.pkg.dev",
1629
1603
  "DOCKER_TLS_CERTDIR": "",
1630
1604
  "ENV_SHORT": "stage",
1631
1605
  "ENV_TYPE": "stage",
@@ -1687,6 +1661,7 @@ _ALL_ENV_VAR_KEYS: '["ENV_SHORT","APP_DIR","ENV_TYPE","BUILD_INFO_ID","BUILD_INF
1687
1661
  "gcloud auth activate-service-account --key-file="./____keyfile.json"",
1688
1662
  "gcloud run services delete pan-test-app-prod-www --project=asdf --region=asia-east1",
1689
1663
  "gcloud artifacts docker images delete asia-east1-docker.pkg.dev/asdf/catladder-deploy/pan-test-app/prod/www --quiet --delete-tags",
1664
+ "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",
1690
1665
  "echo Disabling component in Dependency Track",
1691
1666
  "/dtrackuploader https://dep.panter.swiss/ "$DT_KEY_PROD" disable "pan-test-app/www" "https://pan-test-app-prod-www-unknown-host.example.com" || true",
1692
1667
  "set -e",
@@ -1735,6 +1710,7 @@ _ALL_ENV_VAR_KEYS: '["ENV_SHORT","APP_DIR","ENV_TYPE","BUILD_INFO_ID","BUILD_INF
1735
1710
  "gcloud auth activate-service-account --key-file="./____keyfile.json"",
1736
1711
  "gcloud run services delete pan-test-app-stage-www --project=asdf --region=asia-east1",
1737
1712
  "gcloud artifacts docker images delete asia-east1-docker.pkg.dev/asdf/catladder-deploy/pan-test-app/stage/www --quiet --delete-tags",
1713
+ "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",
1738
1714
  "echo Disabling component in Dependency Track",
1739
1715
  "/dtrackuploader https://dep.panter.swiss/ "$DT_KEY_PROD" disable "pan-test-app/www" "https://pan-test-app-stage-www-unknown-host.example.com" || true",
1740
1716
  "set -e",
package/examples/__snapshots__/rails-k8s-with-worker.ts.snap CHANGED
@@ -176,15 +176,14 @@ jobs:
176
176
  "DOCKERFILE_ADDITIONS": undefined,
177
177
  "DOCKERFILE_ADDITIONS_END": undefined,
178
178
  "DOCKER_BUILDKIT": "1",
179
- "DOCKER_CACHE_IMAGE": "$DOCKER_REGISTRY_IMAGE_PATH/caches/app",
179
+ "DOCKER_CACHE_IMAGE": "$CI_REGISTRY_IMAGE/caches/app",
180
180
  "DOCKER_DIR": ".",
181
181
  "DOCKER_DRIVER": "overlay2",
182
182
  "DOCKER_HOST": "tcp://0.0.0.0:2375",
183
- "DOCKER_IMAGE": "$DOCKER_REGISTRY_IMAGE_PATH/$DOCKER_IMAGE_NAME",
183
+ "DOCKER_IMAGE": "$CI_REGISTRY_IMAGE/$DOCKER_IMAGE_NAME",
184
184
  "DOCKER_IMAGE_NAME": "dev/app",
185
185
  "DOCKER_IMAGE_TAG": "$CI_COMMIT_SHA",
186
186
  "DOCKER_REGISTRY": "$CI_REGISTRY",
187
- "DOCKER_REGISTRY_IMAGE_PATH": "$CI_REGISTRY_IMAGE",
188
187
  "DOCKER_TLS_CERTDIR": "",
189
188
  "KUBERNETES_CPU_LIMIT": "1",
190
189
  "KUBERNETES_CPU_REQUEST": "0.5",
@@ -255,12 +254,11 @@ jobs:
255
254
  "BUILD_INFO_CURRENT_VERSION": "3.2.1",
256
255
  "BUILD_INFO_ID": "some-id",
257
256
  "COMPONENT_NAME": "app",
258
- "DOCKER_CACHE_IMAGE": "$DOCKER_REGISTRY_IMAGE_PATH/caches/app",
259
- "DOCKER_IMAGE": "$DOCKER_REGISTRY_IMAGE_PATH/$DOCKER_IMAGE_NAME",
257
+ "DOCKER_CACHE_IMAGE": "$CI_REGISTRY_IMAGE/caches/app",
258
+ "DOCKER_IMAGE": "$CI_REGISTRY_IMAGE/$DOCKER_IMAGE_NAME",
260
259
  "DOCKER_IMAGE_NAME": "dev/app",
261
260
  "DOCKER_IMAGE_TAG": "$CI_COMMIT_SHA",
262
261
  "DOCKER_REGISTRY": "$CI_REGISTRY",
263
- "DOCKER_REGISTRY_IMAGE_PATH": "$CI_REGISTRY_IMAGE",
264
262
  "ENV_SHORT": "dev",
265
263
  "ENV_TYPE": "dev",
266
264
  "HELM_ARGS": "",
@@ -765,15 +763,14 @@ jobs:
765
763
  "DOCKERFILE_ADDITIONS": undefined,
766
764
  "DOCKERFILE_ADDITIONS_END": undefined,
767
765
  "DOCKER_BUILDKIT": "1",
768
- "DOCKER_CACHE_IMAGE": "$DOCKER_REGISTRY_IMAGE_PATH/caches/app",
766
+ "DOCKER_CACHE_IMAGE": "$CI_REGISTRY_IMAGE/caches/app",
769
767
  "DOCKER_DIR": ".",
770
768
  "DOCKER_DRIVER": "overlay2",
771
769
  "DOCKER_HOST": "tcp://0.0.0.0:2375",
772
- "DOCKER_IMAGE": "$DOCKER_REGISTRY_IMAGE_PATH/$DOCKER_IMAGE_NAME",
770
+ "DOCKER_IMAGE": "$CI_REGISTRY_IMAGE/$DOCKER_IMAGE_NAME",
773
771
  "DOCKER_IMAGE_NAME": "review/app",
774
772
  "DOCKER_IMAGE_TAG": "$CI_COMMIT_SHA",
775
773
  "DOCKER_REGISTRY": "$CI_REGISTRY",
776
- "DOCKER_REGISTRY_IMAGE_PATH": "$CI_REGISTRY_IMAGE",
777
774
  "DOCKER_TLS_CERTDIR": "",
778
775
  "KUBERNETES_CPU_LIMIT": "1",
779
776
  "KUBERNETES_CPU_REQUEST": "0.5",
@@ -844,12 +841,11 @@ jobs:
844
841
  "BUILD_INFO_CURRENT_VERSION": "3.2.1",
845
842
  "BUILD_INFO_ID": "some-id",
846
843
  "COMPONENT_NAME": "app",
847
- "DOCKER_CACHE_IMAGE": "$DOCKER_REGISTRY_IMAGE_PATH/caches/app",
848
- "DOCKER_IMAGE": "$DOCKER_REGISTRY_IMAGE_PATH/$DOCKER_IMAGE_NAME",
844
+ "DOCKER_CACHE_IMAGE": "$CI_REGISTRY_IMAGE/caches/app",
845
+ "DOCKER_IMAGE": "$CI_REGISTRY_IMAGE/$DOCKER_IMAGE_NAME",
849
846
  "DOCKER_IMAGE_NAME": "review/app",
850
847
  "DOCKER_IMAGE_TAG": "$CI_COMMIT_SHA",
851
848
  "DOCKER_REGISTRY": "$CI_REGISTRY",
852
- "DOCKER_REGISTRY_IMAGE_PATH": "$CI_REGISTRY_IMAGE",
853
849
  "ENV_SHORT": "review",
854
850
  "ENV_TYPE": "review",
855
851
  "HELM_ARGS": "",
@@ -1433,15 +1429,14 @@ jobs:
1433
1429
  "DOCKERFILE_ADDITIONS": undefined,
1434
1430
  "DOCKERFILE_ADDITIONS_END": undefined,
1435
1431
  "DOCKER_BUILDKIT": "1",
1436
- "DOCKER_CACHE_IMAGE": "$DOCKER_REGISTRY_IMAGE_PATH/caches/app",
1432
+ "DOCKER_CACHE_IMAGE": "$CI_REGISTRY_IMAGE/caches/app",
1437
1433
  "DOCKER_DIR": ".",
1438
1434
  "DOCKER_DRIVER": "overlay2",
1439
1435
  "DOCKER_HOST": "tcp://0.0.0.0:2375",
1440
- "DOCKER_IMAGE": "$DOCKER_REGISTRY_IMAGE_PATH/$DOCKER_IMAGE_NAME",
1436
+ "DOCKER_IMAGE": "$CI_REGISTRY_IMAGE/$DOCKER_IMAGE_NAME",
1441
1437
  "DOCKER_IMAGE_NAME": "prod/app",
1442
1438
  "DOCKER_IMAGE_TAG": "$CI_COMMIT_SHA",
1443
1439
  "DOCKER_REGISTRY": "$CI_REGISTRY",
1444
- "DOCKER_REGISTRY_IMAGE_PATH": "$CI_REGISTRY_IMAGE",
1445
1440
  "DOCKER_TLS_CERTDIR": "",
1446
1441
  "KUBERNETES_CPU_LIMIT": "1",
1447
1442
  "KUBERNETES_CPU_REQUEST": "0.5",
@@ -1482,15 +1477,14 @@ jobs:
1482
1477
  "DOCKERFILE_ADDITIONS": undefined,
1483
1478
  "DOCKERFILE_ADDITIONS_END": undefined,
1484
1479
  "DOCKER_BUILDKIT": "1",
1485
- "DOCKER_CACHE_IMAGE": "$DOCKER_REGISTRY_IMAGE_PATH/caches/app",
1480
+ "DOCKER_CACHE_IMAGE": "$CI_REGISTRY_IMAGE/caches/app",
1486
1481
  "DOCKER_DIR": ".",
1487
1482
  "DOCKER_DRIVER": "overlay2",
1488
1483
  "DOCKER_HOST": "tcp://0.0.0.0:2375",
1489
- "DOCKER_IMAGE": "$DOCKER_REGISTRY_IMAGE_PATH/$DOCKER_IMAGE_NAME",
1484
+ "DOCKER_IMAGE": "$CI_REGISTRY_IMAGE/$DOCKER_IMAGE_NAME",
1490
1485
  "DOCKER_IMAGE_NAME": "stage/app",
1491
1486
  "DOCKER_IMAGE_TAG": "$CI_COMMIT_SHA",
1492
1487
  "DOCKER_REGISTRY": "$CI_REGISTRY",
1493
- "DOCKER_REGISTRY_IMAGE_PATH": "$CI_REGISTRY_IMAGE",
1494
1488
  "DOCKER_TLS_CERTDIR": "",
1495
1489
  "KUBERNETES_CPU_LIMIT": "1",
1496
1490
  "KUBERNETES_CPU_REQUEST": "0.5",
@@ -1549,12 +1543,11 @@ jobs:
1549
1543
  "BUILD_INFO_CURRENT_VERSION": "3.2.1",
1550
1544
  "BUILD_INFO_ID": "some-id",
1551
1545
  "COMPONENT_NAME": "app",
1552
- "DOCKER_CACHE_IMAGE": "$DOCKER_REGISTRY_IMAGE_PATH/caches/app",
1553
- "DOCKER_IMAGE": "$DOCKER_REGISTRY_IMAGE_PATH/$DOCKER_IMAGE_NAME",
1546
+ "DOCKER_CACHE_IMAGE": "$CI_REGISTRY_IMAGE/caches/app",
1547
+ "DOCKER_IMAGE": "$CI_REGISTRY_IMAGE/$DOCKER_IMAGE_NAME",
1554
1548
  "DOCKER_IMAGE_NAME": "prod/app",
1555
1549
  "DOCKER_IMAGE_TAG": "$CI_COMMIT_SHA",
1556
1550
  "DOCKER_REGISTRY": "$CI_REGISTRY",
1557
- "DOCKER_REGISTRY_IMAGE_PATH": "$CI_REGISTRY_IMAGE",
1558
1551
  "ENV_SHORT": "prod",
1559
1552
  "ENV_TYPE": "prod",
1560
1553
  "HELM_ARGS": "",
@@ -1675,12 +1668,11 @@ jobs:
1675
1668
  "BUILD_INFO_CURRENT_VERSION": "3.2.1",
1676
1669
  "BUILD_INFO_ID": "some-id",
1677
1670
  "COMPONENT_NAME": "app",
1678
- "DOCKER_CACHE_IMAGE": "$DOCKER_REGISTRY_IMAGE_PATH/caches/app",
1679
- "DOCKER_IMAGE": "$DOCKER_REGISTRY_IMAGE_PATH/$DOCKER_IMAGE_NAME",
1671
+ "DOCKER_CACHE_IMAGE": "$CI_REGISTRY_IMAGE/caches/app",
1672
+ "DOCKER_IMAGE": "$CI_REGISTRY_IMAGE/$DOCKER_IMAGE_NAME",
1680
1673
  "DOCKER_IMAGE_NAME": "stage/app",
1681
1674
  "DOCKER_IMAGE_TAG": "$CI_COMMIT_SHA",
1682
1675
  "DOCKER_REGISTRY": "$CI_REGISTRY",
1683
- "DOCKER_REGISTRY_IMAGE_PATH": "$CI_REGISTRY_IMAGE",
1684
1676
  "ENV_SHORT": "stage",
1685
1677
  "ENV_TYPE": "stage",
1686
1678
  "HELM_ARGS": "",
@@ -2278,15 +2270,14 @@ jobs:
2278
2270
  "DOCKERFILE_ADDITIONS": undefined,
2279
2271
  "DOCKERFILE_ADDITIONS_END": undefined,
2280
2272
  "DOCKER_BUILDKIT": "1",
2281
- "DOCKER_CACHE_IMAGE": "$DOCKER_REGISTRY_IMAGE_PATH/caches/app",
2273
+ "DOCKER_CACHE_IMAGE": "$CI_REGISTRY_IMAGE/caches/app",
2282
2274
  "DOCKER_DIR": ".",
2283
2275
  "DOCKER_DRIVER": "overlay2",
2284
2276
  "DOCKER_HOST": "tcp://0.0.0.0:2375",
2285
- "DOCKER_IMAGE": "$DOCKER_REGISTRY_IMAGE_PATH/$DOCKER_IMAGE_NAME",
2277
+ "DOCKER_IMAGE": "$CI_REGISTRY_IMAGE/$DOCKER_IMAGE_NAME",
2286
2278
  "DOCKER_IMAGE_NAME": "dev/app",
2287
2279
  "DOCKER_IMAGE_TAG": "$CI_COMMIT_SHA",
2288
2280
  "DOCKER_REGISTRY": "$CI_REGISTRY",
2289
- "DOCKER_REGISTRY_IMAGE_PATH": "$CI_REGISTRY_IMAGE",
2290
2281
  "DOCKER_TLS_CERTDIR": "",
2291
2282
  "KUBERNETES_CPU_LIMIT": "1",
2292
2283
  "KUBERNETES_CPU_REQUEST": "0.5",
@@ -2357,12 +2348,11 @@ jobs:
2357
2348
  "BUILD_INFO_CURRENT_VERSION": "3.2.1",
2358
2349
  "BUILD_INFO_ID": "some-id",
2359
2350
  "COMPONENT_NAME": "app",
2360
- "DOCKER_CACHE_IMAGE": "$DOCKER_REGISTRY_IMAGE_PATH/caches/app",
2361
- "DOCKER_IMAGE": "$DOCKER_REGISTRY_IMAGE_PATH/$DOCKER_IMAGE_NAME",
2351
+ "DOCKER_CACHE_IMAGE": "$CI_REGISTRY_IMAGE/caches/app",
2352
+ "DOCKER_IMAGE": "$CI_REGISTRY_IMAGE/$DOCKER_IMAGE_NAME",
2362
2353
  "DOCKER_IMAGE_NAME": "dev/app",
2363
2354
  "DOCKER_IMAGE_TAG": "$CI_COMMIT_SHA",
2364
2355
  "DOCKER_REGISTRY": "$CI_REGISTRY",
2365
- "DOCKER_REGISTRY_IMAGE_PATH": "$CI_REGISTRY_IMAGE",
2366
2356
  "ENV_SHORT": "dev",
2367
2357
  "ENV_TYPE": "dev",
2368
2358
  "HELM_ARGS": "",
@@ -2872,15 +2862,14 @@ jobs:
2872
2862
  "DOCKERFILE_ADDITIONS": undefined,
2873
2863
  "DOCKERFILE_ADDITIONS_END": undefined,
2874
2864
  "DOCKER_BUILDKIT": "1",
2875
- "DOCKER_CACHE_IMAGE": "$DOCKER_REGISTRY_IMAGE_PATH/caches/app",
2865
+ "DOCKER_CACHE_IMAGE": "$CI_REGISTRY_IMAGE/caches/app",
2876
2866
  "DOCKER_DIR": ".",
2877
2867
  "DOCKER_DRIVER": "overlay2",
2878
2868
  "DOCKER_HOST": "tcp://0.0.0.0:2375",
2879
- "DOCKER_IMAGE": "$DOCKER_REGISTRY_IMAGE_PATH/$DOCKER_IMAGE_NAME",
2869
+ "DOCKER_IMAGE": "$CI_REGISTRY_IMAGE/$DOCKER_IMAGE_NAME",
2880
2870
  "DOCKER_IMAGE_NAME": "review/app",
2881
2871
  "DOCKER_IMAGE_TAG": "$CI_COMMIT_SHA",
2882
2872
  "DOCKER_REGISTRY": "$CI_REGISTRY",
2883
- "DOCKER_REGISTRY_IMAGE_PATH": "$CI_REGISTRY_IMAGE",
2884
2873
  "DOCKER_TLS_CERTDIR": "",
2885
2874
  "KUBERNETES_CPU_LIMIT": "1",
2886
2875
  "KUBERNETES_CPU_REQUEST": "0.5",
@@ -2951,12 +2940,11 @@ jobs:
2951
2940
  "BUILD_INFO_CURRENT_VERSION": "3.2.1",
2952
2941
  "BUILD_INFO_ID": "some-id",
2953
2942
  "COMPONENT_NAME": "app",
2954
- "DOCKER_CACHE_IMAGE": "$DOCKER_REGISTRY_IMAGE_PATH/caches/app",
2955
- "DOCKER_IMAGE": "$DOCKER_REGISTRY_IMAGE_PATH/$DOCKER_IMAGE_NAME",
2943
+ "DOCKER_CACHE_IMAGE": "$CI_REGISTRY_IMAGE/caches/app",
2944
+ "DOCKER_IMAGE": "$CI_REGISTRY_IMAGE/$DOCKER_IMAGE_NAME",
2956
2945
  "DOCKER_IMAGE_NAME": "review/app",
2957
2946
  "DOCKER_IMAGE_TAG": "$CI_COMMIT_SHA",
2958
2947
  "DOCKER_REGISTRY": "$CI_REGISTRY",
2959
- "DOCKER_REGISTRY_IMAGE_PATH": "$CI_REGISTRY_IMAGE",
2960
2948
  "ENV_SHORT": "review",
2961
2949
  "ENV_TYPE": "review",
2962
2950
  "HELM_ARGS": "",
@@ -3545,15 +3533,14 @@ jobs:
3545
3533
  "DOCKERFILE_ADDITIONS": undefined,
3546
3534
  "DOCKERFILE_ADDITIONS_END": undefined,
3547
3535
  "DOCKER_BUILDKIT": "1",
3548
- "DOCKER_CACHE_IMAGE": "$DOCKER_REGISTRY_IMAGE_PATH/caches/app",
3536
+ "DOCKER_CACHE_IMAGE": "$CI_REGISTRY_IMAGE/caches/app",
3549
3537
  "DOCKER_DIR": ".",
3550
3538
  "DOCKER_DRIVER": "overlay2",
3551
3539
  "DOCKER_HOST": "tcp://0.0.0.0:2375",
3552
- "DOCKER_IMAGE": "$DOCKER_REGISTRY_IMAGE_PATH/$DOCKER_IMAGE_NAME",
3540
+ "DOCKER_IMAGE": "$CI_REGISTRY_IMAGE/$DOCKER_IMAGE_NAME",
3553
3541
  "DOCKER_IMAGE_NAME": "prod/app",
3554
3542
  "DOCKER_IMAGE_TAG": "$CI_COMMIT_SHA",
3555
3543
  "DOCKER_REGISTRY": "$CI_REGISTRY",
3556
- "DOCKER_REGISTRY_IMAGE_PATH": "$CI_REGISTRY_IMAGE",
3557
3544
  "DOCKER_TLS_CERTDIR": "",
3558
3545
  "KUBERNETES_CPU_LIMIT": "1",
3559
3546
  "KUBERNETES_CPU_REQUEST": "0.5",
@@ -3599,15 +3586,14 @@ jobs:
3599
3586
  "DOCKERFILE_ADDITIONS": undefined,
3600
3587
  "DOCKERFILE_ADDITIONS_END": undefined,
3601
3588
  "DOCKER_BUILDKIT": "1",
3602
- "DOCKER_CACHE_IMAGE": "$DOCKER_REGISTRY_IMAGE_PATH/caches/app",
3589
+ "DOCKER_CACHE_IMAGE": "$CI_REGISTRY_IMAGE/caches/app",
3603
3590
  "DOCKER_DIR": ".",
3604
3591
  "DOCKER_DRIVER": "overlay2",
3605
3592
  "DOCKER_HOST": "tcp://0.0.0.0:2375",
3606
- "DOCKER_IMAGE": "$DOCKER_REGISTRY_IMAGE_PATH/$DOCKER_IMAGE_NAME",
3593
+ "DOCKER_IMAGE": "$CI_REGISTRY_IMAGE/$DOCKER_IMAGE_NAME",
3607
3594
  "DOCKER_IMAGE_NAME": "stage/app",
3608
3595
  "DOCKER_IMAGE_TAG": "$CI_COMMIT_SHA",
3609
3596
  "DOCKER_REGISTRY": "$CI_REGISTRY",
3610
- "DOCKER_REGISTRY_IMAGE_PATH": "$CI_REGISTRY_IMAGE",
3611
3597
  "DOCKER_TLS_CERTDIR": "",
3612
3598
  "KUBERNETES_CPU_LIMIT": "1",
3613
3599
  "KUBERNETES_CPU_REQUEST": "0.5",
@@ -3666,12 +3652,11 @@ jobs:
3666
3652
  "BUILD_INFO_CURRENT_VERSION": "3.2.1",
3667
3653
  "BUILD_INFO_ID": "some-id",
3668
3654
  "COMPONENT_NAME": "app",
3669
- "DOCKER_CACHE_IMAGE": "$DOCKER_REGISTRY_IMAGE_PATH/caches/app",
3670
- "DOCKER_IMAGE": "$DOCKER_REGISTRY_IMAGE_PATH/$DOCKER_IMAGE_NAME",
3655
+ "DOCKER_CACHE_IMAGE": "$CI_REGISTRY_IMAGE/caches/app",
3656
+ "DOCKER_IMAGE": "$CI_REGISTRY_IMAGE/$DOCKER_IMAGE_NAME",
3671
3657
  "DOCKER_IMAGE_NAME": "prod/app",
3672
3658
  "DOCKER_IMAGE_TAG": "$CI_COMMIT_SHA",
3673
3659
  "DOCKER_REGISTRY": "$CI_REGISTRY",
3674
- "DOCKER_REGISTRY_IMAGE_PATH": "$CI_REGISTRY_IMAGE",
3675
3660
  "ENV_SHORT": "prod",
3676
3661
  "ENV_TYPE": "prod",
3677
3662
  "HELM_ARGS": "",
@@ -3792,12 +3777,11 @@ jobs:
3792
3777
  "BUILD_INFO_CURRENT_VERSION": "3.2.1",
3793
3778
  "BUILD_INFO_ID": "some-id",
3794
3779
  "COMPONENT_NAME": "app",
3795
- "DOCKER_CACHE_IMAGE": "$DOCKER_REGISTRY_IMAGE_PATH/caches/app",
3796
- "DOCKER_IMAGE": "$DOCKER_REGISTRY_IMAGE_PATH/$DOCKER_IMAGE_NAME",
3780
+ "DOCKER_CACHE_IMAGE": "$CI_REGISTRY_IMAGE/caches/app",
3781
+ "DOCKER_IMAGE": "$CI_REGISTRY_IMAGE/$DOCKER_IMAGE_NAME",
3797
3782
  "DOCKER_IMAGE_NAME": "stage/app",
3798
3783
  "DOCKER_IMAGE_TAG": "$CI_COMMIT_SHA",
3799
3784
  "DOCKER_REGISTRY": "$CI_REGISTRY",
3800
- "DOCKER_REGISTRY_IMAGE_PATH": "$CI_REGISTRY_IMAGE",
3801
3785
  "ENV_SHORT": "stage",
3802
3786
  "ENV_TYPE": "stage",
3803
3787
  "HELM_ARGS": "",
package/package.json CHANGED
@@ -52,7 +52,7 @@
52
52
  }
53
53
  ],
54
54
  "license": "MIT",
55
- "version": "1.124.0",
55
+ "version": "1.124.2",
56
56
  "scripts": {
57
57
  "build:tsc": "yarn tsc",
58
58
  "build": "yarn build:compile && yarn build:inline-variables && yarn build:bundle",
package/src/build/custom/buildJob.ts CHANGED
@@ -46,6 +46,7 @@ export const createCustomBuildJobs = (context: Context): CatladderJob[] => {
46
46
  : undefined,
47
47
  dockerBuild: {
48
48
  script: getDockerBuildDefaultScript(
49
+ context,
49
50
  buildConfig.docker?.type === "nginx" ? "ensureNginxDockerfile" : ""
50
51
  ),
51
52