@catladder/pipeline 1.156.3 → 1.157.0

package/examples/__snapshots__/multiline-var.ts.snap

@@ -177,7 +177,7 @@ doouble quote: \\"
         "script": [
           "echo -e "\\e[0Ksection_start:$(date +%s):injectvars[collapsed=true]\\r\\e[0KInjecting variables"",
           "export APP_DIR="api"",
-          "export DOCKER_DIR="."",
+          "export DOCKER_BUILD_CONTEXT="."",
           "export DOCKER_REGISTRY="asia-east1-docker.pkg.dev"",
           "export DOCKER_IMAGE="asia-east1-docker.pkg.dev/asdf/catladder-deploy/pan-test-app/dev/api"",
           "export DOCKER_CACHE_IMAGE="asia-east1-docker.pkg.dev/asdf/catladder-deploy/pan-test-app/caches/api"",
@@ -196,7 +196,7 @@ COPY --chown=node:node .yarn /app/.yarn"",
           "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",
+          "docker build --network host --cache-from $DOCKER_CACHE_IMAGE --tag $DOCKER_IMAGE:$DOCKER_IMAGE_TAG -f $APP_DIR/Dockerfile $DOCKER_BUILD_CONTEXT --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",
@@ -791,7 +791,7 @@ doouble quote: \\"
         "script": [
           "echo -e "\\e[0Ksection_start:$(date +%s):injectvars[collapsed=true]\\r\\e[0KInjecting variables"",
           "export APP_DIR="api"",
-          "export DOCKER_DIR="."",
+          "export DOCKER_BUILD_CONTEXT="."",
           "export DOCKER_REGISTRY="$CI_REGISTRY"",
           "export DOCKER_CACHE_IMAGE="$CI_REGISTRY_IMAGE/caches/api2"",
           "export DOCKER_IMAGE_NAME="dev/api2"",
@@ -810,7 +810,7 @@ COPY --chown=node:node .yarn /app/.yarn"",
           "docker login --username gitlab-ci-token --password $CI_JOB_TOKEN $CI_REGISTRY",
           "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",
+          "docker build --network host --cache-from $DOCKER_CACHE_IMAGE --tag $DOCKER_IMAGE:$DOCKER_IMAGE_TAG -f $APP_DIR/Dockerfile $DOCKER_BUILD_CONTEXT --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",
@@ -1456,7 +1456,7 @@ doouble quote: \\"
         "script": [
           "echo -e "\\e[0Ksection_start:$(date +%s):injectvars[collapsed=true]\\r\\e[0KInjecting variables"",
           "export APP_DIR="api"",
-          "export DOCKER_DIR="."",
+          "export DOCKER_BUILD_CONTEXT="."",
           "export DOCKER_REGISTRY="asia-east1-docker.pkg.dev"",
           "export DOCKER_IMAGE="asia-east1-docker.pkg.dev/asdf/catladder-deploy/pan-test-app/review/api/$([ -n "$CI_MERGE_REQUEST_IID" ] && echo "mr$CI_MERGE_REQUEST_IID" || { [ -n "$CI_COMMIT_REF_SLUG" ] && echo "$CI_COMMIT_REF_SLUG" || echo "unknown"; })"",
           "export DOCKER_CACHE_IMAGE="asia-east1-docker.pkg.dev/asdf/catladder-deploy/pan-test-app/caches/api"",
@@ -1475,7 +1475,7 @@ COPY --chown=node:node .yarn /app/.yarn"",
           "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",
+          "docker build --network host --cache-from $DOCKER_CACHE_IMAGE --tag $DOCKER_IMAGE:$DOCKER_IMAGE_TAG -f $APP_DIR/Dockerfile $DOCKER_BUILD_CONTEXT --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",
@@ -2076,7 +2076,7 @@ doouble quote: \\"
         "script": [
           "echo -e "\\e[0Ksection_start:$(date +%s):injectvars[collapsed=true]\\r\\e[0KInjecting variables"",
           "export APP_DIR="api"",
-          "export DOCKER_DIR="."",
+          "export DOCKER_BUILD_CONTEXT="."",
           "export DOCKER_REGISTRY="$CI_REGISTRY"",
           "export DOCKER_CACHE_IMAGE="$CI_REGISTRY_IMAGE/caches/api2"",
           "export DOCKER_IMAGE_NAME="review/api2"",
@@ -2095,7 +2095,7 @@ COPY --chown=node:node .yarn /app/.yarn"",
           "docker login --username gitlab-ci-token --password $CI_JOB_TOKEN $CI_REGISTRY",
           "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",
+          "docker build --network host --cache-from $DOCKER_CACHE_IMAGE --tag $DOCKER_IMAGE:$DOCKER_IMAGE_TAG -f $APP_DIR/Dockerfile $DOCKER_BUILD_CONTEXT --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",
@@ -2785,7 +2785,7 @@ doouble quote: \\"
         "script": [
           "echo -e "\\e[0Ksection_start:$(date +%s):injectvars[collapsed=true]\\r\\e[0KInjecting variables"",
           "export APP_DIR="api"",
-          "export DOCKER_DIR="."",
+          "export DOCKER_BUILD_CONTEXT="."",
           "export DOCKER_REGISTRY="asia-east1-docker.pkg.dev"",
           "export DOCKER_IMAGE="asia-east1-docker.pkg.dev/asdf/catladder-deploy/pan-test-app/prod/api"",
           "export DOCKER_CACHE_IMAGE="asia-east1-docker.pkg.dev/asdf/catladder-deploy/pan-test-app/caches/api"",
@@ -2804,7 +2804,7 @@ COPY --chown=node:node .yarn /app/.yarn"",
           "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",
+          "docker build --network host --cache-from $DOCKER_CACHE_IMAGE --tag $DOCKER_IMAGE:$DOCKER_IMAGE_TAG -f $APP_DIR/Dockerfile $DOCKER_BUILD_CONTEXT --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",
@@ -2856,7 +2856,7 @@ COPY --chown=node:node .yarn /app/.yarn"",
         "script": [
           "echo -e "\\e[0Ksection_start:$(date +%s):injectvars[collapsed=true]\\r\\e[0KInjecting variables"",
           "export APP_DIR="api"",
-          "export DOCKER_DIR="."",
+          "export DOCKER_BUILD_CONTEXT="."",
           "export DOCKER_REGISTRY="asia-east1-docker.pkg.dev"",
           "export DOCKER_IMAGE="asia-east1-docker.pkg.dev/asdf/catladder-deploy/pan-test-app/stage/api"",
           "export DOCKER_CACHE_IMAGE="asia-east1-docker.pkg.dev/asdf/catladder-deploy/pan-test-app/caches/api"",
@@ -2875,7 +2875,7 @@ COPY --chown=node:node .yarn /app/.yarn"",
           "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",
+          "docker build --network host --cache-from $DOCKER_CACHE_IMAGE --tag $DOCKER_IMAGE:$DOCKER_IMAGE_TAG -f $APP_DIR/Dockerfile $DOCKER_BUILD_CONTEXT --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",
@@ -3729,7 +3729,7 @@ doouble quote: \\"
         "script": [
           "echo -e "\\e[0Ksection_start:$(date +%s):injectvars[collapsed=true]\\r\\e[0KInjecting variables"",
           "export APP_DIR="api"",
-          "export DOCKER_DIR="."",
+          "export DOCKER_BUILD_CONTEXT="."",
           "export DOCKER_REGISTRY="$CI_REGISTRY"",
           "export DOCKER_CACHE_IMAGE="$CI_REGISTRY_IMAGE/caches/api2"",
           "export DOCKER_IMAGE_NAME="prod/api2"",
@@ -3748,7 +3748,7 @@ COPY --chown=node:node .yarn /app/.yarn"",
           "docker login --username gitlab-ci-token --password $CI_JOB_TOKEN $CI_REGISTRY",
           "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",
+          "docker build --network host --cache-from $DOCKER_CACHE_IMAGE --tag $DOCKER_IMAGE:$DOCKER_IMAGE_TAG -f $APP_DIR/Dockerfile $DOCKER_BUILD_CONTEXT --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",
@@ -3800,7 +3800,7 @@ COPY --chown=node:node .yarn /app/.yarn"",
         "script": [
           "echo -e "\\e[0Ksection_start:$(date +%s):injectvars[collapsed=true]\\r\\e[0KInjecting variables"",
           "export APP_DIR="api"",
-          "export DOCKER_DIR="."",
+          "export DOCKER_BUILD_CONTEXT="."",
           "export DOCKER_REGISTRY="$CI_REGISTRY"",
           "export DOCKER_CACHE_IMAGE="$CI_REGISTRY_IMAGE/caches/api2"",
           "export DOCKER_IMAGE_NAME="stage/api2"",
@@ -3819,7 +3819,7 @@ COPY --chown=node:node .yarn /app/.yarn"",
           "docker login --username gitlab-ci-token --password $CI_JOB_TOKEN $CI_REGISTRY",
           "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",
+          "docker build --network host --cache-from $DOCKER_CACHE_IMAGE --tag $DOCKER_IMAGE:$DOCKER_IMAGE_TAG -f $APP_DIR/Dockerfile $DOCKER_BUILD_CONTEXT --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",

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

@@ -169,7 +169,7 @@ exports[`matches snapshot 1`] = `
         "script": [
           "echo -e "\\e[0Ksection_start:$(date +%s):injectvars[collapsed=true]\\r\\e[0KInjecting variables"",
           "export APP_DIR="api"",
-          "export DOCKER_DIR="."",
+          "export DOCKER_BUILD_CONTEXT="."",
           "export DOCKER_REGISTRY="asia-east1-docker.pkg.dev"",
           "export DOCKER_IMAGE="asia-east1-docker.pkg.dev/asdf/catladder-deploy/pan-test-app/dev/api"",
           "export DOCKER_CACHE_IMAGE="asia-east1-docker.pkg.dev/asdf/catladder-deploy/pan-test-app/caches/api"",
@@ -188,7 +188,7 @@ COPY --chown=node:node .yarn /app/.yarn"",
           "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",
+          "docker build --network host --cache-from $DOCKER_CACHE_IMAGE --tag $DOCKER_IMAGE:$DOCKER_IMAGE_TAG -f $APP_DIR/Dockerfile $DOCKER_BUILD_CONTEXT --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",
@@ -1121,7 +1121,7 @@ EOF",
         "script": [
           "echo -e "\\e[0Ksection_start:$(date +%s):injectvars[collapsed=true]\\r\\e[0KInjecting variables"",
           "export APP_DIR="api"",
-          "export DOCKER_DIR="."",
+          "export DOCKER_BUILD_CONTEXT="."",
           "export DOCKER_REGISTRY="asia-east1-docker.pkg.dev"",
           "export DOCKER_IMAGE="asia-east1-docker.pkg.dev/asdf/catladder-deploy/pan-test-app/review/api/$([ -n "$CI_MERGE_REQUEST_IID" ] && echo "mr$CI_MERGE_REQUEST_IID" || { [ -n "$CI_COMMIT_REF_SLUG" ] && echo "$CI_COMMIT_REF_SLUG" || echo "unknown"; })"",
           "export DOCKER_CACHE_IMAGE="asia-east1-docker.pkg.dev/asdf/catladder-deploy/pan-test-app/caches/api"",
@@ -1140,7 +1140,7 @@ COPY --chown=node:node .yarn /app/.yarn"",
           "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",
+          "docker build --network host --cache-from $DOCKER_CACHE_IMAGE --tag $DOCKER_IMAGE:$DOCKER_IMAGE_TAG -f $APP_DIR/Dockerfile $DOCKER_BUILD_CONTEXT --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",
@@ -2114,7 +2114,7 @@ EOF",
         "script": [
           "echo -e "\\e[0Ksection_start:$(date +%s):injectvars[collapsed=true]\\r\\e[0KInjecting variables"",
           "export APP_DIR="api"",
-          "export DOCKER_DIR="."",
+          "export DOCKER_BUILD_CONTEXT="."",
           "export DOCKER_REGISTRY="asia-east1-docker.pkg.dev"",
           "export DOCKER_IMAGE="asia-east1-docker.pkg.dev/asdf/catladder-deploy/pan-test-app/prod/api"",
           "export DOCKER_CACHE_IMAGE="asia-east1-docker.pkg.dev/asdf/catladder-deploy/pan-test-app/caches/api"",
@@ -2133,7 +2133,7 @@ COPY --chown=node:node .yarn /app/.yarn"",
           "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",
+          "docker build --network host --cache-from $DOCKER_CACHE_IMAGE --tag $DOCKER_IMAGE:$DOCKER_IMAGE_TAG -f $APP_DIR/Dockerfile $DOCKER_BUILD_CONTEXT --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",
@@ -2185,7 +2185,7 @@ COPY --chown=node:node .yarn /app/.yarn"",
         "script": [
           "echo -e "\\e[0Ksection_start:$(date +%s):injectvars[collapsed=true]\\r\\e[0KInjecting variables"",
           "export APP_DIR="api"",
-          "export DOCKER_DIR="."",
+          "export DOCKER_BUILD_CONTEXT="."",
           "export DOCKER_REGISTRY="asia-east1-docker.pkg.dev"",
           "export DOCKER_IMAGE="asia-east1-docker.pkg.dev/asdf/catladder-deploy/pan-test-app/stage/api"",
           "export DOCKER_CACHE_IMAGE="asia-east1-docker.pkg.dev/asdf/catladder-deploy/pan-test-app/caches/api"",
@@ -2204,7 +2204,7 @@ COPY --chown=node:node .yarn /app/.yarn"",
           "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",
+          "docker build --network host --cache-from $DOCKER_CACHE_IMAGE --tag $DOCKER_IMAGE:$DOCKER_IMAGE_TAG -f $APP_DIR/Dockerfile $DOCKER_BUILD_CONTEXT --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",

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

@@ -169,7 +169,7 @@ exports[`matches snapshot 1`] = `
         "script": [
           "echo -e "\\e[0Ksection_start:$(date +%s):injectvars[collapsed=true]\\r\\e[0KInjecting variables"",
           "export APP_DIR="www"",
-          "export DOCKER_DIR="."",
+          "export DOCKER_BUILD_CONTEXT="."",
           "export DOCKER_REGISTRY="asia-east1-docker.pkg.dev"",
           "export DOCKER_IMAGE="asia-east1-docker.pkg.dev/asdf/catladder-deploy/pan-test-app/dev/www"",
           "export DOCKER_CACHE_IMAGE="asia-east1-docker.pkg.dev/asdf/catladder-deploy/pan-test-app/caches/www"",
@@ -188,7 +188,7 @@ COPY --chown=node:node .yarn /app/.yarn"",
           "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",
+          "docker build --network host --cache-from $DOCKER_CACHE_IMAGE --tag $DOCKER_IMAGE:$DOCKER_IMAGE_TAG -f $APP_DIR/Dockerfile $DOCKER_BUILD_CONTEXT --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",
@@ -745,7 +745,7 @@ EOF
         "script": [
           "echo -e "\\e[0Ksection_start:$(date +%s):injectvars[collapsed=true]\\r\\e[0KInjecting variables"",
           "export APP_DIR="www"",
-          "export DOCKER_DIR="."",
+          "export DOCKER_BUILD_CONTEXT="."",
           "export DOCKER_REGISTRY="asia-east1-docker.pkg.dev"",
           "export DOCKER_IMAGE="asia-east1-docker.pkg.dev/asdf/catladder-deploy/pan-test-app/review/www/$([ -n "$CI_MERGE_REQUEST_IID" ] && echo "mr$CI_MERGE_REQUEST_IID" || { [ -n "$CI_COMMIT_REF_SLUG" ] && echo "$CI_COMMIT_REF_SLUG" || echo "unknown"; })"",
           "export DOCKER_CACHE_IMAGE="asia-east1-docker.pkg.dev/asdf/catladder-deploy/pan-test-app/caches/www"",
@@ -764,7 +764,7 @@ COPY --chown=node:node .yarn /app/.yarn"",
           "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",
+          "docker build --network host --cache-from $DOCKER_CACHE_IMAGE --tag $DOCKER_IMAGE:$DOCKER_IMAGE_TAG -f $APP_DIR/Dockerfile $DOCKER_BUILD_CONTEXT --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",
@@ -1362,7 +1362,7 @@ EOF
         "script": [
           "echo -e "\\e[0Ksection_start:$(date +%s):injectvars[collapsed=true]\\r\\e[0KInjecting variables"",
           "export APP_DIR="www"",
-          "export DOCKER_DIR="."",
+          "export DOCKER_BUILD_CONTEXT="."",
           "export DOCKER_REGISTRY="asia-east1-docker.pkg.dev"",
           "export DOCKER_IMAGE="asia-east1-docker.pkg.dev/asdf/catladder-deploy/pan-test-app/prod/www"",
           "export DOCKER_CACHE_IMAGE="asia-east1-docker.pkg.dev/asdf/catladder-deploy/pan-test-app/caches/www"",
@@ -1381,7 +1381,7 @@ COPY --chown=node:node .yarn /app/.yarn"",
           "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",
+          "docker build --network host --cache-from $DOCKER_CACHE_IMAGE --tag $DOCKER_IMAGE:$DOCKER_IMAGE_TAG -f $APP_DIR/Dockerfile $DOCKER_BUILD_CONTEXT --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",
@@ -1433,7 +1433,7 @@ COPY --chown=node:node .yarn /app/.yarn"",
         "script": [
           "echo -e "\\e[0Ksection_start:$(date +%s):injectvars[collapsed=true]\\r\\e[0KInjecting variables"",
           "export APP_DIR="www"",
-          "export DOCKER_DIR="."",
+          "export DOCKER_BUILD_CONTEXT="."",
           "export DOCKER_REGISTRY="asia-east1-docker.pkg.dev"",
           "export DOCKER_IMAGE="asia-east1-docker.pkg.dev/asdf/catladder-deploy/pan-test-app/stage/www"",
           "export DOCKER_CACHE_IMAGE="asia-east1-docker.pkg.dev/asdf/catladder-deploy/pan-test-app/caches/www"",
@@ -1452,7 +1452,7 @@ COPY --chown=node:node .yarn /app/.yarn"",
           "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",
+          "docker build --network host --cache-from $DOCKER_CACHE_IMAGE --tag $DOCKER_IMAGE:$DOCKER_IMAGE_TAG -f $APP_DIR/Dockerfile $DOCKER_BUILD_CONTEXT --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",

package/examples/__snapshots__/node-build-with-docker-additions.ts.snap

@@ -171,7 +171,7 @@ exports[`matches snapshot 1`] = `
           "export DOCKERFILE_ADDITIONS="RUN apk add --no-cache openssl1.1-compat-dev"",
           "export DOCKERFILE_ADDITIONS_END="RUN yarn rebuild"",
           "export APP_DIR="www"",
-          "export DOCKER_DIR="."",
+          "export DOCKER_BUILD_CONTEXT="."",
           "export DOCKER_REGISTRY="asia-east1-docker.pkg.dev"",
           "export DOCKER_IMAGE="asia-east1-docker.pkg.dev/asdf/catladder-deploy/pan-test-app/dev/www"",
           "export DOCKER_CACHE_IMAGE="asia-east1-docker.pkg.dev/asdf/catladder-deploy/pan-test-app/caches/www"",
@@ -190,7 +190,7 @@ COPY --chown=node:node .yarn /app/.yarn"",
           "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",
+          "docker build --network host --cache-from $DOCKER_CACHE_IMAGE --tag $DOCKER_IMAGE:$DOCKER_IMAGE_TAG -f $APP_DIR/Dockerfile $DOCKER_BUILD_CONTEXT --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",
@@ -749,7 +749,7 @@ EOF
           "export DOCKERFILE_ADDITIONS="RUN apk add --no-cache openssl1.1-compat-dev"",
           "export DOCKERFILE_ADDITIONS_END="RUN yarn rebuild"",
           "export APP_DIR="www"",
-          "export DOCKER_DIR="."",
+          "export DOCKER_BUILD_CONTEXT="."",
           "export DOCKER_REGISTRY="asia-east1-docker.pkg.dev"",
           "export DOCKER_IMAGE="asia-east1-docker.pkg.dev/asdf/catladder-deploy/pan-test-app/review/www/$([ -n "$CI_MERGE_REQUEST_IID" ] && echo "mr$CI_MERGE_REQUEST_IID" || { [ -n "$CI_COMMIT_REF_SLUG" ] && echo "$CI_COMMIT_REF_SLUG" || echo "unknown"; })"",
           "export DOCKER_CACHE_IMAGE="asia-east1-docker.pkg.dev/asdf/catladder-deploy/pan-test-app/caches/www"",
@@ -768,7 +768,7 @@ COPY --chown=node:node .yarn /app/.yarn"",
           "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",
+          "docker build --network host --cache-from $DOCKER_CACHE_IMAGE --tag $DOCKER_IMAGE:$DOCKER_IMAGE_TAG -f $APP_DIR/Dockerfile $DOCKER_BUILD_CONTEXT --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",
@@ -1368,7 +1368,7 @@ EOF
           "export DOCKERFILE_ADDITIONS="RUN apk add --no-cache openssl1.1-compat-dev"",
           "export DOCKERFILE_ADDITIONS_END="RUN yarn rebuild"",
           "export APP_DIR="www"",
-          "export DOCKER_DIR="."",
+          "export DOCKER_BUILD_CONTEXT="."",
           "export DOCKER_REGISTRY="asia-east1-docker.pkg.dev"",
           "export DOCKER_IMAGE="asia-east1-docker.pkg.dev/asdf/catladder-deploy/pan-test-app/prod/www"",
           "export DOCKER_CACHE_IMAGE="asia-east1-docker.pkg.dev/asdf/catladder-deploy/pan-test-app/caches/www"",
@@ -1387,7 +1387,7 @@ COPY --chown=node:node .yarn /app/.yarn"",
           "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",
+          "docker build --network host --cache-from $DOCKER_CACHE_IMAGE --tag $DOCKER_IMAGE:$DOCKER_IMAGE_TAG -f $APP_DIR/Dockerfile $DOCKER_BUILD_CONTEXT --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",
@@ -1441,7 +1441,7 @@ COPY --chown=node:node .yarn /app/.yarn"",
           "export DOCKERFILE_ADDITIONS="RUN apk add --no-cache openssl1.1-compat-dev"",
           "export DOCKERFILE_ADDITIONS_END="RUN yarn rebuild"",
           "export APP_DIR="www"",
-          "export DOCKER_DIR="."",
+          "export DOCKER_BUILD_CONTEXT="."",
           "export DOCKER_REGISTRY="asia-east1-docker.pkg.dev"",
           "export DOCKER_IMAGE="asia-east1-docker.pkg.dev/asdf/catladder-deploy/pan-test-app/stage/www"",
           "export DOCKER_CACHE_IMAGE="asia-east1-docker.pkg.dev/asdf/catladder-deploy/pan-test-app/caches/www"",
@@ -1460,7 +1460,7 @@ COPY --chown=node:node .yarn /app/.yarn"",
           "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",
+          "docker build --network host --cache-from $DOCKER_CACHE_IMAGE --tag $DOCKER_IMAGE:$DOCKER_IMAGE_TAG -f $APP_DIR/Dockerfile $DOCKER_BUILD_CONTEXT --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",

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

@@ -122,7 +122,7 @@ exports[`matches snapshot 1`] = `
         "script": [
           "echo -e "\\e[0Ksection_start:$(date +%s):injectvars[collapsed=true]\\r\\e[0KInjecting variables"",
           "export APP_DIR="."",
-          "export DOCKER_DIR="."",
+          "export DOCKER_BUILD_CONTEXT="."",
           "export DOCKER_REGISTRY="$CI_REGISTRY"",
           "export DOCKER_CACHE_IMAGE="$CI_REGISTRY_IMAGE/caches/app"",
           "export DOCKER_IMAGE_NAME="dev/app"",
@@ -686,7 +686,7 @@ EOF
         "script": [
           "echo -e "\\e[0Ksection_start:$(date +%s):injectvars[collapsed=true]\\r\\e[0KInjecting variables"",
           "export APP_DIR="."",
-          "export DOCKER_DIR="."",
+          "export DOCKER_BUILD_CONTEXT="."",
           "export DOCKER_REGISTRY="$CI_REGISTRY"",
           "export DOCKER_CACHE_IMAGE="$CI_REGISTRY_IMAGE/caches/app"",
           "export DOCKER_IMAGE_NAME="review/app"",
@@ -1293,7 +1293,7 @@ EOF
         "script": [
           "echo -e "\\e[0Ksection_start:$(date +%s):injectvars[collapsed=true]\\r\\e[0KInjecting variables"",
           "export APP_DIR="."",
-          "export DOCKER_DIR="."",
+          "export DOCKER_BUILD_CONTEXT="."",
           "export DOCKER_REGISTRY="$CI_REGISTRY"",
           "export DOCKER_CACHE_IMAGE="$CI_REGISTRY_IMAGE/caches/app"",
           "export DOCKER_IMAGE_NAME="prod/app"",
@@ -1341,7 +1341,7 @@ EOF
         "script": [
           "echo -e "\\e[0Ksection_start:$(date +%s):injectvars[collapsed=true]\\r\\e[0KInjecting variables"",
           "export APP_DIR="."",
-          "export DOCKER_DIR="."",
+          "export DOCKER_BUILD_CONTEXT="."",
           "export DOCKER_REGISTRY="$CI_REGISTRY"",
           "export DOCKER_CACHE_IMAGE="$CI_REGISTRY_IMAGE/caches/app"",
           "export DOCKER_IMAGE_NAME="stage/app"",
@@ -2116,7 +2116,7 @@ exports[`matches snapshot with a Dockerfile 1`] = `
         "script": [
           "echo -e "\\e[0Ksection_start:$(date +%s):injectvars[collapsed=true]\\r\\e[0KInjecting variables"",
           "export APP_DIR="."",
-          "export DOCKER_DIR="."",
+          "export DOCKER_BUILD_CONTEXT="."",
           "export DOCKER_REGISTRY="$CI_REGISTRY"",
           "export DOCKER_CACHE_IMAGE="$CI_REGISTRY_IMAGE/caches/app"",
           "export DOCKER_IMAGE_NAME="dev/app"",
@@ -2127,7 +2127,7 @@ exports[`matches snapshot with a Dockerfile 1`] = `
           "docker login --username gitlab-ci-token --password $CI_JOB_TOKEN $CI_REGISTRY",
           "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",
+          "docker build --network host --cache-from $DOCKER_CACHE_IMAGE --tag $DOCKER_IMAGE:$DOCKER_IMAGE_TAG -f $APP_DIR/Dockerfile $DOCKER_BUILD_CONTEXT --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",
@@ -2684,7 +2684,7 @@ EOF
         "script": [
           "echo -e "\\e[0Ksection_start:$(date +%s):injectvars[collapsed=true]\\r\\e[0KInjecting variables"",
           "export APP_DIR="."",
-          "export DOCKER_DIR="."",
+          "export DOCKER_BUILD_CONTEXT="."",
           "export DOCKER_REGISTRY="$CI_REGISTRY"",
           "export DOCKER_CACHE_IMAGE="$CI_REGISTRY_IMAGE/caches/app"",
           "export DOCKER_IMAGE_NAME="review/app"",
@@ -2695,7 +2695,7 @@ EOF
           "docker login --username gitlab-ci-token --password $CI_JOB_TOKEN $CI_REGISTRY",
           "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",
+          "docker build --network host --cache-from $DOCKER_CACHE_IMAGE --tag $DOCKER_IMAGE:$DOCKER_IMAGE_TAG -f $APP_DIR/Dockerfile $DOCKER_BUILD_CONTEXT --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",
@@ -3295,7 +3295,7 @@ EOF
         "script": [
           "echo -e "\\e[0Ksection_start:$(date +%s):injectvars[collapsed=true]\\r\\e[0KInjecting variables"",
           "export APP_DIR="."",
-          "export DOCKER_DIR="."",
+          "export DOCKER_BUILD_CONTEXT="."",
           "export DOCKER_REGISTRY="$CI_REGISTRY"",
           "export DOCKER_CACHE_IMAGE="$CI_REGISTRY_IMAGE/caches/app"",
           "export DOCKER_IMAGE_NAME="prod/app"",
@@ -3306,7 +3306,7 @@ EOF
           "docker login --username gitlab-ci-token --password $CI_JOB_TOKEN $CI_REGISTRY",
           "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",
+          "docker build --network host --cache-from $DOCKER_CACHE_IMAGE --tag $DOCKER_IMAGE:$DOCKER_IMAGE_TAG -f $APP_DIR/Dockerfile $DOCKER_BUILD_CONTEXT --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",
@@ -3347,7 +3347,7 @@ EOF
         "script": [
           "echo -e "\\e[0Ksection_start:$(date +%s):injectvars[collapsed=true]\\r\\e[0KInjecting variables"",
           "export APP_DIR="."",
-          "export DOCKER_DIR="."",
+          "export DOCKER_BUILD_CONTEXT="."",
           "export DOCKER_REGISTRY="$CI_REGISTRY"",
           "export DOCKER_CACHE_IMAGE="$CI_REGISTRY_IMAGE/caches/app"",
           "export DOCKER_IMAGE_NAME="stage/app"",
@@ -3358,7 +3358,7 @@ EOF
           "docker login --username gitlab-ci-token --password $CI_JOB_TOKEN $CI_REGISTRY",
           "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",
+          "docker build --network host --cache-from $DOCKER_CACHE_IMAGE --tag $DOCKER_IMAGE:$DOCKER_IMAGE_TAG -f $APP_DIR/Dockerfile $DOCKER_BUILD_CONTEXT --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",

package/examples/git-submodule.ts

@@ -0,0 +1,29 @@
+import type { Config } from "../src";
+import { createAllPipelines } from "./__utils__/helpers";
+
+const config: Config = {
+  appName: "test-app",
+  customerName: "pan",
+  runnerVariables: {
+    GIT_SUBMODULE_STRATEGY: "recursive",
+  },
+  components: {
+    app: {
+      dir: "app",
+
+      build: {
+        type: "node",
+      },
+
+      deploy: {
+        type: "google-cloudrun",
+        projectId: "my-project-id",
+        region: "europe-west6",
+      },
+    },
+  },
+};
+
+it("matches snapshot", async () => {
+  expect(await createAllPipelines(config)).toMatchSnapshot();
+});

package/package.json

@@ -52,7 +52,7 @@
     }
   ],
   "license": "MIT",
-  "version": "1.156.3",
+  "version": "1.157.0",
   "scripts": {
     "build:tsc": "yarn tsc",
     "build": "yarn build:compile && yarn build:inline-variables && yarn build:bundle",

package/src/build/docker.ts

@@ -87,7 +87,13 @@ export const getDockerBuildVariables = (context: ComponentContext) => {
   return {
     ...getDockerAdditions(context.build.config),
     APP_DIR: context.build.dir,
-    DOCKER_DIR: ".", // relative to componentdir
+    DOCKER_BUILD_CONTEXT:
+      "docker" in context.build.config &&
+      context.build.config.docker &&
+      "buildContextLocation" in context.build.config.docker &&
+      context.build.config.docker?.buildContextLocation === "component"
+        ? context.build.dir
+        : ".",
 
     ...getDockerImageVariables(context),
   };
@@ -184,7 +190,7 @@ export const getDockerBuildDefaultScript = (
       "docker-build",
       "Docker 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", //BUILDKIT_INLINE_CACHE,  see https://testdriven.io/blog/faster-ci-builds-with-docker-cache/
+      "docker build --network host --cache-from $DOCKER_CACHE_IMAGE --tag $DOCKER_IMAGE:$DOCKER_IMAGE_TAG -f $APP_DIR/Dockerfile $DOCKER_BUILD_CONTEXT --build-arg BUILDKIT_INLINE_CACHE=1", //BUILDKIT_INLINE_CACHE,  see https://testdriven.io/blog/faster-ci-builds-with-docker-cache/
     ]),
     ...collapseableSection(
       "docker-push",

package/src/build/types.ts

@@ -172,6 +172,11 @@ type BuildConfigDockerCustom = {
    * custom docker build, expect that a Dockerfile in your directory
    */
   type: "custom";
+
+  /**
+   * where to run the docker build, defaults to the root of the repo
+   */
+  buildContextLocation?: "root" | "component";
 };
 
 export type BuildConfigDocker =

package/src/pipeline/createChildPipeline.ts

@@ -30,6 +30,7 @@ export const createChildPipeline = async <T extends PipelineType>(
       jobs: Object.fromEntries(
         gitlabJobs.map(({ gitlabJob, name }) => [name, gitlabJob]),
       ),
+      variables: config.runnerVariables,
     }) as Pipeline<T>;
   }
   throw new Error(`${pipelineType} is not supported`);

package/src/pipeline/createMainPipeline.ts

@@ -91,6 +91,7 @@ export const createMainPipeline = async <T extends PipelineType>(
         ...allJobs,
         ...getGitlabReleaseJobs(),
       },
+      variables: config.runnerVariables,
     }) as Pipeline<T>;
   }
   throw new Error(`${pipelineType} is not supported`);

package/src/types/config.ts

@@ -214,4 +214,9 @@ export type Config<C extends ConfigProps = never> = {
   meta?: {
     labels?: Record<string, string>;
   };
+
+  /**
+   * additional vars only for the runner in all jobs.
+   */
+  runnerVariables?: Record<string, string>;
 };