@catladder/cli 1.146.2 → 1.147.0

package/dist/cli/src/gcloud/cloudRun/openCloudRunDashboards.js.map

@@ -1 +1 @@
-{"version":3,"file":"openCloudRunDashboards.js","sourceRoot":"","sources":["../../../../../src/gcloud/cloudRun/openCloudRunDashboards.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AACA,gDAAqD;AAErD,kDAA4D;AAErD,IAAM,2BAA2B,GAAG,UACzC,QAAyB,EACzB,OAAyB;;;;;gBAEzB,IAAI,CAAC,IAAA,yBAAc,EAAC,OAAO,CAAC,eAAe,CAAC,MAAM,EAAE,iBAAiB,CAAC,EAAE,CAAC;oBACvE,MAAM,IAAI,KAAK,CAAC,qCAAqC,CAAC,CAAC;gBACzD,CAAC;gBACO,QAAQ,GAAK,OAAO,CAAC,WAAW,SAAxB,CAAyB;gBACnC,KAAwB,OAAO,CAAC,eAAe,CAAC,MAAM,EAApD,MAAM,YAAA,EAAE,SAAS,eAAA,CAAoC;gBAC7D,qBAAM,IAAA,wCAAwB,EAC5B,QAAQ,EACR,qBAAc,MAAM,cAAI,QAAQ,aAAU,EAC1C;wBACE,OAAO,EAAE,SAAS;qBACnB,CACF,EAAA;;gBAND,SAMC,CAAC;;;;KACH,CAAC;AAhBW,QAAA,2BAA2B,+BAgBtC"}
+{"version":3,"file":"openCloudRunDashboards.js","sourceRoot":"","sources":["../../../../../src/gcloud/cloudRun/openCloudRunDashboards.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AACA,gDAAqD;AAErD,kDAA4D;AAErD,IAAM,2BAA2B,GAAG,UACzC,QAAyB,EACzB,OAAyB;;;;;;gBAEzB,IAAI,CAAC,IAAA,yBAAc,EAAC,MAAA,OAAO,CAAC,MAAM,0CAAE,MAAM,EAAE,iBAAiB,CAAC,EAAE,CAAC;oBAC/D,MAAM,IAAI,KAAK,CAAC,qCAAqC,CAAC,CAAC;gBACzD,CAAC;gBACO,QAAQ,GAAK,OAAO,CAAC,WAAW,SAAxB,CAAyB;gBACnC,KAAwB,OAAO,CAAC,MAAM,CAAC,MAAM,EAA3C,MAAM,YAAA,EAAE,SAAS,eAAA,CAA2B;gBACpD,qBAAM,IAAA,wCAAwB,EAC5B,QAAQ,EACR,qBAAc,MAAM,cAAI,QAAQ,aAAU,EAC1C;wBACE,OAAO,EAAE,SAAS;qBACnB,CACF,EAAA;;gBAND,SAMC,CAAC;;;;KACH,CAAC;AAhBW,QAAA,2BAA2B,+BAgBtC"}

package/dist/cli/src/kubernetes/openKubernetesDashboards.js

@@ -41,10 +41,11 @@ var pipeline_1 = require("../../../pipeline/src/index.js");
 var openDashboard_1 = require("../gcloud/openDashboard");
 var openGoogleCloudLogs = function (instance, context) { return __awaiter(void 0, void 0, void 0, function () {
     var deployConfig, namespace, cluster, resource;
-    return __generator(this, function (_a) {
-        switch (_a.label) {
+    var _a;
+    return __generator(this, function (_b) {
+        switch (_b.label) {
             case 0:
-                deployConfig = context.componentConfig.deploy;
+                deployConfig = (_a = context.deploy) === null || _a === void 0 ? void 0 : _a.config;
                 if (!(0, pipeline_1.isOfDeployType)(deployConfig, "kubernetes")) {
                     throw new Error("context is not of type kubernetes");
                 }
@@ -59,7 +60,7 @@ var openGoogleCloudLogs = function (instance, context) { return __awaiter(void 0
                         resource: resource,
                     })];
             case 1:
-                _a.sent();
+                _b.sent();
                 return [2 /*return*/];
         }
     });
@@ -67,10 +68,11 @@ var openGoogleCloudLogs = function (instance, context) { return __awaiter(void 0
 exports.openGoogleCloudLogs = openGoogleCloudLogs;
 var openGoogleCloudKubernetesDashboard = function (instance, context) { return __awaiter(void 0, void 0, void 0, function () {
     var deployConfig, namespace, cluster, pageState;
-    return __generator(this, function (_a) {
-        switch (_a.label) {
+    var _a;
+    return __generator(this, function (_b) {
+        switch (_b.label) {
             case 0:
-                deployConfig = context.componentConfig.deploy;
+                deployConfig = (_a = context.deploy) === null || _a === void 0 ? void 0 : _a.config;
                 if (!(0, pipeline_1.isOfDeployType)(deployConfig, "kubernetes")) {
                     throw new Error("context is not of type kubernetes");
                 }
@@ -85,7 +87,7 @@ var openGoogleCloudKubernetesDashboard = function (instance, context) { return _
                         pageState: pageState,
                     })];
             case 1:
-                _a.sent();
+                _b.sent();
                 return [2 /*return*/];
         }
     });

package/dist/cli/src/kubernetes/openKubernetesDashboards.js.map

@@ -1 +1 @@
-{"version":3,"file":"openKubernetesDashboards.js","sourceRoot":"","sources":["../../../../src/kubernetes/openKubernetesDashboards.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AACA,gDAAqD;AAErD,yDAAmE;AAE5D,IAAM,mBAAmB,GAAG,UACjC,QAAyB,EACzB,OAAyB;;;;;gBAEnB,YAAY,GAAG,OAAO,CAAC,eAAe,CAAC,MAAM,CAAC;gBACpD,IAAI,CAAC,IAAA,yBAAc,EAAC,YAAY,EAAE,YAAY,CAAC,EAAE,CAAC;oBAChD,MAAM,IAAI,KAAK,CAAC,mCAAmC,CAAC,CAAC;gBACvD,CAAC;gBAED,IAAI,CAAC,YAAY,CAAC,OAAO,IAAI,YAAY,CAAC,OAAO,CAAC,IAAI,KAAK,QAAQ,EAAE,CAAC;oBACpE,MAAM,IAAI,KAAK,CAAC,6BAA6B,CAAC,CAAC;gBACjD,CAAC;gBAEK,SAAS,GAAG,OAAO,CAAC,WAAW,CAAC,OAAO,CAAC,cAAc,CAAC;gBACvD,OAAO,GAAG,YAAY,CAAC,OAAO,CAAC;gBAE/B,QAAQ,GAAG,qCAA8B,OAAO,CAAC,IAAI,SACzD,SAAS,CAAC,CAAC,CAAC,0BAAmB,SAAS,CAAE,CAAC,CAAC,CAAC,EAAE,CAC/C,CAAC;gBAEH,qBAAM,IAAA,wCAAwB,EAAC,QAAQ,EAAE,aAAa,EAAE;wBACtD,OAAO,EAAE,OAAO,CAAC,SAAS;wBAC1B,QAAQ,EAAE,QAAQ;qBACnB,CAAC,EAAA;;gBAHF,SAGE,CAAC;;;;KACJ,CAAC;AAxBW,QAAA,mBAAmB,uBAwB9B;AAEK,IAAM,kCAAkC,GAAG,UAChD,QAAyB,EACzB,OAAyB;;;;;gBAEnB,YAAY,GAAG,OAAO,CAAC,eAAe,CAAC,MAAM,CAAC;gBACpD,IAAI,CAAC,IAAA,yBAAc,EAAC,YAAY,EAAE,YAAY,CAAC,EAAE,CAAC;oBAChD,MAAM,IAAI,KAAK,CAAC,mCAAmC,CAAC,CAAC;gBACvD,CAAC;gBAED,IAAI,CAAC,YAAY,CAAC,OAAO,IAAI,YAAY,CAAC,OAAO,CAAC,IAAI,KAAK,QAAQ,EAAE,CAAC;oBACpE,MAAM,IAAI,KAAK,CAAC,6BAA6B,CAAC,CAAC;gBACjD,CAAC;gBACK,SAAS,GAAG,OAAO,CAAC,WAAW,CAAC,OAAO,CAAC,cAAc,CAAC;gBACvD,OAAO,GAAG,YAAY,CAAC,OAAO,CAAC;gBAC/B,SAAS,GAAG,wCAA4B,OAAO,CAAC,MAAM,cAAI,OAAO,CAAC,IAAI,0BAAY,SAAS,qDAA6C,CAAC;gBAE/I,qBAAM,IAAA,wCAAwB,EAAC,QAAQ,EAAE,qBAAqB,EAAE;wBAC9D,OAAO,EAAE,OAAO,CAAC,SAAS;wBAC1B,SAAS,EAAE,SAAS;qBACrB,CAAC,EAAA;;gBAHF,SAGE,CAAC;;;;KACJ,CAAC;AApBW,QAAA,kCAAkC,sCAoB7C"}
+{"version":3,"file":"openKubernetesDashboards.js","sourceRoot":"","sources":["../../../../src/kubernetes/openKubernetesDashboards.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AACA,gDAAqD;AAErD,yDAAmE;AAE5D,IAAM,mBAAmB,GAAG,UACjC,QAAyB,EACzB,OAAyB;;;;;;gBAEnB,YAAY,GAAG,MAAA,OAAO,CAAC,MAAM,0CAAE,MAAM,CAAC;gBAC5C,IAAI,CAAC,IAAA,yBAAc,EAAC,YAAY,EAAE,YAAY,CAAC,EAAE,CAAC;oBAChD,MAAM,IAAI,KAAK,CAAC,mCAAmC,CAAC,CAAC;gBACvD,CAAC;gBAED,IAAI,CAAC,YAAY,CAAC,OAAO,IAAI,YAAY,CAAC,OAAO,CAAC,IAAI,KAAK,QAAQ,EAAE,CAAC;oBACpE,MAAM,IAAI,KAAK,CAAC,6BAA6B,CAAC,CAAC;gBACjD,CAAC;gBAEK,SAAS,GAAG,OAAO,CAAC,WAAW,CAAC,OAAO,CAAC,cAAc,CAAC;gBACvD,OAAO,GAAG,YAAY,CAAC,OAAO,CAAC;gBAE/B,QAAQ,GAAG,qCAA8B,OAAO,CAAC,IAAI,SACzD,SAAS,CAAC,CAAC,CAAC,0BAAmB,SAAS,CAAE,CAAC,CAAC,CAAC,EAAE,CAC/C,CAAC;gBAEH,qBAAM,IAAA,wCAAwB,EAAC,QAAQ,EAAE,aAAa,EAAE;wBACtD,OAAO,EAAE,OAAO,CAAC,SAAS;wBAC1B,QAAQ,EAAE,QAAQ;qBACnB,CAAC,EAAA;;gBAHF,SAGE,CAAC;;;;KACJ,CAAC;AAxBW,QAAA,mBAAmB,uBAwB9B;AAEK,IAAM,kCAAkC,GAAG,UAChD,QAAyB,EACzB,OAAyB;;;;;;gBAEnB,YAAY,GAAG,MAAA,OAAO,CAAC,MAAM,0CAAE,MAAM,CAAC;gBAC5C,IAAI,CAAC,IAAA,yBAAc,EAAC,YAAY,EAAE,YAAY,CAAC,EAAE,CAAC;oBAChD,MAAM,IAAI,KAAK,CAAC,mCAAmC,CAAC,CAAC;gBACvD,CAAC;gBAED,IAAI,CAAC,YAAY,CAAC,OAAO,IAAI,YAAY,CAAC,OAAO,CAAC,IAAI,KAAK,QAAQ,EAAE,CAAC;oBACpE,MAAM,IAAI,KAAK,CAAC,6BAA6B,CAAC,CAAC;gBACjD,CAAC;gBACK,SAAS,GAAG,OAAO,CAAC,WAAW,CAAC,OAAO,CAAC,cAAc,CAAC;gBACvD,OAAO,GAAG,YAAY,CAAC,OAAO,CAAC;gBAC/B,SAAS,GAAG,wCAA4B,OAAO,CAAC,MAAM,cAAI,OAAO,CAAC,IAAI,0BAAY,SAAS,qDAA6C,CAAC;gBAE/I,qBAAM,IAAA,wCAAwB,EAAC,QAAQ,EAAE,qBAAqB,EAAE;wBAC9D,OAAO,EAAE,OAAO,CAAC,SAAS;wBAC1B,SAAS,EAAE,SAAS;qBACrB,CAAC,EAAA;;gBAHF,SAGE,CAAC;;;;KACJ,CAAC;AApBW,QAAA,kCAAkC,sCAoB7C"}

package/dist/pipeline/src/build/base/createAppBuildJob.js

@@ -66,17 +66,19 @@ var createAppBuildJob = function (context, _a) {
         image: (0, __1.getRunnerImage)("jobs-default"),
         needs: [],
         cache: [],
-        variables: __assign(__assign(__assign(__assign({}, (variables !== null && variables !== void 0 ? variables : {})), context.environment.envVars), context.environment.jobOnlyVars.build.envVars), ((_b = context.componentConfig.build.extraVars) !== null && _b !== void 0 ? _b : {})),
-        runnerVariables: __assign(__assign(__assign({}, constants_1.RUNNER_BUILD_RESOURCE_VARIABLES), (runnerVariables !== null && runnerVariables !== void 0 ? runnerVariables : {})), ((_c = context.componentConfig.build.runnerVariables) !== null && _c !== void 0 ? _c : {})),
+        variables: __assign(__assign(__assign(__assign({}, (variables !== null && variables !== void 0 ? variables : {})), context.environment.envVars), context.environment.jobOnlyVars.build.envVars), ((_b = context.build.config.extraVars) !== null && _b !== void 0 ? _b : {})),
+        runnerVariables: __assign(__assign(__assign({}, constants_1.RUNNER_BUILD_RESOURCE_VARIABLES), (runnerVariables !== null && runnerVariables !== void 0 ? runnerVariables : {})), ((_c = context.build.config.runnerVariables) !== null && _c !== void 0 ? _c : {})),
         script: __spreadArray(__spreadArray(__spreadArray(__spreadArray(__spreadArray([], __read((context.componentConfig.dotEnv === true // don't build when set to `local`
             ? (0, writeDotEnv_1.writeDotEnv)(context)
-            : [])), false), __read((0, writeBuildInfo_1.writeBuildInfo)(context)), false), __read((0, yarn_1.ensureNodeVersion)(context.buildContext)), false), [
-            "cd ".concat(context.componentConfig.dir)
+            : [])), false), __read((0, writeBuildInfo_1.writeBuildInfo)(context)), false), __read((0, yarn_1.ensureNodeVersion)(context.build)), false), [
+            "cd ".concat(context.build.dir)
         ], false), __read(((_d = (0, utils_1.ensureArray)(script)) !== null && _d !== void 0 ? _d : [])), false),
         artifacts: {
-            paths: [(0, path_1.join)(context.componentConfig.dir, "__build_info.json")],
+            paths: [(0, path_1.join)(context.build.dir, "__build_info.json")],
             reports: {
-                junit: (_f = (_e = context.componentConfig.build.artifactsReports) === null || _e === void 0 ? void 0 : _e.junit) === null || _f === void 0 ? void 0 : _f.map(function (p) { return (0, path_1.join)(context.componentConfig.dir, p); }),
+                junit: (_f = (_e = context.build.config.artifactsReports) === null || _e === void 0 ? void 0 : _e.junit) === null || _f === void 0 ? void 0 : _f.map(function (p) {
+                    return (0, path_1.join)(context.build.dir, p);
+                }),
             },
         },
     }, def);

package/dist/pipeline/src/build/base/createAppBuildJob.js.map

@@ -1 +1 @@
-{"version":3,"file":"createAppBuildJob.js","sourceRoot":"","sources":["../../../../../../pipeline/src/build/base/createAppBuildJob.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,iCAA+B;AAC/B,6BAA4B;AAE5B,2BAAuC;AAEvC,qCAA0C;AAC1C,qCAAiD;AACjD,yCAGqB;AACrB,mDAAkD;AAClD,6CAA4C;AAGrC,IAAM,iBAAiB,GAAG,UAC/B,OAAyB,EACzB,EAAqE;;IAAnE,IAAA,MAAM,YAAA,EAAE,SAAS,eAAA,EAAE,eAAe,qBAAA,EAAK,GAAG,cAA5C,0CAA8C,CAAF;IAE5C,OAAO,IAAA,cAAK,EACV;QACE,IAAI,EAAE,8BAAkB;QACxB,OAAO,EAAE,WAAW;QACpB,KAAK,EAAE,OAAO;QACd,KAAK,EAAE,IAAA,kBAAc,EAAC,cAAc,CAAC;QACrC,KAAK,EAAE,EAAE;QACT,KAAK,EAAE,EAAE;QACT,SAAS,0CACJ,CAAC,SAAS,aAAT,SAAS,cAAT,SAAS,GAAI,EAAE,CAAC,GACjB,OAAO,CAAC,WAAW,CAAC,OAAO,GAC3B,OAAO,CAAC,WAAW,CAAC,WAAW,CAAC,KAAK,CAAC,OAAO,GAC7C,CAAC,MAAA,OAAO,CAAC,eAAe,CAAC,KAAK,CAAC,SAAS,mCAAI,EAAE,CAAC,CACnD;QACD,eAAe,iCACV,2CAA+B,GAC/B,CAAC,eAAe,aAAf,eAAe,cAAf,eAAe,GAAI,EAAE,CAAC,GACvB,CAAC,MAAA,OAAO,CAAC,eAAe,CAAC,KAAK,CAAC,eAAe,mCAAI,EAAE,CAAC,CACzD;QAED,MAAM,mFACD,CAAC,OAAO,CAAC,eAAe,CAAC,MAAM,KAAK,IAAI,CAAC,kCAAkC;YAC5E,CAAC,CAAC,IAAA,yBAAW,EAAC,OAAO,CAAC;YACtB,CAAC,CAAC,EAAE,CAAC,kBACJ,IAAA,+BAAc,EAAC,OAAO,CAAC,kBACvB,IAAA,wBAAiB,EAAC,OAAO,CAAC,YAAY,CAAC;YAC1C,aAAM,OAAO,CAAC,eAAe,CAAC,GAAG,CAAE;0BAChC,CAAC,MAAA,IAAA,mBAAW,EAAC,MAAM,CAAC,mCAAI,EAAE,CAAC,SAC/B;QACD,SAAS,EAAE;YACT,KAAK,EAAE,CAAC,IAAA,WAAI,EAAC,OAAO,CAAC,eAAe,CAAC,GAAG,EAAE,mBAAmB,CAAC,CAAC;YAC/D,OAAO,EAAE;gBACP,KAAK,EAAE,MAAA,MAAA,OAAO,CAAC,eAAe,CAAC,KAAK,CAAC,gBAAgB,0CAAE,KAAK,0CAAE,GAAG,CAC/D,UAAC,CAAC,IAAK,OAAA,IAAA,WAAI,EAAC,OAAO,CAAC,eAAe,CAAC,GAAG,EAAE,CAAC,CAAC,EAApC,CAAoC,CAC5C;aACF;SACF;KACF,EACD,GAAG,CACJ,CAAC;AACJ,CAAC,CAAC;AA5CW,QAAA,iBAAiB,qBA4C5B"}
+{"version":3,"file":"createAppBuildJob.js","sourceRoot":"","sources":["../../../../../../pipeline/src/build/base/createAppBuildJob.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,iCAA+B;AAC/B,6BAA4B;AAE5B,2BAAuC;AAEvC,qCAA0C;AAC1C,qCAAiD;AACjD,yCAGqB;AACrB,mDAAkD;AAClD,6CAA4C;AAGrC,IAAM,iBAAiB,GAAG,UAC/B,OAAyB,EACzB,EAAqE;;IAAnE,IAAA,MAAM,YAAA,EAAE,SAAS,eAAA,EAAE,eAAe,qBAAA,EAAK,GAAG,cAA5C,0CAA8C,CAAF;IAE5C,OAAO,IAAA,cAAK,EACV;QACE,IAAI,EAAE,8BAAkB;QACxB,OAAO,EAAE,WAAW;QACpB,KAAK,EAAE,OAAO;QACd,KAAK,EAAE,IAAA,kBAAc,EAAC,cAAc,CAAC;QACrC,KAAK,EAAE,EAAE;QACT,KAAK,EAAE,EAAE;QACT,SAAS,0CACJ,CAAC,SAAS,aAAT,SAAS,cAAT,SAAS,GAAI,EAAE,CAAC,GACjB,OAAO,CAAC,WAAW,CAAC,OAAO,GAC3B,OAAO,CAAC,WAAW,CAAC,WAAW,CAAC,KAAK,CAAC,OAAO,GAC7C,CAAC,MAAA,OAAO,CAAC,KAAK,CAAC,MAAM,CAAC,SAAS,mCAAI,EAAE,CAAC,CAC1C;QACD,eAAe,iCACV,2CAA+B,GAC/B,CAAC,eAAe,aAAf,eAAe,cAAf,eAAe,GAAI,EAAE,CAAC,GACvB,CAAC,MAAA,OAAO,CAAC,KAAK,CAAC,MAAM,CAAC,eAAe,mCAAI,EAAE,CAAC,CAChD;QAED,MAAM,mFACD,CAAC,OAAO,CAAC,eAAe,CAAC,MAAM,KAAK,IAAI,CAAC,kCAAkC;YAC5E,CAAC,CAAC,IAAA,yBAAW,EAAC,OAAO,CAAC;YACtB,CAAC,CAAC,EAAE,CAAC,kBACJ,IAAA,+BAAc,EAAC,OAAO,CAAC,kBACvB,IAAA,wBAAiB,EAAC,OAAO,CAAC,KAAK,CAAC;YACnC,aAAM,OAAO,CAAC,KAAK,CAAC,GAAG,CAAE;0BACtB,CAAC,MAAA,IAAA,mBAAW,EAAC,MAAM,CAAC,mCAAI,EAAE,CAAC,SAC/B;QACD,SAAS,EAAE;YACT,KAAK,EAAE,CAAC,IAAA,WAAI,EAAC,OAAO,CAAC,KAAK,CAAC,GAAG,EAAE,mBAAmB,CAAC,CAAC;YACrD,OAAO,EAAE;gBACP,KAAK,EAAE,MAAA,MAAA,OAAO,CAAC,KAAK,CAAC,MAAM,CAAC,gBAAgB,0CAAE,KAAK,0CAAE,GAAG,CAAC,UAAC,CAAC;oBACzD,OAAA,IAAA,WAAI,EAAC,OAAO,CAAC,KAAK,CAAC,GAAG,EAAE,CAAC,CAAC;gBAA1B,CAA0B,CAC3B;aACF;SACF;KACF,EACD,GAAG,CACJ,CAAC;AACJ,CAAC,CAAC;AA5CW,QAAA,iBAAiB,qBA4C5B"}

package/dist/pipeline/src/build/base/writeBuildInfo.js

@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.writeBuildInfo = void 0;
 var writeBuildInfo = function (context) {
     return [
-        "echo '{\"id\":\"".concat(context.environment.envVars.BUILD_INFO_BUILD_ID, "\",\"time\":\"").concat(context.environment.envVars.BUILD_INFO_BUILD_TIME, "\"}' > ").concat(context.componentConfig.dir, "/__build_info.json"),
+        "echo '{\"id\":\"".concat(context.environment.envVars.BUILD_INFO_BUILD_ID, "\",\"time\":\"").concat(context.environment.envVars.BUILD_INFO_BUILD_TIME, "\"}' > ").concat(context.build.dir, "/__build_info.json"),
     ];
 };
 exports.writeBuildInfo = writeBuildInfo;

package/dist/pipeline/src/build/base/writeBuildInfo.js.map

@@ -1 +1 @@
-{"version":3,"file":"writeBuildInfo.js","sourceRoot":"","sources":["../../../../../../pipeline/src/build/base/writeBuildInfo.ts"],"names":[],"mappings":";;;AAEO,IAAM,cAAc,GAAG,UAAC,OAAyB;IACtD,OAAO;QACL,0BAAgB,OAAO,CAAC,WAAW,CAAC,OAAO,CAAC,mBAAmB,2BAAa,OAAO,CAAC,WAAW,CAAC,OAAO,CAAC,qBAAqB,oBAAS,OAAO,CAAC,eAAe,CAAC,GAAG,uBAAoB;KACtL,CAAC;AACJ,CAAC,CAAC;AAJW,QAAA,cAAc,kBAIzB"}
+{"version":3,"file":"writeBuildInfo.js","sourceRoot":"","sources":["../../../../../../pipeline/src/build/base/writeBuildInfo.ts"],"names":[],"mappings":";;;AAEO,IAAM,cAAc,GAAG,UAAC,OAAyB;IACtD,OAAO;QACL,0BAAgB,OAAO,CAAC,WAAW,CAAC,OAAO,CAAC,mBAAmB,2BAAa,OAAO,CAAC,WAAW,CAAC,OAAO,CAAC,qBAAqB,oBAAS,OAAO,CAAC,KAAK,CAAC,GAAG,uBAAoB;KAC5K,CAAC;AACJ,CAAC,CAAC;AAJW,QAAA,cAAc,kBAIzB"}

package/dist/pipeline/src/build/base/writeDotEnv.js

@@ -38,7 +38,7 @@ var writeDotEnv = function (context) {
     })
         .join("\n");
     return [
-        "cat <<EOF > ".concat(context.componentConfig.dir, "/.env\n").concat(keyValueString, "\nEOF"),
+        "cat <<EOF > ".concat(context.build.dir, "/.env\n").concat(keyValueString, "\nEOF"),
     ];
 };
 exports.writeDotEnv = writeDotEnv;

package/dist/pipeline/src/build/base/writeDotEnv.js.map

@@ -1 +1 @@
-{"version":3,"file":"writeDotEnv.js","sourceRoot":"","sources":["../../../../../../pipeline/src/build/base/writeDotEnv.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;AAAA,iCAA+B;AAG/B;;;;GAIG;AACI,IAAM,WAAW,GAAG,UAAC,OAAyB;IACnD,IAAM,OAAO,GAAG,OAAO,CAAC,WAAW,CAAC,OAAO,CAAC;IAE5C,wCAAwC;IACxC,IAAM,cAAc,GAAG,MAAM,CAAC,OAAO,CAAC,OAAO,CAAC;QAC5C,uCAAuC;SACtC,MAAM,CAAC,UAAC,EAAS;YAAT,KAAA,aAAS,EAAN,KAAK,QAAA;QAAM,OAAA,CAAC,IAAA,cAAK,EAAC,KAAK,CAAC;IAAb,CAAa,CAAC;SACpC,GAAG,CACF,UAAC,EAAY;YAAZ,KAAA,aAAY,EAAX,GAAG,QAAA,EAAE,KAAK,QAAA;QAAM,OAAA,UAAG,GAAG,cAAI,KAAK,aAAL,KAAK,uBAAL,KAAK,CAAE,QAAQ,GAAG,UAAU,CAAC,IAAI,EAAE,KAAK,CAAC,CAAE;IAArD,CAAqD,CACxE;SACA,IAAI,CAAC,IAAI,CAAC,CAAC;IAEd,OAAO;QACL,sBAAe,OAAO,CAAC,eAAe,CAAC,GAAG,oBAC5C,cAAc,UACZ;KACD,CAAC;AACJ,CAAC,CAAC;AAjBW,QAAA,WAAW,eAiBtB"}
+{"version":3,"file":"writeDotEnv.js","sourceRoot":"","sources":["../../../../../../pipeline/src/build/base/writeDotEnv.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;AAAA,iCAA+B;AAG/B;;;;GAIG;AACI,IAAM,WAAW,GAAG,UAAC,OAAyB;IACnD,IAAM,OAAO,GAAG,OAAO,CAAC,WAAW,CAAC,OAAO,CAAC;IAE5C,wCAAwC;IACxC,IAAM,cAAc,GAAG,MAAM,CAAC,OAAO,CAAC,OAAO,CAAC;QAC5C,uCAAuC;SACtC,MAAM,CAAC,UAAC,EAAS;YAAT,KAAA,aAAS,EAAN,KAAK,QAAA;QAAM,OAAA,CAAC,IAAA,cAAK,EAAC,KAAK,CAAC;IAAb,CAAa,CAAC;SACpC,GAAG,CACF,UAAC,EAAY;YAAZ,KAAA,aAAY,EAAX,GAAG,QAAA,EAAE,KAAK,QAAA;QAAM,OAAA,UAAG,GAAG,cAAI,KAAK,aAAL,KAAK,uBAAL,KAAK,CAAE,QAAQ,GAAG,UAAU,CAAC,IAAI,EAAE,KAAK,CAAC,CAAE;IAArD,CAAqD,CACxE;SACA,IAAI,CAAC,IAAI,CAAC,CAAC;IAEd,OAAO;QACL,sBAAe,OAAO,CAAC,KAAK,CAAC,GAAG,oBAClC,cAAc,UACZ;KACD,CAAC;AACJ,CAAC,CAAC;AAjBW,QAAA,WAAW,eAiBtB"}

package/dist/pipeline/src/build/custom/buildJob.js

@@ -37,8 +37,8 @@ var RUNNER_BUILD_VARIABLES = {
     KUBERNETES_MEMORY_LIMIT: "4Gi",
 };
 var createCustomBuildJobs = function (context) {
-    var _a, _b, _c, _d;
-    var buildConfig = context.componentConfig.build;
+    var _a, _b, _c;
+    var buildConfig = context.build.config;
     if (!(0, types_1.isOfBuildType)(buildConfig, "custom")) {
         throw new Error("deploy config is not custom");
     }
@@ -52,17 +52,17 @@ var createCustomBuildJobs = function (context) {
                 script: __spreadArray([], __read(((_a = (0, utils_1.ensureArray)(buildConfig.buildCommand)) !== null && _a !== void 0 ? _a : [])), false),
                 artifacts: {
                     paths: __spreadArray([
-                        (0, path_1.join)(context.componentConfig.dir, "__build_info.json"),
-                        (0, path_1.join)(context.componentConfig.dir, "dist")
+                        (0, path_1.join)(context.build.dir, "__build_info.json"),
+                        (0, path_1.join)(context.build.dir, "dist")
                     ], __read(((_c = (_b = buildConfig.artifactsPaths) === null || _b === void 0 ? void 0 : _b.map(function (path) {
-                        return (0, path_1.join)(context.componentConfig.dir, path);
+                        return (0, path_1.join)(context.build.dir, path);
                     })) !== null && _c !== void 0 ? _c : [])), false),
                     expire_in: "1 day",
                 },
             }
             : undefined,
         dockerBuild: {
-            script: (0, docker_1.getDockerBuildDefaultScript)(context, ((_d = buildConfig.docker) === null || _d === void 0 ? void 0 : _d.type) === "nginx" ? "ensureNginxDockerfile" : ""),
+            script: (0, docker_1.getDockerBuildScriptWithBuiltInDockerFile)(context),
             variables: {},
         },
     });

package/dist/pipeline/src/build/custom/buildJob.js.map

@@ -1 +1 @@
-{"version":3,"file":"buildJob.js","sourceRoot":"","sources":["../../../../../../pipeline/src/build/custom/buildJob.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,6BAA4B;AAE5B,qCAA0C;AAC1C,oCAAwD;AACxD,kCAAyC;AAGzC,gCAA0C;AAE1C,IAAM,sBAAsB,GAAG;IAC7B,sBAAsB,EAAE,KAAK;IAC7B,yBAAyB,EAAE,KAAK;IAChC,uBAAuB,EAAE,KAAK;CAC/B,CAAC;AAEK,IAAM,qBAAqB,GAAG,UACnC,OAAyB;;IAEzB,IAAM,WAAW,GAAG,OAAO,CAAC,eAAe,CAAC,KAAK,CAAC;IAElD,IAAI,CAAC,IAAA,qBAAa,EAAC,WAAW,EAAE,QAAQ,CAAC,EAAE,CAAC;QAC1C,MAAM,IAAI,KAAK,CAAC,6BAA6B,CAAC,CAAC;IACjD,CAAC;IAED,OAAO,IAAA,sBAAe,EAAC,OAAO,EAAE;QAC9B,QAAQ,EACN,WAAW,CAAC,YAAY,KAAK,IAAI;YAC/B,CAAC,CAAC;gBACE,KAAK,EAAE,WAAW,CAAC,QAAQ;gBAC3B,eAAe,EAAE,sBAAsB;gBACvC,KAAK,EAAE,WAAW,CAAC,QAAQ;gBAC3B,QAAQ,EAAE,WAAW,CAAC,WAAW;gBACjC,MAAM,2BAAM,CAAC,MAAA,IAAA,mBAAW,EAAC,WAAW,CAAC,YAAY,CAAC,mCAAI,EAAE,CAAC,SAAC;gBAC1D,SAAS,EAAE;oBACT,KAAK;wBACH,IAAA,WAAI,EAAC,OAAO,CAAC,eAAe,CAAC,GAAG,EAAE,mBAAmB,CAAC;wBACtD,IAAA,WAAI,EAAC,OAAO,CAAC,eAAe,CAAC,GAAG,EAAE,MAAM,CAAC;8BACtC,CAAC,MAAA,MAAA,WAAW,CAAC,cAAc,0CAAE,GAAG,CAAC,UAAC,IAAI;wBACvC,OAAA,IAAA,WAAI,EAAC,OAAO,CAAC,eAAe,CAAC,GAAG,EAAE,IAAI,CAAC;oBAAvC,CAAuC,CACxC,mCAAI,EAAE,CAAC,SACT;oBACD,SAAS,EAAE,OAAO;iBACnB;aACF;YACH,CAAC,CAAC,SAAS;QACf,WAAW,EAAE;YACX,MAAM,EAAE,IAAA,oCAA2B,EACjC,OAAO,EACP,CAAA,MAAA,WAAW,CAAC,MAAM,0CAAE,IAAI,MAAK,OAAO,CAAC,CAAC,CAAC,uBAAuB,CAAC,CAAC,CAAC,EAAE,CACpE;YAED,SAAS,EAAE,EAAE;SACd;KACF,CAAC,CAAC;AACL,CAAC,CAAC;AAvCW,QAAA,qBAAqB,yBAuChC"}
+{"version":3,"file":"buildJob.js","sourceRoot":"","sources":["../../../../../../pipeline/src/build/custom/buildJob.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,6BAA4B;AAE5B,qCAA0C;AAC1C,oCAAsE;AACtE,kCAAyC;AAGzC,gCAA0C;AAE1C,IAAM,sBAAsB,GAAG;IAC7B,sBAAsB,EAAE,KAAK;IAC7B,yBAAyB,EAAE,KAAK;IAChC,uBAAuB,EAAE,KAAK;CAC/B,CAAC;AAEK,IAAM,qBAAqB,GAAG,UACnC,OAAyB;;IAEzB,IAAM,WAAW,GAAG,OAAO,CAAC,KAAK,CAAC,MAAM,CAAC;IAEzC,IAAI,CAAC,IAAA,qBAAa,EAAC,WAAW,EAAE,QAAQ,CAAC,EAAE,CAAC;QAC1C,MAAM,IAAI,KAAK,CAAC,6BAA6B,CAAC,CAAC;IACjD,CAAC;IAED,OAAO,IAAA,sBAAe,EAAC,OAAO,EAAE;QAC9B,QAAQ,EACN,WAAW,CAAC,YAAY,KAAK,IAAI;YAC/B,CAAC,CAAC;gBACE,KAAK,EAAE,WAAW,CAAC,QAAQ;gBAC3B,eAAe,EAAE,sBAAsB;gBACvC,KAAK,EAAE,WAAW,CAAC,QAAQ;gBAC3B,QAAQ,EAAE,WAAW,CAAC,WAAW;gBACjC,MAAM,2BAAM,CAAC,MAAA,IAAA,mBAAW,EAAC,WAAW,CAAC,YAAY,CAAC,mCAAI,EAAE,CAAC,SAAC;gBAC1D,SAAS,EAAE;oBACT,KAAK;wBACH,IAAA,WAAI,EAAC,OAAO,CAAC,KAAK,CAAC,GAAG,EAAE,mBAAmB,CAAC;wBAC5C,IAAA,WAAI,EAAC,OAAO,CAAC,KAAK,CAAC,GAAG,EAAE,MAAM,CAAC;8BAC5B,CAAC,MAAA,MAAA,WAAW,CAAC,cAAc,0CAAE,GAAG,CAAC,UAAC,IAAI;wBACvC,OAAA,IAAA,WAAI,EAAC,OAAO,CAAC,KAAK,CAAC,GAAG,EAAE,IAAI,CAAC;oBAA7B,CAA6B,CAC9B,mCAAI,EAAE,CAAC,SACT;oBACD,SAAS,EAAE,OAAO;iBACnB;aACF;YACH,CAAC,CAAC,SAAS;QACf,WAAW,EAAE;YACX,MAAM,EAAE,IAAA,kDAAyC,EAAC,OAAO,CAAC;YAE1D,SAAS,EAAE,EAAE;SACd;KACF,CAAC,CAAC;AACL,CAAC,CAAC;AApCW,QAAA,qBAAqB,yBAoChC"}

package/dist/pipeline/src/build/custom/testJob.js

@@ -52,12 +52,12 @@ var createCustomTestJobs = function (context) {
     if (context.trigger === "taggedRelease") {
         return [];
     }
-    var buildConfig = context.componentConfig.build;
+    var buildConfig = context.build.config;
     if (!(0, types_1.isOfBuildType)(buildConfig, "custom")) {
         throw new Error("deploy config is not custom");
     }
     var base = {
-        variables: __assign(__assign({ APP_PATH: context.componentConfig.dir }, context.environment.jobOnlyVars.build.envVars), ((_a = buildConfig.extraVars) !== null && _a !== void 0 ? _a : {})),
+        variables: __assign(__assign({ APP_PATH: context.build.dir }, context.environment.jobOnlyVars.build.envVars), ((_a = buildConfig.extraVars) !== null && _a !== void 0 ? _a : {})),
         runnerVariables: RUNNER_CUSTOM_TEST_VARIABLES,
         services: buildConfig.jobServices,
         cache: buildConfig.jobCache,
@@ -66,11 +66,11 @@ var createCustomTestJobs = function (context) {
         envMode: "none",
     };
     var auditJob = buildConfig.audit
-        ? __assign(__assign(__assign({ name: "🛡 audit" }, base), { image: (_c = (_b = buildConfig.audit) === null || _b === void 0 ? void 0 : _b.jobImage) !== null && _c !== void 0 ? _c : buildConfig.jobImage, cache: undefined, script: __spreadArray([], __read(((_e = (0, utils_1.ensureArray)((_d = buildConfig.audit) === null || _d === void 0 ? void 0 : _d.command)) !== null && _e !== void 0 ? _e : [])), false), allow_failure: true }), (0, createArtifactsConfig_1.createArtifactsConfig)(context.componentConfig.dir, (_f = buildConfig.audit) === null || _f === void 0 ? void 0 : _f.artifactsReports, (_g = buildConfig.audit) === null || _g === void 0 ? void 0 : _g.artifacts)) : null;
+        ? __assign(__assign(__assign({ name: "🛡 audit" }, base), { image: (_c = (_b = buildConfig.audit) === null || _b === void 0 ? void 0 : _b.jobImage) !== null && _c !== void 0 ? _c : buildConfig.jobImage, cache: undefined, script: __spreadArray([], __read(((_e = (0, utils_1.ensureArray)((_d = buildConfig.audit) === null || _d === void 0 ? void 0 : _d.command)) !== null && _e !== void 0 ? _e : [])), false), allow_failure: true }), (0, createArtifactsConfig_1.createArtifactsConfig)(context.build.dir, (_f = buildConfig.audit) === null || _f === void 0 ? void 0 : _f.artifactsReports, (_g = buildConfig.audit) === null || _g === void 0 ? void 0 : _g.artifacts)) : null;
     var lintJob = buildConfig.lint
-        ? __assign(__assign(__assign({ name: "👮 lint" }, base), { image: (_j = (_h = buildConfig.lint) === null || _h === void 0 ? void 0 : _h.jobImage) !== null && _j !== void 0 ? _j : buildConfig.jobImage, script: __spreadArray([], __read(((_l = (0, utils_1.ensureArray)((_k = buildConfig.lint) === null || _k === void 0 ? void 0 : _k.command)) !== null && _l !== void 0 ? _l : [])), false) }), (0, createArtifactsConfig_1.createArtifactsConfig)(context.componentConfig.dir, (_m = buildConfig.lint) === null || _m === void 0 ? void 0 : _m.artifactsReports, (_o = buildConfig.lint) === null || _o === void 0 ? void 0 : _o.artifacts)) : null;
+        ? __assign(__assign(__assign({ name: "👮 lint" }, base), { image: (_j = (_h = buildConfig.lint) === null || _h === void 0 ? void 0 : _h.jobImage) !== null && _j !== void 0 ? _j : buildConfig.jobImage, script: __spreadArray([], __read(((_l = (0, utils_1.ensureArray)((_k = buildConfig.lint) === null || _k === void 0 ? void 0 : _k.command)) !== null && _l !== void 0 ? _l : [])), false) }), (0, createArtifactsConfig_1.createArtifactsConfig)(context.build.dir, (_m = buildConfig.lint) === null || _m === void 0 ? void 0 : _m.artifactsReports, (_o = buildConfig.lint) === null || _o === void 0 ? void 0 : _o.artifacts)) : null;
     var testJob = buildConfig.test
-        ? __assign(__assign(__assign({ name: "🧪 test" }, base), { image: (_q = (_p = buildConfig.test) === null || _p === void 0 ? void 0 : _p.jobImage) !== null && _q !== void 0 ? _q : buildConfig.jobImage, script: __spreadArray([], __read(((_s = (0, utils_1.ensureArray)((_r = buildConfig.test) === null || _r === void 0 ? void 0 : _r.command)) !== null && _s !== void 0 ? _s : [])), false) }), (0, createArtifactsConfig_1.createArtifactsConfig)(context.componentConfig.dir, (_t = buildConfig.test) === null || _t === void 0 ? void 0 : _t.artifactsReports, (_u = buildConfig.test) === null || _u === void 0 ? void 0 : _u.artifacts)) : null;
+        ? __assign(__assign(__assign({ name: "🧪 test" }, base), { image: (_q = (_p = buildConfig.test) === null || _p === void 0 ? void 0 : _p.jobImage) !== null && _q !== void 0 ? _q : buildConfig.jobImage, script: __spreadArray([], __read(((_s = (0, utils_1.ensureArray)((_r = buildConfig.test) === null || _r === void 0 ? void 0 : _r.command)) !== null && _s !== void 0 ? _s : [])), false) }), (0, createArtifactsConfig_1.createArtifactsConfig)(context.build.dir, (_t = buildConfig.test) === null || _t === void 0 ? void 0 : _t.artifactsReports, (_u = buildConfig.test) === null || _u === void 0 ? void 0 : _u.artifacts)) : null;
     return [auditJob, lintJob, testJob].filter(utils_1.notNil);
 };
 exports.createCustomTestJobs = createCustomTestJobs;

package/dist/pipeline/src/build/custom/testJob.js.map

@@ -1 +1 @@
-{"version":3,"file":"testJob.js","sourceRoot":"","sources":["../../../../../../pipeline/src/build/custom/testJob.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"testJob.js","sourceRoot":"","sources":["../../../../../../pipeline/src/build/custom/testJob.ts"],"names":[],"mappings":"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"}

package/dist/pipeline/src/build/docker.d.ts

@@ -1,3 +1,4 @@
+import type { BuildConfigDocker } from ".";
 import type { ComponentContext } from "../types";
 import type { CatladderJob } from "../types/jobs";
 export declare const getDockerImageVariables: (context: ComponentContext) => {
@@ -15,31 +16,51 @@ export declare const getDockerImageVariables: (context: ComponentContext) => {
 /**
  * Weather the context requires a docker build
  */
-export declare const requiresDockerBuild: ({ componentConfig: { deploy }, }: ComponentContext) => boolean;
+export declare const requiresDockerBuild: (context: ComponentContext) => boolean;
 export declare const getDockerBuildVariables: (context: ComponentContext) => {
     DOCKER_IMAGE_TAG: string;
     DOCKER_REGISTRY: string;
     DOCKER_IMAGE: import("../bash/BashExpression").StringOrBashExpression;
     DOCKER_CACHE_IMAGE: string;
-    DOCKERFILE_ADDITIONS: string;
-    DOCKERFILE_ADDITIONS_END: string;
     APP_DIR: string;
     DOCKER_DIR: string;
+    DOCKERFILE_ADDITIONS?: undefined;
+    DOCKERFILE_ADDITIONS_END?: undefined;
 } | {
     DOCKER_IMAGE_TAG: string;
     DOCKER_REGISTRY: string;
     DOCKER_CACHE_IMAGE: string;
     DOCKER_IMAGE_NAME: string;
     DOCKER_IMAGE: string;
+    APP_DIR: string;
+    DOCKER_DIR: string;
+    DOCKERFILE_ADDITIONS?: undefined;
+    DOCKERFILE_ADDITIONS_END?: undefined;
+} | {
+    DOCKER_IMAGE_TAG: string;
+    DOCKER_REGISTRY: string;
+    DOCKER_IMAGE: import("../bash/BashExpression").StringOrBashExpression;
+    DOCKER_CACHE_IMAGE: string;
+    APP_DIR: string;
+    DOCKER_DIR: string;
     DOCKERFILE_ADDITIONS: string;
     DOCKERFILE_ADDITIONS_END: string;
+} | {
+    DOCKER_IMAGE_TAG: string;
+    DOCKER_REGISTRY: string;
+    DOCKER_CACHE_IMAGE: string;
+    DOCKER_IMAGE_NAME: string;
+    DOCKER_IMAGE: string;
     APP_DIR: string;
     DOCKER_DIR: string;
+    DOCKERFILE_ADDITIONS: string;
+    DOCKERFILE_ADDITIONS_END: string;
 };
 export declare const DOCKER_BUILD_JOB_NAME = "\uD83D\uDD28 docker";
-export declare const getDockerJobBaseProps: (context: ComponentContext) => Pick<CatladderJob, "image" | "services" | "variables" | "runnerVariables">;
+export declare const getDockerJobBaseProps: () => Pick<CatladderJob, "image" | "services" | "variables" | "runnerVariables">;
 export type DockerBuildJobDefinition = Partial<CatladderJob>;
 export declare const createDockerBuildJobBase: (context: ComponentContext, { script, ...def }: Partial<CatladderJob>) => CatladderJob;
 export declare const gitlabDockerLogin: (context: ComponentContext) => string[];
-export declare const getDockerBuildDefaultScript: (context: ComponentContext, ensureDockerFileScript?: string) => string[];
+export declare const getDockerBuildScriptWithBuiltInDockerFile: (context: ComponentContext, defaultType?: BuildConfigDocker["type"]) => string[];
+export declare const getDockerBuildDefaultScript: (context: ComponentContext, ensureDockerFileScript?: string | null) => string[];
 export declare const hasDockerfile: (context: ComponentContext) => boolean;

package/dist/pipeline/src/build/docker.js

@@ -50,22 +50,24 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.hasDockerfile = exports.getDockerBuildDefaultScript = exports.gitlabDockerLogin = exports.createDockerBuildJobBase = exports.getDockerJobBaseProps = exports.DOCKER_BUILD_JOB_NAME = exports.getDockerBuildVariables = exports.requiresDockerBuild = exports.getDockerImageVariables = void 0;
-var lodash_1 = require("lodash");
-var deploy_1 = require("../deploy");
-var runner_1 = require("../runner");
+exports.hasDockerfile = exports.getDockerBuildDefaultScript = exports.getDockerBuildScriptWithBuiltInDockerFile = exports.gitlabDockerLogin = exports.createDockerBuildJobBase = exports.getDockerJobBaseProps = exports.DOCKER_BUILD_JOB_NAME = exports.getDockerBuildVariables = exports.requiresDockerBuild = exports.getDockerImageVariables = void 0;
 var fs_1 = require("fs");
+var lodash_1 = require("lodash");
 var path_1 = __importDefault(require("path"));
-var gitlab_1 = require("../utils/gitlab");
+var deploy_1 = require("../deploy");
 var artifactsRegistry_1 = require("../deploy/cloudRun/artifactsRegistry");
 var gcloudServiceAccountLoginCommands_1 = require("../deploy/cloudRun/utils/gcloudServiceAccountLoginCommands");
+var runner_1 = require("../runner");
+var gitlab_1 = require("../utils/gitlab");
 var DOCKER_BUILD_RUNNER_REQUESTS = {
     KUBERNETES_CPU_REQUEST: "0.5",
     KUBERNETES_MEMORY_REQUEST: "1Gi",
     KUBERNETES_MEMORY_LIMIT: "2Gi",
 };
 var getDockerImageVariables = function (context) {
-    return __assign(__assign({}, ((0, deploy_1.isOfDeployType)(context.componentConfig.deploy, "google-cloudrun")
+    var _a;
+    var deployConfig = (_a = context.deploy) === null || _a === void 0 ? void 0 : _a.config;
+    return __assign(__assign({}, ((0, deploy_1.isOfDeployType)(deployConfig, "google-cloudrun")
         ? {
             DOCKER_REGISTRY: (0, artifactsRegistry_1.getArtifactsRegistryHost)(context),
             DOCKER_IMAGE: (0, artifactsRegistry_1.getArtifactsRegistryImageName)(context),
@@ -84,10 +86,11 @@ exports.getDockerImageVariables = getDockerImageVariables;
 /**
  * Weather the context requires a docker build
  */
-var requiresDockerBuild = function (_a) {
-    var deploy = _a.componentConfig.deploy;
-    return (0, deploy_1.isOfDeployType)(deploy, "kubernetes", "google-cloudrun", "dockerTag") ||
-        ((0, deploy_1.isOfDeployType)(deploy, "custom") && deploy.requiresDocker);
+var requiresDockerBuild = function (context) {
+    var _a;
+    var deployConfig = (_a = context.deploy) === null || _a === void 0 ? void 0 : _a.config;
+    return ((0, deploy_1.isOfDeployType)(deployConfig, "kubernetes", "google-cloudrun", "dockerTag") ||
+        ((0, deploy_1.isOfDeployType)(deployConfig, "custom") && deployConfig.requiresDocker));
 };
 exports.requiresDockerBuild = requiresDockerBuild;
 // those need to be runner variables
@@ -97,13 +100,27 @@ var getDockerBuildRunnerVariables = function () { return ({
     DOCKER_DRIVER: "overlay2",
     DOCKER_BUILDKIT: "1", // see https://docs.docker.com/develop/develop-images/build_enhancements/
 }); };
+var getDockerAdditions = function (build) {
+    var _a, _b;
+    if (!("docker" in build))
+        return {};
+    if (!build.docker)
+        return {};
+    return {
+        DOCKERFILE_ADDITIONS: "additionsBegin" in build.docker
+            ? (_a = build.docker.additionsBegin) === null || _a === void 0 ? void 0 : _a.join("\n")
+            : undefined,
+        DOCKERFILE_ADDITIONS_END: "additionsEnd" in build.docker
+            ? (_b = build.docker.additionsEnd) === null || _b === void 0 ? void 0 : _b.join("\n")
+            : undefined,
+    };
+};
 var getDockerBuildVariables = function (context) {
-    var _a, _b, _c, _d;
-    return __assign({ DOCKERFILE_ADDITIONS: (_b = (_a = context.componentConfig.build.docker) === null || _a === void 0 ? void 0 : _a.additionsBegin) === null || _b === void 0 ? void 0 : _b.join("\n"), DOCKERFILE_ADDITIONS_END: (_d = (_c = context.componentConfig.build.docker) === null || _c === void 0 ? void 0 : _c.additionsEnd) === null || _d === void 0 ? void 0 : _d.join("\n"), APP_DIR: context.componentConfig.dir, DOCKER_DIR: "." }, (0, exports.getDockerImageVariables)(context));
+    return __assign(__assign(__assign({}, getDockerAdditions(context.build.config)), { APP_DIR: context.build.dir, DOCKER_DIR: "." }), (0, exports.getDockerImageVariables)(context));
 };
 exports.getDockerBuildVariables = getDockerBuildVariables;
 exports.DOCKER_BUILD_JOB_NAME = "🔨 docker";
-var getDockerJobBaseProps = function (context) {
+var getDockerJobBaseProps = function () {
     return {
         image: (0, runner_1.getRunnerImage)("docker-build"),
         services: [
@@ -119,14 +136,14 @@ var getDockerJobBaseProps = function (context) {
 exports.getDockerJobBaseProps = getDockerJobBaseProps;
 var createDockerBuildJobBase = function (context, _a) {
     var script = _a.script, def = __rest(_a, ["script"]);
-    return (0, lodash_1.merge)(__assign(__assign({ name: exports.DOCKER_BUILD_JOB_NAME, envMode: "jobPerEnv", stage: "build" }, (0, exports.getDockerJobBaseProps)(context)), { script: script || [] }), {
+    return (0, lodash_1.merge)(__assign(__assign({ name: exports.DOCKER_BUILD_JOB_NAME, envMode: "jobPerEnv", stage: "build" }, (0, exports.getDockerJobBaseProps)()), { script: script || [] }), {
         variables: (0, exports.getDockerBuildVariables)(context),
         runnerVariables: __assign(__assign({}, DOCKER_BUILD_RUNNER_REQUESTS), getDockerBuildRunnerVariables()),
     }, def);
 };
 exports.createDockerBuildJobBase = createDockerBuildJobBase;
 var gitlabDockerLogin = function (context) {
-    return (0, deploy_1.isOfDeployType)(context.componentConfig.deploy, "google-cloudrun")
+    return context.deploy && (0, deploy_1.isOfDeployType)(context.deploy.config, "google-cloudrun")
         ? __spreadArray(__spreadArray([], __read((0, gcloudServiceAccountLoginCommands_1.gcloudServiceAccountLoginCommands)(context)), false), [
             "gcloud auth configure-docker ".concat((0, artifactsRegistry_1.getArtifactsRegistryHost)(context)),
         ], false) : [
@@ -134,9 +151,25 @@ var gitlabDockerLogin = function (context) {
     ];
 };
 exports.gitlabDockerLogin = gitlabDockerLogin;
+var BUILT_IN_ENSURE_DOCKERFILE_SCRIPTS = {
+    meteor: "ensureMeteorDockerfile",
+    node: "ensureNodeDockerfile",
+    nginx: "ensureNginxDockerfile",
+    custom: null,
+};
+var getDockerBuildScriptWithBuiltInDockerFile = function (context, defaultType) {
+    var _a;
+    var type = "docker" in context.componentConfig.build &&
+        context.componentConfig.build.docker &&
+        "type" in context.componentConfig.build.docker
+        ? (_a = context.componentConfig.build.docker) === null || _a === void 0 ? void 0 : _a.type
+        : defaultType;
+    return (0, exports.getDockerBuildDefaultScript)(context, type ? BUILT_IN_ENSURE_DOCKERFILE_SCRIPTS[type] : null);
+};
+exports.getDockerBuildScriptWithBuiltInDockerFile = getDockerBuildScriptWithBuiltInDockerFile;
 var getDockerBuildDefaultScript = function (context, ensureDockerFileScript) {
     return __spreadArray(__spreadArray(__spreadArray([
-        ensureDockerFileScript
+        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/
     ])), false), __read((0, gitlab_1.collapseableSection)("docker-push", "Docker push and tag")([
@@ -147,7 +180,7 @@ var getDockerBuildDefaultScript = function (context, ensureDockerFileScript) {
 };
 exports.getDockerBuildDefaultScript = getDockerBuildDefaultScript;
 var hasDockerfile = function (context) {
-    return (0, fs_1.existsSync)(path_1.default.join(context.componentConfig.dir, "Dockerfile"));
+    return (0, fs_1.existsSync)(path_1.default.join(context.build.dir, "Dockerfile"));
 };
 exports.hasDockerfile = hasDockerfile;
 //# sourceMappingURL=docker.js.map

package/dist/pipeline/src/build/docker.js.map

@@ -1 +1 @@
-{"version":3,"file":"docker.js","sourceRoot":"","sources":["../../../../../pipeline/src/build/docker.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"docker.js","sourceRoot":"","sources":["../../../../../pipeline/src/build/docker.ts"],"names":[],"mappings":"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"}

package/dist/pipeline/src/build/node/buildJob.js

@@ -37,23 +37,23 @@ var constants_1 = require("./constants");
 var yarn_1 = require("./yarn");
 var createNodeBuildJobs = function (context) {
     var _a, _b, _c, _d, _e, _f, _g;
-    var buildConfig = context.componentConfig.build;
+    var buildConfig = context.build.config;
     if (!(0, types_1.isOfBuildType)(buildConfig, "node", "node-static", "storybook")) {
         throw new Error("deploy config is not node, node-static or storybook");
     }
     var defaultImage = (0, runner_1.getRunnerImage)("jobs-default");
-    var yarnInstall = (0, yarn_1.getYarnInstall)(context.buildContext);
+    var yarnInstall = (0, yarn_1.getYarnInstall)(context.build);
     return (0, base_1.createBuildJobs)(context, {
         appBuild: buildConfig.buildCommand !== null
             ? {
                 image: (_a = buildConfig.jobImage) !== null && _a !== void 0 ? _a : defaultImage,
                 runnerVariables: constants_1.NODE_RUNNER_BUILD_VARIABLES,
-                cache: __spreadArray(__spreadArray(__spreadArray([], __read(((_b = (0, utils_1.ensureArray)(buildConfig.jobCache)) !== null && _b !== void 0 ? _b : [])), false), __read((0, cache_1.getNodeCache)(context.buildContext)), false), __read((0, cache_1.getNextCache)(context)), false),
+                cache: __spreadArray(__spreadArray(__spreadArray([], __read(((_b = (0, utils_1.ensureArray)(buildConfig.jobCache)) !== null && _b !== void 0 ? _b : [])), false), __read((0, cache_1.getNodeCache)(context.build)), false), __read((0, cache_1.getNextCache)(context)), false),
                 script: __spreadArray(__spreadArray([], __read(yarnInstall), false), __read(((_c = (0, utils_1.ensureArray)(buildConfig.buildCommand)) !== null && _c !== void 0 ? _c : [])), false),
                 artifacts: {
                     paths: __spreadArray([
-                        context.componentConfig.dir
-                    ], __read(((_e = (_d = context.buildContext.packageManagerInfo) === null || _d === void 0 ? void 0 : _d.currentWorkspaceDependencies) !== null && _e !== void 0 ? _e : [])), false).flatMap(function (dir) {
+                        context.build.dir
+                    ], __read(((_e = (_d = context.build.packageManagerInfo) === null || _d === void 0 ? void 0 : _d.currentWorkspaceDependencies) !== null && _e !== void 0 ? _e : [])), false).flatMap(function (dir) {
                         var _a, _b;
                         return __spreadArray([
                             (0, path_1.join)(dir, "__build_info.json"),
@@ -70,14 +70,14 @@ var createNodeBuildJobs = function (context) {
             }
             : undefined,
         dockerBuild: {
-            script: (0, docker_1.getDockerBuildDefaultScript)(context, buildConfig.type === "node-static" || buildConfig.type === "storybook"
-                ? "ensureNginxDockerfile"
-                : "ensureNodeDockerfile"),
-            cache: __spreadArray([], __read((0, cache_1.getYarnCache)(context.buildContext, "pull")), false),
+            script: (0, docker_1.getDockerBuildScriptWithBuiltInDockerFile)(context, buildConfig.type === "node-static" || buildConfig.type === "storybook"
+                ? "nginx"
+                : "node"),
+            cache: __spreadArray([], __read((0, cache_1.getYarnCache)(context.build, "pull")), false),
             variables: {
                 // only required for non static
-                DOCKER_COPY_AND_INSTALL_APP: (0, yarn_1.getDockerAppCopyAndBuildScript)(context.buildContext),
-                DOCKER_COPY_WORKSPACE_FILES: (_g = (_f = context.buildContext.packageManagerInfo) === null || _f === void 0 ? void 0 : _f.pathsToCopyInDocker.map(function (dir) { return "COPY --chown=node:node ".concat(dir, " /app/").concat(dir); })) === null || _g === void 0 ? void 0 : _g.join("\n"),
+                DOCKER_COPY_AND_INSTALL_APP: (0, yarn_1.getDockerAppCopyAndBuildScript)(context.build),
+                DOCKER_COPY_WORKSPACE_FILES: (_g = (_f = context.build.packageManagerInfo) === null || _f === void 0 ? void 0 : _f.pathsToCopyInDocker.map(function (dir) { return "COPY --chown=node:node ".concat(dir, " /app/").concat(dir); })) === null || _g === void 0 ? void 0 : _g.join("\n"),
             },
         },
     });

package/dist/pipeline/src/build/node/buildJob.js.map

@@ -1 +1 @@
-{"version":3,"file":"buildJob.js","sourceRoot":"","sources":["../../../../../../pipeline/src/build/node/buildJob.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"buildJob.js","sourceRoot":"","sources":["../../../../../../pipeline/src/build/node/buildJob.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,6BAA4B;AAC5B,uCAA8C;AAG9C,qCAA0C;AAC1C,gCAA0C;AAC1C,oCAAsE;AACtE,kCAAyC;AACzC,iCAAmE;AACnE,yCAA0D;AAC1D,+BAAwE;AAEjE,IAAM,mBAAmB,GAAG,UACjC,OAAyB;;IAEzB,IAAM,WAAW,GAAG,OAAO,CAAC,KAAK,CAAC,MAAM,CAAC;IAEzC,IAAI,CAAC,IAAA,qBAAa,EAAC,WAAW,EAAE,MAAM,EAAE,aAAa,EAAE,WAAW,CAAC,EAAE,CAAC;QACpE,MAAM,IAAI,KAAK,CAAC,qDAAqD,CAAC,CAAC;IACzE,CAAC;IAED,IAAM,YAAY,GAAG,IAAA,uBAAc,EAAC,cAAc,CAAC,CAAC;IACpD,IAAM,WAAW,GAAG,IAAA,qBAAc,EAAC,OAAO,CAAC,KAAK,CAAC,CAAC;IAElD,OAAO,IAAA,sBAAe,EAAC,OAAO,EAAE;QAC9B,QAAQ,EACN,WAAW,CAAC,YAAY,KAAK,IAAI;YAC/B,CAAC,CAAC;gBACE,KAAK,EAAE,MAAA,WAAW,CAAC,QAAQ,mCAAI,YAAY;gBAC3C,eAAe,EAAE,uCAA2B;gBAC5C,KAAK,uDACA,CAAC,MAAA,IAAA,mBAAW,EAAC,WAAW,CAAC,QAAQ,CAAC,mCAAI,EAAE,CAAC,kBACzC,IAAA,oBAAY,EAAC,OAAO,CAAC,KAAK,CAAC,kBAC3B,IAAA,oBAAY,EAAC,OAAO,CAAC,SACzB;gBACD,MAAM,yCACD,WAAW,kBACX,CAAC,MAAA,IAAA,mBAAW,EAAC,WAAW,CAAC,YAAY,CAAC,mCAAI,EAAE,CAAC,SACjD;gBACD,SAAS,EAAE;oBACT,KAAK,EAAE;wBACL,OAAO,CAAC,KAAK,CAAC,GAAG;8BAEd,CAAC,MAAA,MAAA,OAAO,CAAC,KAAK,CAAC,kBAAkB,0CAChC,4BAA4B,mCAAI,EAAE,CAAC,UACvC,OAAO,CAAC,UAAC,GAAG;;wBAAK;4BACjB,IAAA,WAAI,EAAC,GAAG,EAAE,mBAAmB,CAAC;4BAC9B,IAAA,WAAI,EAAC,GAAG,EAAE,MAAM,CAAC;4BACjB,IAAA,WAAI,EAAC,GAAG,EAAE,OAAO,CAAC;kCACf,CAAC,MAAA,MAAA,WAAW,CAAC,cAAc,0CAAE,GAAG,CAAC,UAAC,IAAI;4BACvC,OAAA,IAAA,WAAI,EAAC,GAAG,EAAE,IAAI,CAAC;wBAAf,CAAe,CAChB,mCAAI,EAAE,CAAC,UACT;qBAAA,CAAC;oBACF,SAAS,EAAE,OAAO;oBAClB,IAAI,EAAE,QAAQ;iBACf;gBACD,OAAO,EAAE,WAAW,CAAC,OAAO;aAC7B;YACH,CAAC,CAAC,SAAS;QAEf,WAAW,EAAE;YACX,MAAM,EAAE,IAAA,kDAAyC,EAC/C,OAAO,EACP,WAAW,CAAC,IAAI,KAAK,aAAa,IAAI,WAAW,CAAC,IAAI,KAAK,WAAW;gBACpE,CAAC,CAAC,OAAO;gBACT,CAAC,CAAC,MAAM,CACX;YACD,KAAK,2BAAM,IAAA,oBAAY,EAAC,OAAO,CAAC,KAAK,EAAE,MAAM,CAAC,SAAC;YAC/C,SAAS,EAAE;gBACT,+BAA+B;gBAC/B,2BAA2B,EAAE,IAAA,qCAA8B,EACzD,OAAO,CAAC,KAAK,CACd;gBACD,2BAA2B,EACzB,MAAA,MAAA,OAAO,CAAC,KAAK,CAAC,kBAAkB,0CAAE,mBAAmB,CAClD,GAAG,CAAC,UAAC,GAAG,IAAK,OAAA,iCAA0B,GAAG,mBAAS,GAAG,CAAE,EAA3C,CAA2C,CAAC,0CACxD,IAAI,CAAC,IAAI,CAAC;aACjB;SACF;KACF,CAAC,CAAC;AACL,CAAC,CAAC;AApEW,QAAA,mBAAmB,uBAoE9B"}

package/dist/pipeline/src/build/node/cache.js

@@ -84,7 +84,7 @@ var getNextCache = function (context) { return [
     {
         key: context.componentName + "-next-cache",
         policy: "pull-push",
-        paths: [context.componentConfig.dir + "/.next/cache/"],
+        paths: [context.build.dir + "/.next/cache/"],
     },
 ]; };
 exports.getNextCache = getNextCache;

package/dist/pipeline/src/build/node/cache.js.map

@@ -1 +1 @@
-{"version":3,"file":"cache.js","sourceRoot":"","sources":["../../../../../../pipeline/src/build/node/cache.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,6BAA4B;AAC5B,oDAA8B;AAG9B,iCAA8B;AAEvB,IAAM,YAAY,GAAG,UAC1B,OAAqB,EACrB,MAAoB;;IAApB,uBAAA,EAAA,oBAAoB;IAEpB,IAAM,sBAAsB,GAC1B,MAAA,OAAO,CAAC,kBAAkB,0CAAE,sBAAsB,CAAC;IACrD,OAAO;QACL,sBAAsB;YACpB,CAAC,CAAC;gBACE,GAAG,EAAE,MAAM;gBACX,MAAM,QAAA;gBACN,KAAK,EAAE,CAAC,OAAO,CAAC;aACjB;YACH,CAAC,CAAC;gBACE,GAAG,EAAE,IAAA,iBAAO,EAAC,OAAO,CAAC,GAAG,CAAC,GAAG,OAAO;gBACnC,MAAM,QAAA;gBACN,KAAK,EAAE,CAAC,IAAA,WAAI,EAAC,OAAO,CAAC,GAAG,EAAE,OAAO,CAAC,CAAC;aACpC;KACN,CAAC;AACJ,CAAC,CAAC;AAnBW,QAAA,YAAY,gBAmBvB;AAEK,IAAM,mBAAmB,GAAG,UACjC,OAAqB,EACrB,MAAoB;;IAApB,uBAAA,EAAA,oBAAoB;IAEpB,IAAM,sBAAsB,GAC1B,MAAA,OAAO,CAAC,kBAAkB,0CAAE,sBAAsB,CAAC;IAErD,uNAAuN;IACvN,0HAA0H;IAC1H,OAAO;QACL;YACE,wFAAwF;YACxF,GAAG,EAAE,sBAAsB;gBACzB,CAAC,CAAC,wBAAwB;gBAC1B,CAAC,CAAC,IAAA,iBAAO,EAAC,OAAO,CAAC,GAAG,CAAC,GAAG,eAAe,EAAE,+LAA+L;YAC3O,MAAM,QAAA;YACN,KAAK,2BACA,CAAC,sBAAsB;gBACxB,CAAC,CAAC,IAAA,aAAI;oBACF,cAAc;0BACX,CAAC,MAAA,MAAA,OAAO,CAAC,kBAAkB,0CAAE,UAAU,CAAC,GAAG,CAAC,UAAC,CAAC;oBAC/C,OAAA,IAAA,WAAI,EAAC,CAAC,CAAC,QAAQ,EAAE,cAAc,CAAC;gBAAhC,CAAgC,CACjC,mCAAI,EAAE,CAAC,UACR;gBACJ,CAAC,CAAC,CAAC,IAAA,WAAI,EAAC,OAAO,CAAC,GAAG,EAAE,cAAc,CAAC,CAAC,CAAC,SACzC;SACF;KACF,CAAC;AACJ,CAAC,CAAC;AA5BW,QAAA,mBAAmB,uBA4B9B;AACK,IAAM,YAAY,GAAG,UAC1B,OAAqB,EACrB,MAAoB;IAApB,uBAAA,EAAA,oBAAoB;IAEpB,8CACK,IAAA,oBAAY,EAAC,OAAO,EAAE,MAAM,CAAC,kBAC7B,IAAA,2BAAmB,EAAC,OAAO,EAAE,MAAM,CAAC,UACvC;AACJ,CAAC,CAAC;AARW,QAAA,YAAY,gBAQvB;AAEK,IAAM,YAAY,GAAG,UAAC,OAAyB,IAAuB,OAAA;IAC3E;QACE,GAAG,EAAE,OAAO,CAAC,aAAa,GAAG,aAAa;QAC1C,MAAM,EAAE,WAAW;QACnB,KAAK,EAAE,CAAC,OAAO,CAAC,eAAe,CAAC,GAAG,GAAG,eAAe,CAAC;KACvD;CACF,EAN4E,CAM5E,CAAC;AANW,QAAA,YAAY,gBAMvB"}
+{"version":3,"file":"cache.js","sourceRoot":"","sources":["../../../../../../pipeline/src/build/node/cache.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,6BAA4B;AAC5B,oDAA8B;AAG9B,iCAA8B;AAEvB,IAAM,YAAY,GAAG,UAC1B,OAAqB,EACrB,MAAoB;;IAApB,uBAAA,EAAA,oBAAoB;IAEpB,IAAM,sBAAsB,GAC1B,MAAA,OAAO,CAAC,kBAAkB,0CAAE,sBAAsB,CAAC;IACrD,OAAO;QACL,sBAAsB;YACpB,CAAC,CAAC;gBACE,GAAG,EAAE,MAAM;gBACX,MAAM,QAAA;gBACN,KAAK,EAAE,CAAC,OAAO,CAAC;aACjB;YACH,CAAC,CAAC;gBACE,GAAG,EAAE,IAAA,iBAAO,EAAC,OAAO,CAAC,GAAG,CAAC,GAAG,OAAO;gBACnC,MAAM,QAAA;gBACN,KAAK,EAAE,CAAC,IAAA,WAAI,EAAC,OAAO,CAAC,GAAG,EAAE,OAAO,CAAC,CAAC;aACpC;KACN,CAAC;AACJ,CAAC,CAAC;AAnBW,QAAA,YAAY,gBAmBvB;AAEK,IAAM,mBAAmB,GAAG,UACjC,OAAqB,EACrB,MAAoB;;IAApB,uBAAA,EAAA,oBAAoB;IAEpB,IAAM,sBAAsB,GAC1B,MAAA,OAAO,CAAC,kBAAkB,0CAAE,sBAAsB,CAAC;IAErD,uNAAuN;IACvN,0HAA0H;IAC1H,OAAO;QACL;YACE,wFAAwF;YACxF,GAAG,EAAE,sBAAsB;gBACzB,CAAC,CAAC,wBAAwB;gBAC1B,CAAC,CAAC,IAAA,iBAAO,EAAC,OAAO,CAAC,GAAG,CAAC,GAAG,eAAe,EAAE,+LAA+L;YAC3O,MAAM,QAAA;YACN,KAAK,2BACA,CAAC,sBAAsB;gBACxB,CAAC,CAAC,IAAA,aAAI;oBACF,cAAc;0BACX,CAAC,MAAA,MAAA,OAAO,CAAC,kBAAkB,0CAAE,UAAU,CAAC,GAAG,CAAC,UAAC,CAAC;oBAC/C,OAAA,IAAA,WAAI,EAAC,CAAC,CAAC,QAAQ,EAAE,cAAc,CAAC;gBAAhC,CAAgC,CACjC,mCAAI,EAAE,CAAC,UACR;gBACJ,CAAC,CAAC,CAAC,IAAA,WAAI,EAAC,OAAO,CAAC,GAAG,EAAE,cAAc,CAAC,CAAC,CAAC,SACzC;SACF;KACF,CAAC;AACJ,CAAC,CAAC;AA5BW,QAAA,mBAAmB,uBA4B9B;AACK,IAAM,YAAY,GAAG,UAC1B,OAAqB,EACrB,MAAoB;IAApB,uBAAA,EAAA,oBAAoB;IAEpB,8CACK,IAAA,oBAAY,EAAC,OAAO,EAAE,MAAM,CAAC,kBAC7B,IAAA,2BAAmB,EAAC,OAAO,EAAE,MAAM,CAAC,UACvC;AACJ,CAAC,CAAC;AARW,QAAA,YAAY,gBAQvB;AAEK,IAAM,YAAY,GAAG,UAAC,OAAyB,IAAuB,OAAA;IAC3E;QACE,GAAG,EAAE,OAAO,CAAC,aAAa,GAAG,aAAa;QAC1C,MAAM,EAAE,WAAW;QACnB,KAAK,EAAE,CAAC,OAAO,CAAC,KAAK,CAAC,GAAG,GAAG,eAAe,CAAC;KAC7C;CACF,EAN4E,CAM5E,CAAC;AANW,QAAA,YAAY,gBAMvB"}

package/dist/pipeline/src/build/node/meteor.js

@@ -38,23 +38,23 @@ var getMeteorCache = function (context) { return [
         key: context.componentName + "meteor-build-cache",
         policy: "pull-push",
         paths: [
-            (0, path_1.join)(context.componentConfig.dir, ".meteor/local/resolver-result-cache.json"),
-            (0, path_1.join)(context.componentConfig.dir, ".meteor/local/plugin-cache"),
-            (0, path_1.join)(context.componentConfig.dir, ".meteor/local/isopacks"),
-            (0, path_1.join)(context.componentConfig.dir, ".meteor/local/bundler-cache/scanner"),
+            (0, path_1.join)(context.build.dir, ".meteor/local/resolver-result-cache.json"),
+            (0, path_1.join)(context.build.dir, ".meteor/local/plugin-cache"),
+            (0, path_1.join)(context.build.dir, ".meteor/local/isopacks"),
+            (0, path_1.join)(context.build.dir, ".meteor/local/bundler-cache/scanner"),
         ],
     },
 ]; };
 var createMeteorBuildJobs = function (context) {
-    var buildConfig = context.componentConfig.build;
+    var buildConfig = context.build.config;
     if (!(0, types_1.isOfBuildType)(buildConfig, "meteor")) {
         throw new Error("deploy config is not meteor");
     }
-    var yarnInstall = (0, yarn_1.getYarnInstall)(context.buildContext);
+    var yarnInstall = (0, yarn_1.getYarnInstall)(context.build);
     return (0, base_1.createBuildJobs)(context, {
         appBuild: buildConfig.buildCommand !== null
             ? {
-                cache: __spreadArray(__spreadArray([], __read((0, cache_1.getNodeCache)(context.buildContext)), false), __read(getMeteorCache(context)), false),
+                cache: __spreadArray(__spreadArray([], __read((0, cache_1.getNodeCache)(context.build)), false), __read(getMeteorCache(context)), false),
                 image: (0, runner_1.getRunnerImage)("jobs-meteor"),
                 variables: {
                     METEOR_DISABLE_OPTIMISTIC_CACHING: "1", // see https://forums.meteor.com/t/veeery-long-building-time-inside-docker-container/58673/17?u=macrozone
@@ -68,14 +68,14 @@ var createMeteorBuildJobs = function (context) {
                 ], false),
                 artifacts: {
                     paths: [
-                        context.componentConfig.dir + "/__build_info.json",
-                        context.componentConfig.dir + "/dist",
+                        context.build.dir + "/__build_info.json",
+                        context.build.dir + "/dist",
                     ],
                 },
             }
             : undefined,
         dockerBuild: {
-            script: (0, docker_1.getDockerBuildDefaultScript)(context, "ensureMeteorDockerfile"),
+            script: (0, docker_1.getDockerBuildScriptWithBuiltInDockerFile)(context, "meteor"),
             variables: {
                 METEOR_INSTALL_SCRIPTS: buildConfig.installScripts ? "true" : "",
             },