@catladder/pipeline 1.156.3 → 1.157.0

package/dist/build/docker.d.ts

@@ -23,7 +23,7 @@ export declare const getDockerBuildVariables: (context: ComponentContext) => {
   DOCKER_IMAGE: import("../bash/BashExpression").StringOrBashExpression;
   DOCKER_CACHE_IMAGE: string;
   APP_DIR: string;
-  DOCKER_DIR: string;
+  DOCKER_BUILD_CONTEXT: string;
   DOCKERFILE_ADDITIONS?: undefined;
   DOCKERFILE_ADDITIONS_END?: undefined;
 } | {
@@ -33,7 +33,7 @@ export declare const getDockerBuildVariables: (context: ComponentContext) => {
   DOCKER_IMAGE_NAME: string;
   DOCKER_IMAGE: string;
   APP_DIR: string;
-  DOCKER_DIR: string;
+  DOCKER_BUILD_CONTEXT: string;
   DOCKERFILE_ADDITIONS?: undefined;
   DOCKERFILE_ADDITIONS_END?: undefined;
 } | {
@@ -42,7 +42,7 @@ export declare const getDockerBuildVariables: (context: ComponentContext) => {
   DOCKER_IMAGE: import("../bash/BashExpression").StringOrBashExpression;
   DOCKER_CACHE_IMAGE: string;
   APP_DIR: string;
-  DOCKER_DIR: string;
+  DOCKER_BUILD_CONTEXT: string;
   DOCKERFILE_ADDITIONS: string | undefined;
   DOCKERFILE_ADDITIONS_END: string | undefined;
 } | {
@@ -52,7 +52,7 @@ export declare const getDockerBuildVariables: (context: ComponentContext) => {
   DOCKER_IMAGE_NAME: string;
   DOCKER_IMAGE: string;
   APP_DIR: string;
-  DOCKER_DIR: string;
+  DOCKER_BUILD_CONTEXT: string;
   DOCKERFILE_ADDITIONS: string | undefined;
   DOCKERFILE_ADDITIONS_END: string | undefined;
 };

package/dist/build/docker.js

@@ -120,9 +120,10 @@ var getDockerAdditions = function (build) {
   };
 };
 var getDockerBuildVariables = function (context) {
+  var _a;
   return __assign(__assign(__assign({}, getDockerAdditions(context.build.config)), {
     APP_DIR: context.build.dir,
-    DOCKER_DIR: "."
+    DOCKER_BUILD_CONTEXT: "docker" in context.build.config && context.build.config.docker && "buildContextLocation" in context.build.config.docker && ((_a = context.build.config.docker) === null || _a === void 0 ? void 0 : _a.buildContextLocation) === "component" ? context.build.dir : "."
   }), (0, exports.getDockerImageVariables)(context));
 };
 exports.getDockerBuildVariables = getDockerBuildVariables;
@@ -172,7 +173,7 @@ var getDockerBuildScriptWithBuiltInDockerFile = function (context, defaultType)
 };
 exports.getDockerBuildScriptWithBuiltInDockerFile = getDockerBuildScriptWithBuiltInDockerFile;
 var getDockerBuildDefaultScript = function (context, ensureDockerFileScript) {
-  return __spreadArray(__spreadArray(__spreadArray([ensureDockerFileScript !== null && ensureDockerFileScript !== void 0 ? ensureDockerFileScript : undefined], __read((0, gitlab_1.collapseableSection)("docker-login", "Docker Login")((0, exports.gitlabDockerLogin)(context))), false), __read((0, gitlab_1.collapseableSection)("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/
+  return __spreadArray(__spreadArray(__spreadArray([ensureDockerFileScript !== null && ensureDockerFileScript !== void 0 ? ensureDockerFileScript : undefined], __read((0, gitlab_1.collapseableSection)("docker-login", "Docker Login")((0, exports.gitlabDockerLogin)(context))), false), __read((0, gitlab_1.collapseableSection)("docker-build", "Docker build")(["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/
   ])), false), __read((0, gitlab_1.collapseableSection)("docker-push", "Docker 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"])), false).filter(Boolean);
 };
 exports.getDockerBuildDefaultScript = getDockerBuildDefaultScript;

package/dist/build/types.d.ts

@@ -142,6 +142,10 @@ 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 = BuildConfigDockerBuiltIn | BuildConfigDockerCustom;
 /**