@catladder/pipeline 0.0.0-update-docker-for-apps-e047cc44 → 0.0.0-update-node-b0c7282d

package/examples/__snapshots__/custom-sbom-java.ts.snap

@@ -71,12 +71,20 @@ exports[`matches snapshot 1`] = `
           ],
         },
         "script": [
-          "docker login --username gitlab-ci-token --password $CI_JOB_TOKEN $CI_REGISTRY",
-          "docker version",
+          "echo -e "\\e[0Ksection_start:$(date +%s):docker-login[collapsed=true]\\r\\e[0KDocker Login"",
+          "echo $CL_dev_app_GCLOUD_DEPLOY_credentialsKey > ./____keyfile.json
+          ",
+          "gcloud auth activate-service-account --key-file="./____keyfile.json"",
+          "gcloud auth configure-docker asia-east1-docker.pkg.dev",
+          "echo -e "\\e[0Ksection_end:$(date +%s):docker-login\\r\\e[0K"",
+          "echo -e "\\e[0Ksection_start:$(date +%s):docker-build[collapsed=true]\\r\\e[0KDocker build"",
           "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",
+          "echo -e "\\e[0Ksection_end:$(date +%s):docker-build\\r\\e[0K"",
+          "echo -e "\\e[0Ksection_start:$(date +%s):docker-push[collapsed=true]\\r\\e[0KDocker push and tag"",
           "docker push $DOCKER_IMAGE:$DOCKER_IMAGE_TAG",
           "docker tag $DOCKER_IMAGE:$DOCKER_IMAGE_TAG $DOCKER_CACHE_IMAGE",
           "docker push $DOCKER_CACHE_IMAGE",
+          "echo -e "\\e[0Ksection_end:$(date +%s):docker-push\\r\\e[0K"",
         ],
         "services": [
           {
@@ -92,15 +100,13 @@ exports[`matches snapshot 1`] = `
           "DOCKERFILE_ADDITIONS": undefined,
           "DOCKERFILE_ADDITIONS_END": undefined,
           "DOCKER_BUILDKIT": "1",
-          "DOCKER_CACHE_IMAGE": "$DOCKER_REGISTRY_IMAGE_PATH/caches/app",
+          "DOCKER_CACHE_IMAGE": "asia-east1-docker.pkg.dev/asdf/catladder-deploy/pan-test-app/caches/app",
           "DOCKER_DIR": ".",
           "DOCKER_DRIVER": "overlay2",
           "DOCKER_HOST": "tcp://0.0.0.0:2375",
-          "DOCKER_IMAGE": "$DOCKER_REGISTRY_IMAGE_PATH/$DOCKER_IMAGE_NAME",
-          "DOCKER_IMAGE_NAME": "dev/app",
+          "DOCKER_IMAGE": "asia-east1-docker.pkg.dev/asdf/catladder-deploy/pan-test-app/dev/app",
           "DOCKER_IMAGE_TAG": "$CI_COMMIT_SHA",
-          "DOCKER_REGISTRY": "$CI_REGISTRY",
-          "DOCKER_REGISTRY_IMAGE_PATH": "$CI_REGISTRY_IMAGE",
+          "DOCKER_REGISTRY": "asia-east1-docker.pkg.dev",
           "DOCKER_TLS_CERTDIR": "",
           "KUBERNETES_CPU_LIMIT": "1",
           "KUBERNETES_CPU_REQUEST": "0.5",
