@catladder/pipeline 0.0.0-refactor-deploy-5f0bbd8a → 0.0.0-refactor-image-ca767657

package/examples/__snapshots__/meteor-kubernetes.ts.snap

@@ -8,9 +8,6 @@ exports[`matches snapshot 1`] = `
       "web ↩️ Rollback ⚠️ | dev ": {
         "environment": {
           "action": "access",
-          "kubernetes": {
-            "namespace": "pan-my-app-dev",
-          },
           "name": "dev/web",
           "url": "https://web.dev.my-app.pan.panter.cloud",
         },
@@ -299,9 +296,6 @@ mongodb:
         "allow_failure": false,
         "environment": {
           "auto_stop_in": "4 weeks",
-          "kubernetes": {
-            "namespace": "pan-my-app-dev",
-          },
           "name": "dev/web",
           "on_stop": "web 🛑 Stop ⚠️ | dev ",
           "url": "https://web.dev.my-app.pan.panter.cloud",
@@ -444,9 +438,6 @@ mongodb:
       "web 🛑 Stop ⚠️ | dev ": {
         "environment": {
           "action": "stop",
-          "kubernetes": {
-            "namespace": "pan-my-app-dev",
-          },
           "name": "dev/web",
           "url": "https://web.dev.my-app.pan.panter.cloud",
         },
@@ -725,9 +716,6 @@ mongodb:
       "web ↩️ Rollback ⚠️ | review ": {
         "environment": {
           "action": "access",
-          "kubernetes": {
-            "namespace": "pan-my-app-review",
-          },
           "name": "review/some-commit/web",
           "url": "https://web.mr1234.review.my-app.pan.panter.cloud",
         },
@@ -1016,9 +1004,6 @@ mongodb:
         "allow_failure": false,
         "environment": {
           "auto_stop_in": "2 week",
-          "kubernetes": {
-            "namespace": "pan-my-app-review",
-          },
           "name": "review/some-commit/web",
           "on_stop": "web 🛑 Stop ⚠️ | review ",
           "url": "https://web.mr1234.review.my-app.pan.panter.cloud",
@@ -1161,9 +1146,6 @@ mongodb:
       "web 🛑 Stop ⚠️ | review ": {
         "environment": {
           "action": "stop",
-          "kubernetes": {
-            "namespace": "pan-my-app-review",
-          },
           "name": "review/some-commit/web",
           "url": "https://web.mr1234.review.my-app.pan.panter.cloud",
         },
@@ -1442,9 +1424,6 @@ mongodb:
       "web ↩️ Rollback ⚠️ | prod ": {
         "environment": {
           "action": "access",
-          "kubernetes": {
-            "namespace": "pan-my-app-prod",
-          },
           "name": "prod/web",
           "url": "https://www.example.com",
         },
@@ -1565,9 +1544,6 @@ mongodb:
       "web ↩️ Rollback ⚠️ | stage ": {
         "environment": {
           "action": "access",
-          "kubernetes": {
-            "namespace": "pan-my-app-stage",
-          },
           "name": "stage/web",
           "url": "https://web.stage.my-app.pan.panter.cloud",
         },
@@ -1950,9 +1926,6 @@ mongodb:
         "allow_failure": true,
         "environment": {
           "auto_stop_in": undefined,
-          "kubernetes": {
-            "namespace": "pan-my-app-prod",
-          },
           "name": "prod/web",
           "on_stop": "web 🛑 Stop ⚠️ | prod ",
           "url": "https://www.example.com",
@@ -2096,9 +2069,6 @@ mongodb:
         "allow_failure": false,
         "environment": {
           "auto_stop_in": undefined,
-          "kubernetes": {
-            "namespace": "pan-my-app-stage",
-          },
           "name": "stage/web",
           "on_stop": "web 🛑 Stop ⚠️ | stage ",
           "url": "https://web.stage.my-app.pan.panter.cloud",
@@ -2229,9 +2199,6 @@ mongodb:
       "web 🛑 Stop ⚠️ | prod ": {
         "environment": {
           "action": "stop",
-          "kubernetes": {
-            "namespace": "pan-my-app-prod",
-          },
           "name": "prod/web",
           "url": "https://www.example.com",
         },
@@ -2359,9 +2326,6 @@ mongodb:
       "web 🛑 Stop ⚠️ | stage ": {
         "environment": {
           "action": "stop",
-          "kubernetes": {
-            "namespace": "pan-my-app-stage",
-          },
           "name": "stage/web",
           "url": "https://web.stage.my-app.pan.panter.cloud",
         },

package/examples/__snapshots__/native-app.ts.snap

@@ -253,11 +253,11 @@ COPY --chown=node:node .yarn /app/.yarn",
           "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/$DOCKER_IMAGE_NAME:$DOCKER_IMAGE_TAG",
-          "docker push asia-east1-docker.pkg.dev/asdf/catladder-deploy/pan-test-app/$DOCKER_IMAGE_NAME:$DOCKER_IMAGE_TAG",
+          "docker tag $DOCKER_IMAGE:$DOCKER_IMAGE_TAG asia-east1-docker.pkg.dev/asdf/catladder-deploy/pan-test-app/dev/api:$DOCKER_IMAGE_TAG",
+          "docker push asia-east1-docker.pkg.dev/asdf/catladder-deploy/pan-test-app/dev/api:$DOCKER_IMAGE_TAG",
           "echo "$ENV_VARS" > ____envvars.yaml",
-          "gcloud run deploy pan-test-app-dev-api --command="yarn,start" --image=asia-east1-docker.pkg.dev/asdf/catladder-deploy/pan-test-app/$DOCKER_IMAGE_NAME:$DOCKER_IMAGE_TAG --project=asdf --region=asia-east1 --labels=customer-name=pan,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 --cpu-boost",
-          "docker image rm asia-east1-docker.pkg.dev/asdf/catladder-deploy/pan-test-app/$DOCKER_IMAGE_NAME:$DOCKER_IMAGE_TAG",
+          "gcloud run deploy pan-test-app-dev-api --command="yarn,start" --image=asia-east1-docker.pkg.dev/asdf/catladder-deploy/pan-test-app/dev/api:$DOCKER_IMAGE_TAG --project=asdf --region=asia-east1 --labels=customer-name=pan,component-name=api,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 --cpu-boost",
+          "docker image rm asia-east1-docker.pkg.dev/asdf/catladder-deploy/pan-test-app/dev/api:$DOCKER_IMAGE_TAG",
           "echo Uploading SBOM to Dependency Track",
           "/dtrackuploader https://dep.panter.swiss/ "$DT_KEY_PROD" upload "pan-test-app/api" "https://pan-test-app-dev-api-unknown-host.example.com" "__sbom.json" vex.json || true",
         ],
@@ -1109,11 +1109,11 @@ COPY --chown=node:node .yarn /app/.yarn",
           "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/$DOCKER_IMAGE_NAME:$DOCKER_IMAGE_TAG",
-          "docker push asia-east1-docker.pkg.dev/asdf/catladder-deploy/pan-test-app/$DOCKER_IMAGE_NAME:$DOCKER_IMAGE_TAG",
+          "docker tag $DOCKER_IMAGE:$DOCKER_IMAGE_TAG asia-east1-docker.pkg.dev/asdf/catladder-deploy/pan-test-app/review/api:$DOCKER_IMAGE_TAG",
+          "docker push asia-east1-docker.pkg.dev/asdf/catladder-deploy/pan-test-app/review/api:$DOCKER_IMAGE_TAG",
           "echo "$ENV_VARS" > ____envvars.yaml",
-          "gcloud run deploy pan-test-app-review-mr1234-api --command="yarn,start" --image=asia-east1-docker.pkg.dev/asdf/catladder-deploy/pan-test-app/$DOCKER_IMAGE_NAME:$DOCKER_IMAGE_TAG --project=asdf --region=asia-east1 --labels=customer-name=pan,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 --cpu-boost",
-          "docker image rm asia-east1-docker.pkg.dev/asdf/catladder-deploy/pan-test-app/$DOCKER_IMAGE_NAME:$DOCKER_IMAGE_TAG",
+          "gcloud run deploy pan-test-app-review-mr1234-api --command="yarn,start" --image=asia-east1-docker.pkg.dev/asdf/catladder-deploy/pan-test-app/review/api:$DOCKER_IMAGE_TAG --project=asdf --region=asia-east1 --labels=customer-name=pan,component-name=api,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 --cpu-boost",
+          "docker image rm asia-east1-docker.pkg.dev/asdf/catladder-deploy/pan-test-app/review/api:$DOCKER_IMAGE_TAG",
           "echo Uploading SBOM to Dependency Track",
           "/dtrackuploader https://dep.panter.swiss/ "$DT_KEY_PROD" upload "pan-test-app/api" "https://pan-test-app-review-mr1234-api-unknown-host.example.com" "__sbom.json" vex.json || true",
         ],
@@ -2053,11 +2053,11 @@ COPY --chown=node:node .yarn /app/.yarn",
           "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/$DOCKER_IMAGE_NAME:$DOCKER_IMAGE_TAG",
-          "docker push asia-east1-docker.pkg.dev/asdf/catladder-deploy/pan-test-app/$DOCKER_IMAGE_NAME:$DOCKER_IMAGE_TAG",
+          "docker tag $DOCKER_IMAGE:$DOCKER_IMAGE_TAG asia-east1-docker.pkg.dev/asdf/catladder-deploy/pan-test-app/prod/api:$DOCKER_IMAGE_TAG",
+          "docker push asia-east1-docker.pkg.dev/asdf/catladder-deploy/pan-test-app/prod/api:$DOCKER_IMAGE_TAG",
           "echo "$ENV_VARS" > ____envvars.yaml",
-          "gcloud run deploy pan-test-app-prod-api --command="yarn,start" --image=asia-east1-docker.pkg.dev/asdf/catladder-deploy/pan-test-app/$DOCKER_IMAGE_NAME:$DOCKER_IMAGE_TAG --project=asdf --region=asia-east1 --labels=customer-name=pan,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 --cpu-boost",
-          "docker image rm asia-east1-docker.pkg.dev/asdf/catladder-deploy/pan-test-app/$DOCKER_IMAGE_NAME:$DOCKER_IMAGE_TAG",
+          "gcloud run deploy pan-test-app-prod-api --command="yarn,start" --image=asia-east1-docker.pkg.dev/asdf/catladder-deploy/pan-test-app/prod/api:$DOCKER_IMAGE_TAG --project=asdf --region=asia-east1 --labels=customer-name=pan,component-name=api,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 --cpu-boost",
+          "docker image rm asia-east1-docker.pkg.dev/asdf/catladder-deploy/pan-test-app/prod/api:$DOCKER_IMAGE_TAG",
           "echo Uploading SBOM to Dependency Track",
           "/dtrackuploader https://dep.panter.swiss/ "$DT_KEY_PROD" upload "pan-test-app/api" "https://pan-test-app-prod-api-unknown-host.example.com" "__sbom.json" vex.json || true",
         ],
@@ -2162,11 +2162,11 @@ _ALL_ENV_VAR_KEYS: '["ENV_SHORT","APP_DIR","ENV_TYPE","BUILD_INFO_ID","BUILD_INF
           "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/$DOCKER_IMAGE_NAME:$DOCKER_IMAGE_TAG",
-          "docker push asia-east1-docker.pkg.dev/asdf/catladder-deploy/pan-test-app/$DOCKER_IMAGE_NAME:$DOCKER_IMAGE_TAG",
+          "docker tag $DOCKER_IMAGE:$DOCKER_IMAGE_TAG asia-east1-docker.pkg.dev/asdf/catladder-deploy/pan-test-app/stage/api:$DOCKER_IMAGE_TAG",
+          "docker push asia-east1-docker.pkg.dev/asdf/catladder-deploy/pan-test-app/stage/api:$DOCKER_IMAGE_TAG",
           "echo "$ENV_VARS" > ____envvars.yaml",
-          "gcloud run deploy pan-test-app-stage-api --command="yarn,start" --image=asia-east1-docker.pkg.dev/asdf/catladder-deploy/pan-test-app/$DOCKER_IMAGE_NAME:$DOCKER_IMAGE_TAG --project=asdf --region=asia-east1 --labels=customer-name=pan,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 --cpu-boost",
-          "docker image rm asia-east1-docker.pkg.dev/asdf/catladder-deploy/pan-test-app/$DOCKER_IMAGE_NAME:$DOCKER_IMAGE_TAG",
+          "gcloud run deploy pan-test-app-stage-api --command="yarn,start" --image=asia-east1-docker.pkg.dev/asdf/catladder-deploy/pan-test-app/stage/api:$DOCKER_IMAGE_TAG --project=asdf --region=asia-east1 --labels=customer-name=pan,component-name=api,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 --cpu-boost",
+          "docker image rm asia-east1-docker.pkg.dev/asdf/catladder-deploy/pan-test-app/stage/api:$DOCKER_IMAGE_TAG",
           "echo Uploading SBOM to Dependency Track",
           "/dtrackuploader https://dep.panter.swiss/ "$DT_KEY_PROD" upload "pan-test-app/api" "https://pan-test-app-stage-api-unknown-host.example.com" "__sbom.json" vex.json || true",
         ],

package/examples/__snapshots__/node-build-with-custom-image.ts.snap

@@ -253,11 +253,11 @@ COPY --chown=node:node .yarn /app/.yarn",
           "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/$DOCKER_IMAGE_NAME:$DOCKER_IMAGE_TAG",
-          "docker push asia-east1-docker.pkg.dev/asdf/catladder-deploy/pan-test-app/$DOCKER_IMAGE_NAME:$DOCKER_IMAGE_TAG",
+          "docker tag $DOCKER_IMAGE:$DOCKER_IMAGE_TAG asia-east1-docker.pkg.dev/asdf/catladder-deploy/pan-test-app/dev/www:$DOCKER_IMAGE_TAG",
+          "docker push asia-east1-docker.pkg.dev/asdf/catladder-deploy/pan-test-app/dev/www:$DOCKER_IMAGE_TAG",
           "echo "$ENV_VARS" > ____envvars.yaml",
-          "gcloud run deploy pan-test-app-dev-www --command="yarn,start" --image=asia-east1-docker.pkg.dev/asdf/catladder-deploy/pan-test-app/$DOCKER_IMAGE_NAME:$DOCKER_IMAGE_TAG --project=asdf --region=asia-east1 --labels=customer-name=pan,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 --cpu-boost",
-          "docker image rm asia-east1-docker.pkg.dev/asdf/catladder-deploy/pan-test-app/$DOCKER_IMAGE_NAME:$DOCKER_IMAGE_TAG",
+          "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 --cpu-boost",
+          "docker image rm asia-east1-docker.pkg.dev/asdf/catladder-deploy/pan-test-app/dev/www:$DOCKER_IMAGE_TAG",
           "echo Uploading SBOM to Dependency Track",
           "/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",
         ],
@@ -770,11 +770,11 @@ COPY --chown=node:node .yarn /app/.yarn",
           "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/$DOCKER_IMAGE_NAME:$DOCKER_IMAGE_TAG",
-          "docker push asia-east1-docker.pkg.dev/asdf/catladder-deploy/pan-test-app/$DOCKER_IMAGE_NAME:$DOCKER_IMAGE_TAG",
+          "docker tag $DOCKER_IMAGE:$DOCKER_IMAGE_TAG asia-east1-docker.pkg.dev/asdf/catladder-deploy/pan-test-app/review/www:$DOCKER_IMAGE_TAG",
+          "docker push asia-east1-docker.pkg.dev/asdf/catladder-deploy/pan-test-app/review/www:$DOCKER_IMAGE_TAG",
           "echo "$ENV_VARS" > ____envvars.yaml",
-          "gcloud run deploy pan-test-app-review-mr1234-www --command="yarn,start" --image=asia-east1-docker.pkg.dev/asdf/catladder-deploy/pan-test-app/$DOCKER_IMAGE_NAME:$DOCKER_IMAGE_TAG --project=asdf --region=asia-east1 --labels=customer-name=pan,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 --cpu-boost",
-          "docker image rm asia-east1-docker.pkg.dev/asdf/catladder-deploy/pan-test-app/$DOCKER_IMAGE_NAME:$DOCKER_IMAGE_TAG",
+          "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:$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 --cpu-boost",
+          "docker image rm asia-east1-docker.pkg.dev/asdf/catladder-deploy/pan-test-app/review/www:$DOCKER_IMAGE_TAG",
           "echo Uploading SBOM to Dependency Track",
           "/dtrackuploader https://dep.panter.swiss/ "$DT_KEY_PROD" upload "pan-test-app/www" "https://pan-test-app-review-mr1234-www-unknown-host.example.com" "__sbom.json" vex.json || true",
         ],
@@ -1375,11 +1375,11 @@ COPY --chown=node:node .yarn /app/.yarn",
           "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/$DOCKER_IMAGE_NAME:$DOCKER_IMAGE_TAG",
-          "docker push asia-east1-docker.pkg.dev/asdf/catladder-deploy/pan-test-app/$DOCKER_IMAGE_NAME:$DOCKER_IMAGE_TAG",
+          "docker tag $DOCKER_IMAGE:$DOCKER_IMAGE_TAG asia-east1-docker.pkg.dev/asdf/catladder-deploy/pan-test-app/prod/www:$DOCKER_IMAGE_TAG",
+          "docker push asia-east1-docker.pkg.dev/asdf/catladder-deploy/pan-test-app/prod/www:$DOCKER_IMAGE_TAG",
           "echo "$ENV_VARS" > ____envvars.yaml",
-          "gcloud run deploy pan-test-app-prod-www --command="yarn,start" --image=asia-east1-docker.pkg.dev/asdf/catladder-deploy/pan-test-app/$DOCKER_IMAGE_NAME:$DOCKER_IMAGE_TAG --project=asdf --region=asia-east1 --labels=customer-name=pan,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 --cpu-boost",
-          "docker image rm asia-east1-docker.pkg.dev/asdf/catladder-deploy/pan-test-app/$DOCKER_IMAGE_NAME:$DOCKER_IMAGE_TAG",
+          "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 --cpu-boost",
+          "docker image rm asia-east1-docker.pkg.dev/asdf/catladder-deploy/pan-test-app/prod/www:$DOCKER_IMAGE_TAG",
           "echo Uploading SBOM to Dependency Track",
           "/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",
         ],
@@ -1484,11 +1484,11 @@ _ALL_ENV_VAR_KEYS: '["ENV_SHORT","APP_DIR","ENV_TYPE","BUILD_INFO_ID","BUILD_INF
           "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/$DOCKER_IMAGE_NAME:$DOCKER_IMAGE_TAG",
-          "docker push asia-east1-docker.pkg.dev/asdf/catladder-deploy/pan-test-app/$DOCKER_IMAGE_NAME:$DOCKER_IMAGE_TAG",
+          "docker tag $DOCKER_IMAGE:$DOCKER_IMAGE_TAG asia-east1-docker.pkg.dev/asdf/catladder-deploy/pan-test-app/stage/www:$DOCKER_IMAGE_TAG",
+          "docker push asia-east1-docker.pkg.dev/asdf/catladder-deploy/pan-test-app/stage/www:$DOCKER_IMAGE_TAG",
           "echo "$ENV_VARS" > ____envvars.yaml",
-          "gcloud run deploy pan-test-app-stage-www --command="yarn,start" --image=asia-east1-docker.pkg.dev/asdf/catladder-deploy/pan-test-app/$DOCKER_IMAGE_NAME:$DOCKER_IMAGE_TAG --project=asdf --region=asia-east1 --labels=customer-name=pan,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 --cpu-boost",
-          "docker image rm asia-east1-docker.pkg.dev/asdf/catladder-deploy/pan-test-app/$DOCKER_IMAGE_NAME:$DOCKER_IMAGE_TAG",
+          "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 --cpu-boost",
+          "docker image rm asia-east1-docker.pkg.dev/asdf/catladder-deploy/pan-test-app/stage/www:$DOCKER_IMAGE_TAG",
           "echo Uploading SBOM to Dependency Track",
           "/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",
         ],

package/examples/__snapshots__/rails-k8s-with-worker.ts.snap

@@ -8,9 +8,6 @@ exports[`matches snapshot 1`] = `
       "app ↩️ Rollback ⚠️ | dev ": {
         "environment": {
           "action": "access",
-          "kubernetes": {
-            "namespace": "pan-test-app-dev",
-          },
           "name": "dev/app",
           "url": "https://app.dev.test-app.pan.panter.cloud",
         },
@@ -199,9 +196,6 @@ jobs:
         "allow_failure": false,
         "environment": {
           "auto_stop_in": "4 weeks",
-          "kubernetes": {
-            "namespace": "pan-test-app-dev",
-          },
           "name": "dev/app",
           "on_stop": "app 🛑 Stop ⚠️ | dev ",
           "url": "https://app.dev.test-app.pan.panter.cloud",
@@ -339,9 +333,6 @@ jobs:
       "app 🛑 Stop ⚠️ | dev ": {
         "environment": {
           "action": "stop",
-          "kubernetes": {
-            "namespace": "pan-test-app-dev",
-          },
           "name": "dev/app",
           "url": "https://app.dev.test-app.pan.panter.cloud",
         },
@@ -602,9 +593,6 @@ jobs:
       "app ↩️ Rollback ⚠️ | review ": {
         "environment": {
           "action": "access",
-          "kubernetes": {
-            "namespace": "pan-test-app-review",
-          },
           "name": "review/some-commit/app",
           "url": "https://app.mr1234.review.test-app.pan.panter.cloud",
         },
@@ -796,9 +784,6 @@ jobs:
         "allow_failure": false,
         "environment": {
           "auto_stop_in": "2 week",
-          "kubernetes": {
-            "namespace": "pan-test-app-review",
-          },
           "name": "review/some-commit/app",
           "on_stop": "app 🛑 Stop ⚠️ | review ",
           "url": "https://app.mr1234.review.test-app.pan.panter.cloud",
@@ -939,9 +924,6 @@ jobs:
       "app 🛑 Stop ⚠️ | review ": {
         "environment": {
           "action": "stop",
-          "kubernetes": {
-            "namespace": "pan-test-app-review",
-          },
           "name": "review/some-commit/app",
           "url": "https://app.mr1234.review.test-app.pan.panter.cloud",
         },
@@ -1205,9 +1187,6 @@ jobs:
       "app ↩️ Rollback ⚠️ | prod ": {
         "environment": {
           "action": "access",
-          "kubernetes": {
-            "namespace": "pan-test-app-prod",
-          },
           "name": "prod/app",
           "url": "https://my-fancy-website.com",
         },
@@ -1315,9 +1294,6 @@ jobs:
       "app ↩️ Rollback ⚠️ | stage ": {
         "environment": {
           "action": "access",
-          "kubernetes": {
-            "namespace": "pan-test-app-stage",
-          },
           "name": "stage/app",
           "url": "https://app.stage.test-app.pan.panter.cloud",
         },
@@ -1524,9 +1500,6 @@ jobs:
         "allow_failure": true,
         "environment": {
           "auto_stop_in": undefined,
-          "kubernetes": {
-            "namespace": "pan-test-app-prod",
-          },
           "name": "prod/app",
           "on_stop": "app 🛑 Stop ⚠️ | prod ",
           "url": "https://my-fancy-website.com",
@@ -1653,9 +1626,6 @@ jobs:
         "allow_failure": false,
         "environment": {
           "auto_stop_in": undefined,
-          "kubernetes": {
-            "namespace": "pan-test-app-stage",
-          },
           "name": "stage/app",
           "on_stop": "app 🛑 Stop ⚠️ | stage ",
           "url": "https://app.stage.test-app.pan.panter.cloud",
@@ -1781,9 +1751,6 @@ jobs:
       "app 🛑 Stop ⚠️ | prod ": {
         "environment": {
           "action": "stop",
-          "kubernetes": {
-            "namespace": "pan-test-app-prod",
-          },
           "name": "prod/app",
           "url": "https://my-fancy-website.com",
         },
@@ -1898,9 +1865,6 @@ jobs:
       "app 🛑 Stop ⚠️ | stage ": {
         "environment": {
           "action": "stop",
-          "kubernetes": {
-            "namespace": "pan-test-app-stage",
-          },
           "name": "stage/app",
           "url": "https://app.stage.test-app.pan.panter.cloud",
         },

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@catladder/pipeline",
-  "version": "0.0.0-refactor-deploy-5f0bbd8a",
+  "version": "0.0.0-refactor-image-ca767657",
   "scripts": {
     "build:tsc": "yarn tsc",
     "build": "yarn build:compile && yarn build:inline-variables && yarn build:bundle",
@@ -9,7 +9,8 @@
     "build:inline-variables": "yarn babel --keep-file-extension --extensions \".ts,.js\" --config-file ./babel-inline.json dist --out-dir dist",
     "build:watch": "yarn tsc -w",
     "lint": "eslint \"src/**/*.ts\"",
-    "lint:fix": "eslint \"src/**/*.ts\" --fix"
+    "lint:fix": "eslint \"src/**/*.ts\" --fix",
+    "generate:gitlab-ci-yml-types": "ts-node ./scripts/generate-gitlab-ci-types.ts"
   },
   "types": "dist/index.d.ts",
   "main": "dist/index.js",
@@ -31,6 +32,7 @@
     "child-process-promise": "^2.2.1",
     "eslint": "^8.7.0",
     "js-yaml": "^4.1.0",
+    "json-schema-to-typescript": "^13.0.2",
     "lodash": "^4.17.21",
     "memoizee": "^0.4.15",
     "path-equal": "1.1.3",

package/scripts/generate-gitlab-ci-types.ts

@@ -0,0 +1,51 @@
+import { compile } from "json-schema-to-typescript";
+import { resolve, join } from "path";
+import { existsSync } from "fs";
+import { rm, writeFile } from "fs/promises";
+
+const rootPath = resolve(__dirname, "..");
+const typeOutputPath = join(rootPath, "src/types/gitlab-ci-yml.ts");
+
+export const generateFromCurrentSchema = async () => {
+  const response = await fetch(
+    "https://gitlab.com/gitlab-org/gitlab/-/raw/master/app/assets/javascripts/editor/schema/ci.json"
+  );
+  const gitLabCiJsonSchema = await response.json();
+  const schema = await compile(gitLabCiJsonSchema, "GitlabCiYml", {
+    additionalProperties: true,
+    enableConstEnums: true,
+    declareExternallyReferenced: true,
+    unreachableDefinitions: true,
+    strictIndexSignatures: true,
+    unknownAny: false,
+    ignoreMinAndMaxItems: true,
+    format: true,
+    style: {
+      bracketSpacing: true,
+      printWidth: 100,
+      semi: true,
+      tabWidth: 2,
+      useTabs: false,
+      trailingComma: "es5",
+      endOfLine: "lf",
+    },
+    cwd: rootPath,
+  });
+  /**
+   * Remove part that failes with tsc error
+   * ```
+   * error TS2411: Property '$schema' of type 'string | undefined' is not assignable to 'string' index type 'JobTemplate1'.
+   * ```
+   */
+  const sanitizedSchenma = schema.replace(
+    // eslint-disable-next-line no-useless-escape
+    /export interface HttpsGitlabComGitlabCiYml \{\n[ a-zA-Z0-9?$:;\n_!"\{\}\/*@\[\],.|\(\)]*\[k\: string\]: Job;\n\}/m,
+    ""
+  );
+  if (existsSync(typeOutputPath)) {
+    await rm(typeOutputPath);
+  }
+  await writeFile(typeOutputPath, sanitizedSchenma, { encoding: "utf-8" });
+};
+
+generateFromCurrentSchema();

package/src/build/base/{createBuildJob.ts → createAppBuildJob.ts}

@@ -12,9 +12,10 @@ import {
 import { writeBuildInfo } from "./writeBuildInfo";
 import { writeDotEnv } from "./writeDotEnv";
 
-export const createBuildJob = (
+export type AppBuildJobDefinition = Partial<CatladderJob>;
+export const createAppBuildJob = (
   context: Context,
-  { script, variables, ...def }: Partial<CatladderJob>
+  { script, variables, ...def }: AppBuildJobDefinition
 ): CatladderJob => {
   return merge(
     {

package/src/build/base/index.ts

@@ -0,0 +1,35 @@
+import { sbomDeactivated } from "../../deploy/sbom";
+import type { Context } from "../../types/context";
+import type { CatladderJob } from "../../types/jobs";
+import type { DockerBuildJobDefinition } from "../docker";
+import { createDockerBuildJobBase, requiresDockerBuild } from "../docker";
+import { createSbomBuildJob } from "../sbom";
+import { APP_BUILD_JOB_NAME } from "./constants";
+import type { AppBuildJobDefinition } from "./createAppBuildJob";
+import { createAppBuildJob } from "./createAppBuildJob";
+
+export const createBuildJobs = (
+  context: Context,
+  definitions: {
+    appBuild?: AppBuildJobDefinition;
+    dockerBuild: DockerBuildJobDefinition;
+  }
+): CatladderJob[] => {
+  return [
+    ...(definitions.appBuild
+      ? [createAppBuildJob(context, definitions.appBuild)]
+      : []),
+    ...(requiresDockerBuild(context)
+      ? [
+          createDockerBuildJobBase(context, {
+            ...definitions.dockerBuild,
+            needs: [
+              ...(definitions.dockerBuild.needs ?? []),
+              ...(definitions.appBuild ? [APP_BUILD_JOB_NAME] : []),
+            ],
+          }),
+        ]
+      : []),
+    ...(sbomDeactivated(context) ? [] : [createSbomBuildJob(context)]),
+  ];
+};

package/src/build/custom/buildJob.ts

@@ -1,14 +1,11 @@
 import { join } from "path";
 import type { Context } from "../../types/context";
 import { ensureArray } from "../../utils";
-import { APP_BUILD_JOB_NAME } from "../base/constants";
-import { createBuildJob } from "../base/createBuildJob";
-import { createDockerBuildJobDefault, requiresDockerBuild } from "../docker";
+import { getDockerBuildDefaultScript, requiresDockerBuild } from "../docker";
 import { isOfBuildType } from "../types";
 
 import type { CatladderJob } from "../../types/jobs";
-import { createSbomBuildJob } from "../sbom";
-import { sbomDeactivated } from "../../deploy/sbom";
+import { createBuildJobs } from "../base";
 
 const RUNNER_BUILD_VARIABLES = {
   KUBERNETES_CPU_REQUEST: "0.5",
@@ -24,45 +21,35 @@ export const createCustomBuildJobs = (context: Context): CatladderJob[] => {
     throw new Error("deploy config is not custom");
   }
 
-  const appBuildJob: CatladderJob | null =
-    buildConfig.buildCommand !== null
-      ? createBuildJob(context, {
-          image: buildConfig.jobImage,
-          variables: {
-            ...RUNNER_BUILD_VARIABLES,
-          },
-          cache: buildConfig.jobCache,
-          services: buildConfig.jobServices,
-          script: [...(ensureArray(buildConfig.buildCommand) ?? [])],
-          artifacts: {
-            paths: [
-              join(context.componentConfig.dir, "__build_info.json"),
-              join(context.componentConfig.dir, "dist"),
-              ...(buildConfig.artifactsPaths?.map((path) =>
-                join(context.componentConfig.dir, path)
-              ) ?? []),
-            ],
-            expire_in: "1 day",
-          },
-        })
-      : null;
-  return [
-    ...(appBuildJob ? [appBuildJob] : []),
-    ...(requiresDockerBuild(context)
-      ? [
-          createDockerBuildJobDefault(context, {
-            script: [
-              buildConfig.docker?.type === "nginx"
-                ? "ensureNginxDockerfile"
-                : "", // e.g. custom,
-            ].filter(Boolean),
+  return createBuildJobs(context, {
+    appBuild:
+      buildConfig.buildCommand !== null
+        ? {
+            image: buildConfig.jobImage,
+            variables: {
+              ...RUNNER_BUILD_VARIABLES,
+            },
+            cache: buildConfig.jobCache,
+            services: buildConfig.jobServices,
+            script: [...(ensureArray(buildConfig.buildCommand) ?? [])],
+            artifacts: {
+              paths: [
+                join(context.componentConfig.dir, "__build_info.json"),
+                join(context.componentConfig.dir, "dist"),
+                ...(buildConfig.artifactsPaths?.map((path) =>
+                  join(context.componentConfig.dir, path)
+                ) ?? []),
+              ],
+              expire_in: "1 day",
+            },
+          }
+        : undefined,
+    dockerBuild: {
+      script: getDockerBuildDefaultScript(
+        buildConfig.docker?.type === "nginx" ? "ensureNginxDockerfile" : ""
+      ),
 
-            variables: {},
-
-            needs: appBuildJob ? [APP_BUILD_JOB_NAME] : [],
-          }),
-        ]
-      : []),
-    ...(sbomDeactivated(context) ? [] : [createSbomBuildJob(context)]),
-  ];
+      variables: {},
+    },
+  });
 };