@@ -157,13 +163,6 @@ exports[`matches snapshot 1`] = `
           "export GCLOUD_PROJECT_NUMBER=$(gcloud projects describe asdf --format="value(projectNumber)")",
           "echo "GCLOUD_PROJECT_NUMBER: $GCLOUD_PROJECT_NUMBER"",
           "echo -e "\\e[0Ksection_end:$(date +%s):prepare\\r\\e[0K"",
-          "echo -e "\\e[0Ksection_start:$(date +%s):pushToArtifactRegistry[collapsed=true]\\r\\e[0KPushing image to artifacts registry"",
-          "docker login --username gitlab-ci-token --password $CI_JOB_TOKEN $CI_REGISTRY",
-          "gcloud auth configure-docker asia-east1-docker.pkg.dev",
-          "docker pull $DOCKER_IMAGE:$DOCKER_IMAGE_TAG",
-          "docker tag $DOCKER_IMAGE:$DOCKER_IMAGE_TAG asia-east1-docker.pkg.dev/asdf/catladder-deploy/pan-test-app/dev/app:$DOCKER_IMAGE_TAG",
-          "docker push asia-east1-docker.pkg.dev/asdf/catladder-deploy/pan-test-app/dev/app:$DOCKER_IMAGE_TAG",
-          "echo -e "\\e[0Ksection_end:$(date +%s):pushToArtifactRegistry\\r\\e[0K"",
           "echo -e "\\e[0Ksection_start:$(date +%s):deploy[collapsed=true]\\r\\e[0KDeploy to cloud run"",
           "echo "$ENV_VARS" > ____envvars.yaml",
           "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",
@@ -171,6 +170,7 @@ exports[`matches snapshot 1`] = `
           "echo -e "\\e[0Ksection_start:$(date +%s):cleanup[collapsed=true]\\r\\e[0KCleanup"",
           "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",
           "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",
+          "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",
           "echo -e "\\e[0Ksection_end:$(date +%s):cleanup\\r\\e[0K"",
           "echo Uploading SBOM to Dependency Track",
           "/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",
@@ -191,14 +191,12 @@ exports[`matches snapshot 1`] = `
           "BUILD_INFO_ID": "some-id",
           "CLOUDSDK_CORE_DISABLE_PROMPTS": "1",
           "DOCKER_BUILDKIT": "1",
-          "DOCKER_CACHE_IMAGE": "$DOCKER_REGISTRY_IMAGE_PATH/caches/app",
+          "DOCKER_CACHE_IMAGE": "asia-east1-docker.pkg.dev/asdf/catladder-deploy/pan-test-app/caches/app",
           "DOCKER_DRIVER": "overlay2",
           "DOCKER_HOST": "tcp://0.0.0.0:2375",
-          "DOCKER_IMAGE": "$DOCKER_REGISTRY_IMAGE_PATH/$DOCKER_IMAGE_NAME",
-          "DOCKER_IMAGE_NAME": "dev/app",
+          "DOCKER_IMAGE": "asia-east1-docker.pkg.dev/asdf/catladder-deploy/pan-test-app/dev/app",
           "DOCKER_IMAGE_TAG": "$CI_COMMIT_SHA",
-          "DOCKER_REGISTRY": "$CI_REGISTRY",
-          "DOCKER_REGISTRY_IMAGE_PATH": "$CI_REGISTRY_IMAGE",
+          "DOCKER_REGISTRY": "asia-east1-docker.pkg.dev",
           "DOCKER_TLS_CERTDIR": "",
           "ENV_SHORT": "dev",
           "ENV_TYPE": "dev",
@@ -260,6 +258,7 @@ _ALL_ENV_VAR_KEYS: '["ENV_SHORT","APP_DIR","ENV_TYPE","BUILD_INFO_ID","BUILD_INF
           "gcloud auth activate-service-account --key-file="./____keyfile.json"",
           "gcloud run services delete pan-test-app-dev-app --project=asdf --region=asia-east1",
           "gcloud artifacts docker images delete asia-east1-docker.pkg.dev/asdf/catladder-deploy/pan-test-app/dev/app --quiet --delete-tags",
+          "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",
           "echo Disabling component in Dependency Track",
           "/dtrackuploader https://dep.panter.swiss/ "$DT_KEY_PROD" disable "pan-test-app/app" "https://pan-test-app-dev-app-unknown-host.example.com" || true",
           "set -e",
@@ -437,12 +436,20 @@ _ALL_ENV_VAR_KEYS: '["ENV_SHORT","APP_DIR","ENV_TYPE","BUILD_INFO_ID","BUILD_INF
           ],
         },
         "script": [
-          "docker login --username gitlab-ci-token --password $CI_JOB_TOKEN $CI_REGISTRY",
-          "docker version",
+          "echo -e "\\e[0Ksection_start:$(date +%s):docker-login[collapsed=true]\\r\\e[0KDocker Login"",
+          "echo $CL_review_app_GCLOUD_DEPLOY_credentialsKey > ./____keyfile.json
+          ",
+          "gcloud auth activate-service-account --key-file="./____keyfile.json"",
+          "gcloud auth configure-docker asia-east1-docker.pkg.dev",
+          "echo -e "\\e[0Ksection_end:$(date +%s):docker-login\\r\\e[0K"",
+          "echo -e "\\e[0Ksection_start:$(date +%s):docker-build[collapsed=true]\\r\\e[0KDocker build"",
           "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",
+          "echo -e "\\e[0Ksection_end:$(date +%s):docker-build\\r\\e[0K"",
+          "echo -e "\\e[0Ksection_start:$(date +%s):docker-push[collapsed=true]\\r\\e[0KDocker push and tag"",
           "docker push $DOCKER_IMAGE:$DOCKER_IMAGE_TAG",
           "docker tag $DOCKER_IMAGE:$DOCKER_IMAGE_TAG $DOCKER_CACHE_IMAGE",
           "docker push $DOCKER_CACHE_IMAGE",
+          "echo -e "\\e[0Ksection_end:$(date +%s):docker-push\\r\\e[0K"",
         ],
         "services": [
           {
@@ -458,15 +465,13 @@ _ALL_ENV_VAR_KEYS: '["ENV_SHORT","APP_DIR","ENV_TYPE","BUILD_INFO_ID","BUILD_INF
           "DOCKERFILE_ADDITIONS": undefined,
           "DOCKERFILE_ADDITIONS_END": undefined,
           "DOCKER_BUILDKIT": "1",
-          "DOCKER_CACHE_IMAGE": "$DOCKER_REGISTRY_IMAGE_PATH/caches/app",
+          "DOCKER_CACHE_IMAGE": "asia-east1-docker.pkg.dev/asdf/catladder-deploy/pan-test-app/caches/app",
           "DOCKER_DIR": ".",
           "DOCKER_DRIVER": "overlay2",
           "DOCKER_HOST": "tcp://0.0.0.0:2375",
-          "DOCKER_IMAGE": "$DOCKER_REGISTRY_IMAGE_PATH/$DOCKER_IMAGE_NAME",
-          "DOCKER_IMAGE_NAME": "review/app",
+          "DOCKER_IMAGE": "asia-east1-docker.pkg.dev/asdf/catladder-deploy/pan-test-app/review/app/mr1234",
           "DOCKER_IMAGE_TAG": "$CI_COMMIT_SHA",
-          "DOCKER_REGISTRY": "$CI_REGISTRY",
-          "DOCKER_REGISTRY_IMAGE_PATH": "$CI_REGISTRY_IMAGE",
+          "DOCKER_REGISTRY": "asia-east1-docker.pkg.dev",
           "DOCKER_TLS_CERTDIR": "",
           "KUBERNETES_CPU_LIMIT": "1",
           "KUBERNETES_CPU_REQUEST": "0.5",
@@ -482,7 +487,7 @@ _ALL_ENV_VAR_KEYS: '["ENV_SHORT","APP_DIR","ENV_TYPE","BUILD_INFO_ID","BUILD_INF
           ],
         },
         "environment": {
-          "auto_stop_in": "2 week",
+          "auto_stop_in": "1 week",
           "name": "review/some-commit/app",
           "on_stop": "app 🛑 Stop ⚠️ | review ",
           "url": "https://pan-test-app-review-mr1234-app-unknown-host.example.com",
@@ -523,13 +528,6 @@ _ALL_ENV_VAR_KEYS: '["ENV_SHORT","APP_DIR","ENV_TYPE","BUILD_INFO_ID","BUILD_INF
           "export GCLOUD_PROJECT_NUMBER=$(gcloud projects describe asdf --format="value(projectNumber)")",
           "echo "GCLOUD_PROJECT_NUMBER: $GCLOUD_PROJECT_NUMBER"",
           "echo -e "\\e[0Ksection_end:$(date +%s):prepare\\r\\e[0K"",
-          "echo -e "\\e[0Ksection_start:$(date +%s):pushToArtifactRegistry[collapsed=true]\\r\\e[0KPushing image to artifacts registry"",
-          "docker login --username gitlab-ci-token --password $CI_JOB_TOKEN $CI_REGISTRY",
-          "gcloud auth configure-docker asia-east1-docker.pkg.dev",
-          "docker pull $DOCKER_IMAGE:$DOCKER_IMAGE_TAG",
-          "docker tag $DOCKER_IMAGE:$DOCKER_IMAGE_TAG asia-east1-docker.pkg.dev/asdf/catladder-deploy/pan-test-app/review/app/mr1234:$DOCKER_IMAGE_TAG",
-          "docker push asia-east1-docker.pkg.dev/asdf/catladder-deploy/pan-test-app/review/app/mr1234:$DOCKER_IMAGE_TAG",
-          "echo -e "\\e[0Ksection_end:$(date +%s):pushToArtifactRegistry\\r\\e[0K"",
           "echo -e "\\e[0Ksection_start:$(date +%s):deploy[collapsed=true]\\r\\e[0KDeploy to cloud run"",
           "echo "$ENV_VARS" > ____envvars.yaml",
           "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",
@@ -537,6 +535,7 @@ _ALL_ENV_VAR_KEYS: '["ENV_SHORT","APP_DIR","ENV_TYPE","BUILD_INFO_ID","BUILD_INF
           "echo -e "\\e[0Ksection_start:$(date +%s):cleanup[collapsed=true]\\r\\e[0KCleanup"",
           "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",
           "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",
+          "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",
           "set +e",
           "gcloud artifacts docker images delete asia-east1-docker.pkg.dev/asdf/catladder-deploy/pan-test-app/review/app --quiet --delete-tags",
           "set -e",
@@ -560,14 +559,12 @@ _ALL_ENV_VAR_KEYS: '["ENV_SHORT","APP_DIR","ENV_TYPE","BUILD_INFO_ID","BUILD_INF
           "BUILD_INFO_ID": "some-id",
           "CLOUDSDK_CORE_DISABLE_PROMPTS": "1",
           "DOCKER_BUILDKIT": "1",
-          "DOCKER_CACHE_IMAGE": "$DOCKER_REGISTRY_IMAGE_PATH/caches/app",
+          "DOCKER_CACHE_IMAGE": "asia-east1-docker.pkg.dev/asdf/catladder-deploy/pan-test-app/caches/app",
           "DOCKER_DRIVER": "overlay2",
           "DOCKER_HOST": "tcp://0.0.0.0:2375",
-          "DOCKER_IMAGE": "$DOCKER_REGISTRY_IMAGE_PATH/$DOCKER_IMAGE_NAME",
-          "DOCKER_IMAGE_NAME": "review/app",
+          "DOCKER_IMAGE": "asia-east1-docker.pkg.dev/asdf/catladder-deploy/pan-test-app/review/app/mr1234",
           "DOCKER_IMAGE_TAG": "$CI_COMMIT_SHA",
-          "DOCKER_REGISTRY": "$CI_REGISTRY",
-          "DOCKER_REGISTRY_IMAGE_PATH": "$CI_REGISTRY_IMAGE",
+          "DOCKER_REGISTRY": "asia-east1-docker.pkg.dev",
           "DOCKER_TLS_CERTDIR": "",
           "ENV_SHORT": "review",
           "ENV_TYPE": "review",
@@ -629,6 +626,7 @@ _ALL_ENV_VAR_KEYS: '["ENV_SHORT","APP_DIR","ENV_TYPE","BUILD_INFO_ID","BUILD_INF
           "gcloud auth activate-service-account --key-file="./____keyfile.json"",
           "gcloud run services delete pan-test-app-review-mr1234-app --project=asdf --region=asia-east1",
           "gcloud artifacts docker images delete asia-east1-docker.pkg.dev/asdf/catladder-deploy/pan-test-app/review/app/mr1234 --quiet --delete-tags",
+          "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",
           "set +e",
           "gcloud artifacts docker images delete asia-east1-docker.pkg.dev/asdf/catladder-deploy/pan-test-app/review/app --quiet --delete-tags",
           "set -e",
@@ -861,12 +859,20 @@ _ALL_ENV_VAR_KEYS: '["ENV_SHORT","APP_DIR","ENV_TYPE","BUILD_INFO_ID","BUILD_INF
           ],
         },
         "script": [
-          "docker login --username gitlab-ci-token --password $CI_JOB_TOKEN $CI_REGISTRY",
-          "docker version",
+          "echo -e "\\e[0Ksection_start:$(date +%s):docker-login[collapsed=true]\\r\\e[0KDocker Login"",
+          "echo $CL_prod_app_GCLOUD_DEPLOY_credentialsKey > ./____keyfile.json
+          ",
+          "gcloud auth activate-service-account --key-file="./____keyfile.json"",
+          "gcloud auth configure-docker asia-east1-docker.pkg.dev",
+          "echo -e "\\e[0Ksection_end:$(date +%s):docker-login\\r\\e[0K"",
+          "echo -e "\\e[0Ksection_start:$(date +%s):docker-build[collapsed=true]\\r\\e[0KDocker build"",
           "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",
+          "echo -e "\\e[0Ksection_end:$(date +%s):docker-build\\r\\e[0K"",
+          "echo -e "\\e[0Ksection_start:$(date +%s):docker-push[collapsed=true]\\r\\e[0KDocker push and tag"",
           "docker push $DOCKER_IMAGE:$DOCKER_IMAGE_TAG",
           "docker tag $DOCKER_IMAGE:$DOCKER_IMAGE_TAG $DOCKER_CACHE_IMAGE",
           "docker push $DOCKER_CACHE_IMAGE",
+          "echo -e "\\e[0Ksection_end:$(date +%s):docker-push\\r\\e[0K"",
         ],
         "services": [
           {
@@ -882,15 +888,13 @@ _ALL_ENV_VAR_KEYS: '["ENV_SHORT","APP_DIR","ENV_TYPE","BUILD_INFO_ID","BUILD_INF
           "DOCKERFILE_ADDITIONS": undefined,
           "DOCKERFILE_ADDITIONS_END": undefined,
           "DOCKER_BUILDKIT": "1",
-          "DOCKER_CACHE_IMAGE": "$DOCKER_REGISTRY_IMAGE_PATH/caches/app",
+          "DOCKER_CACHE_IMAGE": "asia-east1-docker.pkg.dev/asdf/catladder-deploy/pan-test-app/caches/app",
           "DOCKER_DIR": ".",
           "DOCKER_DRIVER": "overlay2",
           "DOCKER_HOST": "tcp://0.0.0.0:2375",
-          "DOCKER_IMAGE": "$DOCKER_REGISTRY_IMAGE_PATH/$DOCKER_IMAGE_NAME",
-          "DOCKER_IMAGE_NAME": "prod/app",
+          "DOCKER_IMAGE": "asia-east1-docker.pkg.dev/asdf/catladder-deploy/pan-test-app/prod/app",
           "DOCKER_IMAGE_TAG": "$CI_COMMIT_SHA",
-          "DOCKER_REGISTRY": "$CI_REGISTRY",
-          "DOCKER_REGISTRY_IMAGE_PATH": "$CI_REGISTRY_IMAGE",
+          "DOCKER_REGISTRY": "asia-east1-docker.pkg.dev",
           "DOCKER_TLS_CERTDIR": "",
           "KUBERNETES_CPU_LIMIT": "1",
           "KUBERNETES_CPU_REQUEST": "0.5",
@@ -912,12 +916,20 @@ _ALL_ENV_VAR_KEYS: '["ENV_SHORT","APP_DIR","ENV_TYPE","BUILD_INFO_ID","BUILD_INF
           ],
         },
         "script": [
-          "docker login --username gitlab-ci-token --password $CI_JOB_TOKEN $CI_REGISTRY",
-          "docker version",
+          "echo -e "\\e[0Ksection_start:$(date +%s):docker-login[collapsed=true]\\r\\e[0KDocker Login"",
+          "echo $CL_stage_app_GCLOUD_DEPLOY_credentialsKey > ./____keyfile.json
+          ",
+          "gcloud auth activate-service-account --key-file="./____keyfile.json"",
+          "gcloud auth configure-docker asia-east1-docker.pkg.dev",
+          "echo -e "\\e[0Ksection_end:$(date +%s):docker-login\\r\\e[0K"",
+          "echo -e "\\e[0Ksection_start:$(date +%s):docker-build[collapsed=true]\\r\\e[0KDocker build"",
           "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",
+          "echo -e "\\e[0Ksection_end:$(date +%s):docker-build\\r\\e[0K"",
+          "echo -e "\\e[0Ksection_start:$(date +%s):docker-push[collapsed=true]\\r\\e[0KDocker push and tag"",
           "docker push $DOCKER_IMAGE:$DOCKER_IMAGE_TAG",
           "docker tag $DOCKER_IMAGE:$DOCKER_IMAGE_TAG $DOCKER_CACHE_IMAGE",
           "docker push $DOCKER_CACHE_IMAGE",
+          "echo -e "\\e[0Ksection_end:$(date +%s):docker-push\\r\\e[0K"",
         ],
         "services": [
           {
@@ -933,15 +945,13 @@ _ALL_ENV_VAR_KEYS: '["ENV_SHORT","APP_DIR","ENV_TYPE","BUILD_INFO_ID","BUILD_INF
           "DOCKERFILE_ADDITIONS": undefined,
           "DOCKERFILE_ADDITIONS_END": undefined,
           "DOCKER_BUILDKIT": "1",
-          "DOCKER_CACHE_IMAGE": "$DOCKER_REGISTRY_IMAGE_PATH/caches/app",
+          "DOCKER_CACHE_IMAGE": "asia-east1-docker.pkg.dev/asdf/catladder-deploy/pan-test-app/caches/app",
           "DOCKER_DIR": ".",
           "DOCKER_DRIVER": "overlay2",
           "DOCKER_HOST": "tcp://0.0.0.0:2375",
-          "DOCKER_IMAGE": "$DOCKER_REGISTRY_IMAGE_PATH/$DOCKER_IMAGE_NAME",
-          "DOCKER_IMAGE_NAME": "stage/app",
+          "DOCKER_IMAGE": "asia-east1-docker.pkg.dev/asdf/catladder-deploy/pan-test-app/stage/app",
           "DOCKER_IMAGE_TAG": "$CI_COMMIT_SHA",
-          "DOCKER_REGISTRY": "$CI_REGISTRY",
-          "DOCKER_REGISTRY_IMAGE_PATH": "$CI_REGISTRY_IMAGE",
+          "DOCKER_REGISTRY": "asia-east1-docker.pkg.dev",
           "DOCKER_TLS_CERTDIR": "",
           "KUBERNETES_CPU_LIMIT": "1",
           "KUBERNETES_CPU_REQUEST": "0.5",
@@ -998,13 +1008,6 @@ _ALL_ENV_VAR_KEYS: '["ENV_SHORT","APP_DIR","ENV_TYPE","BUILD_INFO_ID","BUILD_INF
           "export GCLOUD_PROJECT_NUMBER=$(gcloud projects describe asdf --format="value(projectNumber)")",
           "echo "GCLOUD_PROJECT_NUMBER: $GCLOUD_PROJECT_NUMBER"",
           "echo -e "\\e[0Ksection_end:$(date +%s):prepare\\r\\e[0K"",
-          "echo -e "\\e[0Ksection_start:$(date +%s):pushToArtifactRegistry[collapsed=true]\\r\\e[0KPushing image to artifacts registry"",
-          "docker login --username gitlab-ci-token --password $CI_JOB_TOKEN $CI_REGISTRY",
-          "gcloud auth configure-docker asia-east1-docker.pkg.dev",
-          "docker pull $DOCKER_IMAGE:$DOCKER_IMAGE_TAG",
-          "docker tag $DOCKER_IMAGE:$DOCKER_IMAGE_TAG asia-east1-docker.pkg.dev/asdf/catladder-deploy/pan-test-app/prod/app:$DOCKER_IMAGE_TAG",
-          "docker push asia-east1-docker.pkg.dev/asdf/catladder-deploy/pan-test-app/prod/app:$DOCKER_IMAGE_TAG",
-          "echo -e "\\e[0Ksection_end:$(date +%s):pushToArtifactRegistry\\r\\e[0K"",
           "echo -e "\\e[0Ksection_start:$(date +%s):deploy[collapsed=true]\\r\\e[0KDeploy to cloud run"",
           "echo "$ENV_VARS" > ____envvars.yaml",
           "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",
@@ -1012,6 +1015,7 @@ _ALL_ENV_VAR_KEYS: '["ENV_SHORT","APP_DIR","ENV_TYPE","BUILD_INFO_ID","BUILD_INF
           "echo -e "\\e[0Ksection_start:$(date +%s):cleanup[collapsed=true]\\r\\e[0KCleanup"",
           "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",
           "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",
+          "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",
           "echo -e "\\e[0Ksection_end:$(date +%s):cleanup\\r\\e[0K"",
           "echo Uploading SBOM to Dependency Track",
           "/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",
@@ -1032,14 +1036,12 @@ _ALL_ENV_VAR_KEYS: '["ENV_SHORT","APP_DIR","ENV_TYPE","BUILD_INFO_ID","BUILD_INF
           "BUILD_INFO_ID": "some-id",
           "CLOUDSDK_CORE_DISABLE_PROMPTS": "1",
           "DOCKER_BUILDKIT": "1",
-          "DOCKER_CACHE_IMAGE": "$DOCKER_REGISTRY_IMAGE_PATH/caches/app",
+          "DOCKER_CACHE_IMAGE": "asia-east1-docker.pkg.dev/asdf/catladder-deploy/pan-test-app/caches/app",
           "DOCKER_DRIVER": "overlay2",
           "DOCKER_HOST": "tcp://0.0.0.0:2375",
-          "DOCKER_IMAGE": "$DOCKER_REGISTRY_IMAGE_PATH/$DOCKER_IMAGE_NAME",
-          "DOCKER_IMAGE_NAME": "prod/app",
+          "DOCKER_IMAGE": "asia-east1-docker.pkg.dev/asdf/catladder-deploy/pan-test-app/prod/app",
           "DOCKER_IMAGE_TAG": "$CI_COMMIT_SHA",
-          "DOCKER_REGISTRY": "$CI_REGISTRY",
-          "DOCKER_REGISTRY_IMAGE_PATH": "$CI_REGISTRY_IMAGE",
+          "DOCKER_REGISTRY": "asia-east1-docker.pkg.dev",
           "DOCKER_TLS_CERTDIR": "",
           "ENV_SHORT": "prod",
           "ENV_TYPE": "prod",
@@ -1116,13 +1118,6 @@ _ALL_ENV_VAR_KEYS: '["ENV_SHORT","APP_DIR","ENV_TYPE","BUILD_INFO_ID","BUILD_INF
           "export GCLOUD_PROJECT_NUMBER=$(gcloud projects describe asdf --format="value(projectNumber)")",
           "echo "GCLOUD_PROJECT_NUMBER: $GCLOUD_PROJECT_NUMBER"",
           "echo -e "\\e[0Ksection_end:$(date +%s):prepare\\r\\e[0K"",
-          "echo -e "\\e[0Ksection_start:$(date +%s):pushToArtifactRegistry[collapsed=true]\\r\\e[0KPushing image to artifacts registry"",
-          "docker login --username gitlab-ci-token --password $CI_JOB_TOKEN $CI_REGISTRY",
-          "gcloud auth configure-docker asia-east1-docker.pkg.dev",
-          "docker pull $DOCKER_IMAGE:$DOCKER_IMAGE_TAG",
-          "docker tag $DOCKER_IMAGE:$DOCKER_IMAGE_TAG asia-east1-docker.pkg.dev/asdf/catladder-deploy/pan-test-app/stage/app:$DOCKER_IMAGE_TAG",
-          "docker push asia-east1-docker.pkg.dev/asdf/catladder-deploy/pan-test-app/stage/app:$DOCKER_IMAGE_TAG",
-          "echo -e "\\e[0Ksection_end:$(date +%s):pushToArtifactRegistry\\r\\e[0K"",
           "echo -e "\\e[0Ksection_start:$(date +%s):deploy[collapsed=true]\\r\\e[0KDeploy to cloud run"",
           "echo "$ENV_VARS" > ____envvars.yaml",
           "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",
@@ -1130,6 +1125,7 @@ _ALL_ENV_VAR_KEYS: '["ENV_SHORT","APP_DIR","ENV_TYPE","BUILD_INFO_ID","BUILD_INF
           "echo -e "\\e[0Ksection_start:$(date +%s):cleanup[collapsed=true]\\r\\e[0KCleanup"",
           "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",
           "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",
+          "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",
           "echo -e "\\e[0Ksection_end:$(date +%s):cleanup\\r\\e[0K"",
           "echo Uploading SBOM to Dependency Track",
           "/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",
@@ -1150,14 +1146,12 @@ _ALL_ENV_VAR_KEYS: '["ENV_SHORT","APP_DIR","ENV_TYPE","BUILD_INFO_ID","BUILD_INF
           "BUILD_INFO_ID": "some-id",
           "CLOUDSDK_CORE_DISABLE_PROMPTS": "1",
           "DOCKER_BUILDKIT": "1",
-          "DOCKER_CACHE_IMAGE": "$DOCKER_REGISTRY_IMAGE_PATH/caches/app",
+          "DOCKER_CACHE_IMAGE": "asia-east1-docker.pkg.dev/asdf/catladder-deploy/pan-test-app/caches/app",
           "DOCKER_DRIVER": "overlay2",
           "DOCKER_HOST": "tcp://0.0.0.0:2375",
-          "DOCKER_IMAGE": "$DOCKER_REGISTRY_IMAGE_PATH/$DOCKER_IMAGE_NAME",
-          "DOCKER_IMAGE_NAME": "stage/app",
+          "DOCKER_IMAGE": "asia-east1-docker.pkg.dev/asdf/catladder-deploy/pan-test-app/stage/app",
           "DOCKER_IMAGE_TAG": "$CI_COMMIT_SHA",
-          "DOCKER_REGISTRY": "$CI_REGISTRY",
-          "DOCKER_REGISTRY_IMAGE_PATH": "$CI_REGISTRY_IMAGE",
+          "DOCKER_REGISTRY": "asia-east1-docker.pkg.dev",
           "DOCKER_TLS_CERTDIR": "",
           "ENV_SHORT": "stage",
           "ENV_TYPE": "stage",
@@ -1219,6 +1213,7 @@ _ALL_ENV_VAR_KEYS: '["ENV_SHORT","APP_DIR","ENV_TYPE","BUILD_INFO_ID","BUILD_INF
           "gcloud auth activate-service-account --key-file="./____keyfile.json"",
           "gcloud run services delete pan-test-app-prod-app --project=asdf --region=asia-east1",
           "gcloud artifacts docker images delete asia-east1-docker.pkg.dev/asdf/catladder-deploy/pan-test-app/prod/app --quiet --delete-tags",
+          "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",
           "echo Disabling component in Dependency Track",
           "/dtrackuploader https://dep.panter.swiss/ "$DT_KEY_PROD" disable "pan-test-app/app" "https://pan-test-app-prod-app-unknown-host.example.com" || true",
           "set -e",
@@ -1267,6 +1262,7 @@ _ALL_ENV_VAR_KEYS: '["ENV_SHORT","APP_DIR","ENV_TYPE","BUILD_INFO_ID","BUILD_INF
           "gcloud auth activate-service-account --key-file="./____keyfile.json"",
           "gcloud run services delete pan-test-app-stage-app --project=asdf --region=asia-east1",
           "gcloud artifacts docker images delete asia-east1-docker.pkg.dev/asdf/catladder-deploy/pan-test-app/stage/app --quiet --delete-tags",
+          "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",
           "echo Disabling component in Dependency Track",
           "/dtrackuploader https://dep.panter.swiss/ "$DT_KEY_PROD" disable "pan-test-app/app" "https://pan-test-app-stage-app-unknown-host.example.com" || true",
           "set -e",

package/examples/__snapshots__/kubernetes-application-customization.ts.snap

@@ -260,12 +260,17 @@ application:
         },
         "script": [
           "ensureNodeDockerfile",
+          "echo -e "\\e[0Ksection_start:$(date +%s):docker-login[collapsed=true]\\r\\e[0KDocker Login"",
           "docker login --username gitlab-ci-token --password $CI_JOB_TOKEN $CI_REGISTRY",
-          "docker version",
+          "echo -e "\\e[0Ksection_end:$(date +%s):docker-login\\r\\e[0K"",
+          "echo -e "\\e[0Ksection_start:$(date +%s):docker-build[collapsed=true]\\r\\e[0KDocker build"",
           "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",
+          "echo -e "\\e[0Ksection_end:$(date +%s):docker-build\\r\\e[0K"",
+          "echo -e "\\e[0Ksection_start:$(date +%s):docker-push[collapsed=true]\\r\\e[0KDocker push and tag"",
           "docker push $DOCKER_IMAGE:$DOCKER_IMAGE_TAG",
           "docker tag $DOCKER_IMAGE:$DOCKER_IMAGE_TAG $DOCKER_CACHE_IMAGE",
           "docker push $DOCKER_CACHE_IMAGE",
+          "echo -e "\\e[0Ksection_end:$(date +%s):docker-push\\r\\e[0K"",
         ],
         "services": [
           {
@@ -281,7 +286,7 @@ application:
           "DOCKERFILE_ADDITIONS": undefined,
           "DOCKERFILE_ADDITIONS_END": undefined,
           "DOCKER_BUILDKIT": "1",
-          "DOCKER_CACHE_IMAGE": "$DOCKER_REGISTRY_IMAGE_PATH/caches/api",
+          "DOCKER_CACHE_IMAGE": "$CI_REGISTRY_IMAGE/caches/api",
           "DOCKER_COPY_AND_INSTALL_APP": "COPY --chown=node:node $APP_DIR .
 RUN yarn plugin import workspace-tools
 RUN yarn workspaces focus --production && yarn rebuild",
@@ -292,11 +297,10 @@ COPY --chown=node:node .yarn /app/.yarn",
           "DOCKER_DIR": ".",
           "DOCKER_DRIVER": "overlay2",
           "DOCKER_HOST": "tcp://0.0.0.0:2375",
-          "DOCKER_IMAGE": "$DOCKER_REGISTRY_IMAGE_PATH/$DOCKER_IMAGE_NAME",
+          "DOCKER_IMAGE": "$CI_REGISTRY_IMAGE/$DOCKER_IMAGE_NAME",
           "DOCKER_IMAGE_NAME": "dev/api",
           "DOCKER_IMAGE_TAG": "$CI_COMMIT_SHA",
           "DOCKER_REGISTRY": "$CI_REGISTRY",
-          "DOCKER_REGISTRY_IMAGE_PATH": "$CI_REGISTRY_IMAGE",
           "DOCKER_TLS_CERTDIR": "",
           "KUBERNETES_CPU_LIMIT": "1",
           "KUBERNETES_CPU_REQUEST": "0.5",
@@ -371,12 +375,11 @@ COPY --chown=node:node .yarn /app/.yarn",
           "BUILD_INFO_CURRENT_VERSION": "3.2.1",
           "BUILD_INFO_ID": "some-id",
           "COMPONENT_NAME": "api",
-          "DOCKER_CACHE_IMAGE": "$DOCKER_REGISTRY_IMAGE_PATH/caches/api",
-          "DOCKER_IMAGE": "$DOCKER_REGISTRY_IMAGE_PATH/$DOCKER_IMAGE_NAME",
+          "DOCKER_CACHE_IMAGE": "$CI_REGISTRY_IMAGE/caches/api",
+          "DOCKER_IMAGE": "$CI_REGISTRY_IMAGE/$DOCKER_IMAGE_NAME",
           "DOCKER_IMAGE_NAME": "dev/api",
           "DOCKER_IMAGE_TAG": "$CI_COMMIT_SHA",
           "DOCKER_REGISTRY": "$CI_REGISTRY",
-          "DOCKER_REGISTRY_IMAGE_PATH": "$CI_REGISTRY_IMAGE",
           "ENV_SHORT": "dev",
           "ENV_TYPE": "dev",
           "HELM_ARGS": "",
@@ -971,12 +974,17 @@ application:
         },
         "script": [
           "ensureNodeDockerfile",
+          "echo -e "\\e[0Ksection_start:$(date +%s):docker-login[collapsed=true]\\r\\e[0KDocker Login"",
           "docker login --username gitlab-ci-token --password $CI_JOB_TOKEN $CI_REGISTRY",
-          "docker version",
+          "echo -e "\\e[0Ksection_end:$(date +%s):docker-login\\r\\e[0K"",
+          "echo -e "\\e[0Ksection_start:$(date +%s):docker-build[collapsed=true]\\r\\e[0KDocker build"",
           "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",
+          "echo -e "\\e[0Ksection_end:$(date +%s):docker-build\\r\\e[0K"",
+          "echo -e "\\e[0Ksection_start:$(date +%s):docker-push[collapsed=true]\\r\\e[0KDocker push and tag"",
           "docker push $DOCKER_IMAGE:$DOCKER_IMAGE_TAG",
           "docker tag $DOCKER_IMAGE:$DOCKER_IMAGE_TAG $DOCKER_CACHE_IMAGE",
           "docker push $DOCKER_CACHE_IMAGE",
+          "echo -e "\\e[0Ksection_end:$(date +%s):docker-push\\r\\e[0K"",
         ],
         "services": [
           {
@@ -992,7 +1000,7 @@ application:
           "DOCKERFILE_ADDITIONS": undefined,
           "DOCKERFILE_ADDITIONS_END": undefined,
           "DOCKER_BUILDKIT": "1",
-          "DOCKER_CACHE_IMAGE": "$DOCKER_REGISTRY_IMAGE_PATH/caches/api",
+          "DOCKER_CACHE_IMAGE": "$CI_REGISTRY_IMAGE/caches/api",
           "DOCKER_COPY_AND_INSTALL_APP": "COPY --chown=node:node $APP_DIR .
 RUN yarn plugin import workspace-tools
 RUN yarn workspaces focus --production && yarn rebuild",
@@ -1003,11 +1011,10 @@ COPY --chown=node:node .yarn /app/.yarn",
           "DOCKER_DIR": ".",
           "DOCKER_DRIVER": "overlay2",
           "DOCKER_HOST": "tcp://0.0.0.0:2375",
-          "DOCKER_IMAGE": "$DOCKER_REGISTRY_IMAGE_PATH/$DOCKER_IMAGE_NAME",
+          "DOCKER_IMAGE": "$CI_REGISTRY_IMAGE/$DOCKER_IMAGE_NAME",
           "DOCKER_IMAGE_NAME": "review/api",
           "DOCKER_IMAGE_TAG": "$CI_COMMIT_SHA",
           "DOCKER_REGISTRY": "$CI_REGISTRY",
-          "DOCKER_REGISTRY_IMAGE_PATH": "$CI_REGISTRY_IMAGE",
           "DOCKER_TLS_CERTDIR": "",
           "KUBERNETES_CPU_LIMIT": "1",
           "KUBERNETES_CPU_REQUEST": "0.5",
@@ -1018,7 +1025,7 @@ COPY --chown=node:node .yarn /app/.yarn",
       "api 🚀 Deploy | review ": {
         "allow_failure": false,
         "environment": {
-          "auto_stop_in": "2 week",
+          "auto_stop_in": "1 week",
           "name": "review/some-commit/api",
           "on_stop": "api 🛑 Stop ⚠️ | review ",
           "url": "https://api.mr1234.review.test-app.pan.panter.cloud",
@@ -1082,12 +1089,11 @@ COPY --chown=node:node .yarn /app/.yarn",
           "BUILD_INFO_CURRENT_VERSION": "3.2.1",
           "BUILD_INFO_ID": "some-id",
           "COMPONENT_NAME": "api",
-          "DOCKER_CACHE_IMAGE": "$DOCKER_REGISTRY_IMAGE_PATH/caches/api",
-          "DOCKER_IMAGE": "$DOCKER_REGISTRY_IMAGE_PATH/$DOCKER_IMAGE_NAME",
+          "DOCKER_CACHE_IMAGE": "$CI_REGISTRY_IMAGE/caches/api",
+          "DOCKER_IMAGE": "$CI_REGISTRY_IMAGE/$DOCKER_IMAGE_NAME",
           "DOCKER_IMAGE_NAME": "review/api",
           "DOCKER_IMAGE_TAG": "$CI_COMMIT_SHA",
           "DOCKER_REGISTRY": "$CI_REGISTRY",
-          "DOCKER_REGISTRY_IMAGE_PATH": "$CI_REGISTRY_IMAGE",
           "ENV_SHORT": "review",
           "ENV_TYPE": "review",
           "HELM_ARGS": "",
@@ -1819,12 +1825,17 @@ application:
         },
         "script": [
           "ensureNodeDockerfile",
+          "echo -e "\\e[0Ksection_start:$(date +%s):docker-login[collapsed=true]\\r\\e[0KDocker Login"",
           "docker login --username gitlab-ci-token --password $CI_JOB_TOKEN $CI_REGISTRY",
-          "docker version",
+          "echo -e "\\e[0Ksection_end:$(date +%s):docker-login\\r\\e[0K"",
+          "echo -e "\\e[0Ksection_start:$(date +%s):docker-build[collapsed=true]\\r\\e[0KDocker build"",
           "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",
+          "echo -e "\\e[0Ksection_end:$(date +%s):docker-build\\r\\e[0K"",
+          "echo -e "\\e[0Ksection_start:$(date +%s):docker-push[collapsed=true]\\r\\e[0KDocker push and tag"",
           "docker push $DOCKER_IMAGE:$DOCKER_IMAGE_TAG",
           "docker tag $DOCKER_IMAGE:$DOCKER_IMAGE_TAG $DOCKER_CACHE_IMAGE",
           "docker push $DOCKER_CACHE_IMAGE",
+          "echo -e "\\e[0Ksection_end:$(date +%s):docker-push\\r\\e[0K"",
         ],
         "services": [
           {
@@ -1840,7 +1851,7 @@ application:
           "DOCKERFILE_ADDITIONS": undefined,
           "DOCKERFILE_ADDITIONS_END": undefined,
           "DOCKER_BUILDKIT": "1",
-          "DOCKER_CACHE_IMAGE": "$DOCKER_REGISTRY_IMAGE_PATH/caches/api",
+          "DOCKER_CACHE_IMAGE": "$CI_REGISTRY_IMAGE/caches/api",
           "DOCKER_COPY_AND_INSTALL_APP": "COPY --chown=node:node $APP_DIR .
 RUN yarn plugin import workspace-tools
 RUN yarn workspaces focus --production && yarn rebuild",
@@ -1851,11 +1862,10 @@ COPY --chown=node:node .yarn /app/.yarn",
           "DOCKER_DIR": ".",
           "DOCKER_DRIVER": "overlay2",
           "DOCKER_HOST": "tcp://0.0.0.0:2375",
-          "DOCKER_IMAGE": "$DOCKER_REGISTRY_IMAGE_PATH/$DOCKER_IMAGE_NAME",
+          "DOCKER_IMAGE": "$CI_REGISTRY_IMAGE/$DOCKER_IMAGE_NAME",
           "DOCKER_IMAGE_NAME": "prod/api",
           "DOCKER_IMAGE_TAG": "$CI_COMMIT_SHA",
           "DOCKER_REGISTRY": "$CI_REGISTRY",
-          "DOCKER_REGISTRY_IMAGE_PATH": "$CI_REGISTRY_IMAGE",
           "DOCKER_TLS_CERTDIR": "",
           "KUBERNETES_CPU_LIMIT": "1",
           "KUBERNETES_CPU_REQUEST": "0.5",
@@ -1887,12 +1897,17 @@ COPY --chown=node:node .yarn /app/.yarn",
         },
         "script": [
           "ensureNodeDockerfile",
+          "echo -e "\\e[0Ksection_start:$(date +%s):docker-login[collapsed=true]\\r\\e[0KDocker Login"",
           "docker login --username gitlab-ci-token --password $CI_JOB_TOKEN $CI_REGISTRY",
-          "docker version",
+          "echo -e "\\e[0Ksection_end:$(date +%s):docker-login\\r\\e[0K"",
+          "echo -e "\\e[0Ksection_start:$(date +%s):docker-build[collapsed=true]\\r\\e[0KDocker build"",
           "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",
+          "echo -e "\\e[0Ksection_end:$(date +%s):docker-build\\r\\e[0K"",
+          "echo -e "\\e[0Ksection_start:$(date +%s):docker-push[collapsed=true]\\r\\e[0KDocker push and tag"",
           "docker push $DOCKER_IMAGE:$DOCKER_IMAGE_TAG",
           "docker tag $DOCKER_IMAGE:$DOCKER_IMAGE_TAG $DOCKER_CACHE_IMAGE",
           "docker push $DOCKER_CACHE_IMAGE",
+          "echo -e "\\e[0Ksection_end:$(date +%s):docker-push\\r\\e[0K"",
         ],
         "services": [
           {
@@ -1908,7 +1923,7 @@ COPY --chown=node:node .yarn /app/.yarn",
           "DOCKERFILE_ADDITIONS": undefined,
           "DOCKERFILE_ADDITIONS_END": undefined,
           "DOCKER_BUILDKIT": "1",
-          "DOCKER_CACHE_IMAGE": "$DOCKER_REGISTRY_IMAGE_PATH/caches/api",
+          "DOCKER_CACHE_IMAGE": "$CI_REGISTRY_IMAGE/caches/api",
           "DOCKER_COPY_AND_INSTALL_APP": "COPY --chown=node:node $APP_DIR .
 RUN yarn plugin import workspace-tools
 RUN yarn workspaces focus --production && yarn rebuild",
@@ -1919,11 +1934,10 @@ COPY --chown=node:node .yarn /app/.yarn",
           "DOCKER_DIR": ".",
           "DOCKER_DRIVER": "overlay2",
           "DOCKER_HOST": "tcp://0.0.0.0:2375",
-          "DOCKER_IMAGE": "$DOCKER_REGISTRY_IMAGE_PATH/$DOCKER_IMAGE_NAME",
+          "DOCKER_IMAGE": "$CI_REGISTRY_IMAGE/$DOCKER_IMAGE_NAME",
           "DOCKER_IMAGE_NAME": "stage/api",
           "DOCKER_IMAGE_TAG": "$CI_COMMIT_SHA",
           "DOCKER_REGISTRY": "$CI_REGISTRY",
-          "DOCKER_REGISTRY_IMAGE_PATH": "$CI_REGISTRY_IMAGE",
           "DOCKER_TLS_CERTDIR": "",
           "KUBERNETES_CPU_LIMIT": "1",
           "KUBERNETES_CPU_REQUEST": "0.5",
@@ -1986,12 +2000,11 @@ COPY --chown=node:node .yarn /app/.yarn",
           "BUILD_INFO_CURRENT_VERSION": "3.2.1",
           "BUILD_INFO_ID": "some-id",
           "COMPONENT_NAME": "api",
-          "DOCKER_CACHE_IMAGE": "$DOCKER_REGISTRY_IMAGE_PATH/caches/api",
-          "DOCKER_IMAGE": "$DOCKER_REGISTRY_IMAGE_PATH/$DOCKER_IMAGE_NAME",
+          "DOCKER_CACHE_IMAGE": "$CI_REGISTRY_IMAGE/caches/api",
+          "DOCKER_IMAGE": "$CI_REGISTRY_IMAGE/$DOCKER_IMAGE_NAME",
           "DOCKER_IMAGE_NAME": "prod/api",
           "DOCKER_IMAGE_TAG": "$CI_COMMIT_SHA",
           "DOCKER_REGISTRY": "$CI_REGISTRY",
-          "DOCKER_REGISTRY_IMAGE_PATH": "$CI_REGISTRY_IMAGE",
           "ENV_SHORT": "prod",
           "ENV_TYPE": "prod",
           "HELM_ARGS": "",
@@ -2110,12 +2123,11 @@ application:
           "BUILD_INFO_CURRENT_VERSION": "3.2.1",
           "BUILD_INFO_ID": "some-id",
           "COMPONENT_NAME": "api",
-          "DOCKER_CACHE_IMAGE": "$DOCKER_REGISTRY_IMAGE_PATH/caches/api",
-          "DOCKER_IMAGE": "$DOCKER_REGISTRY_IMAGE_PATH/$DOCKER_IMAGE_NAME",
+          "DOCKER_CACHE_IMAGE": "$CI_REGISTRY_IMAGE/caches/api",
+          "DOCKER_IMAGE": "$CI_REGISTRY_IMAGE/$DOCKER_IMAGE_NAME",
           "DOCKER_IMAGE_NAME": "stage/api",
           "DOCKER_IMAGE_TAG": "$CI_COMMIT_SHA",
           "DOCKER_REGISTRY": "$CI_REGISTRY",
-          "DOCKER_REGISTRY_IMAGE_PATH": "$CI_REGISTRY_IMAGE",
           "ENV_SHORT": "stage",
           "ENV_TYPE": "stage",
           "HELM_ARGS": "",