@onivoro/onix 20.0.21 → 20.0.23
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
package/package.json
CHANGED
|
@@ -6,19 +6,24 @@ const child_process_1 = require("child_process");
|
|
|
6
6
|
const push_image_to_ecr_wrapped_function_1 = require("../../functions/push-image-to-ecr-wrapped.function");
|
|
7
7
|
const extract_project_build_outputs_function_1 = require("../../functions/extract-project-build-outputs.function");
|
|
8
8
|
const extract_project_build_assets_function_1 = require("../../functions/extract-project-build-assets.function");
|
|
9
|
+
const fs_1 = require("fs");
|
|
9
10
|
const stdio = 'inherit';
|
|
10
11
|
const executor = (options, context) => tslib_1.__awaiter(void 0, void 0, void 0, function* () {
|
|
11
12
|
const { ecr, profile, dockerfile, ui } = options;
|
|
13
|
+
const copiedAssets = [];
|
|
12
14
|
try {
|
|
13
15
|
const [apiProjectAssetPath] = (0, extract_project_build_assets_function_1.extractProjectBuildAssets)(context, context.projectName);
|
|
14
|
-
(0, child_process_1.execSync)(`npx nx build ${context.projectName}`, { stdio });
|
|
15
16
|
if (ui) {
|
|
16
17
|
if (apiProjectAssetPath) {
|
|
17
18
|
const webProjectOutputs = (0, extract_project_build_outputs_function_1.extractProjectBuildOutputs)(context, ui);
|
|
18
19
|
if (webProjectOutputs === null || webProjectOutputs === void 0 ? void 0 : webProjectOutputs.length) {
|
|
19
20
|
(0, child_process_1.execSync)(`npx nx build ${ui}`, { stdio });
|
|
20
|
-
webProjectOutputs.forEach(
|
|
21
|
-
(0,
|
|
21
|
+
webProjectOutputs.forEach(output => {
|
|
22
|
+
const files = (0, fs_1.readdirSync)(output);
|
|
23
|
+
files.forEach(file => {
|
|
24
|
+
(0, fs_1.copyFileSync)(file, apiProjectAssetPath);
|
|
25
|
+
copiedAssets.push(file);
|
|
26
|
+
});
|
|
22
27
|
});
|
|
23
28
|
}
|
|
24
29
|
else {
|
|
@@ -29,6 +34,7 @@ const executor = (options, context) => tslib_1.__awaiter(void 0, void 0, void 0,
|
|
|
29
34
|
devkit_1.logger.warn(`unable to locate target "build" asset path (expecting targets.build.options.assets -> ["things/and/stuff"]) within project configuration for project "${context.projectName}"`);
|
|
30
35
|
}
|
|
31
36
|
}
|
|
37
|
+
(0, child_process_1.execSync)(`npx nx build ${context.projectName}`, { stdio });
|
|
32
38
|
const [projectOutput] = (0, extract_project_build_outputs_function_1.extractProjectBuildOutputs)(context, context.projectName);
|
|
33
39
|
devkit_1.logger.warn({ projectOutput });
|
|
34
40
|
const dockerCommand = `docker build --build-arg="APP_DIST=${projectOutput}" -f ${dockerfile} -t ${ecr} .`;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"executor.js","sourceRoot":"","sources":["../../../../../onix/src/executors/deploy/executor.ts"],"names":[],"mappings":";;;AAAA,uCAAsE;AAEtE,iDAAyC;AACzC,2GAA2F;AAC3F,mHAAoG;AACpG,iHAAkG;
|
|
1
|
+
{"version":3,"file":"executor.js","sourceRoot":"","sources":["../../../../../onix/src/executors/deploy/executor.ts"],"names":[],"mappings":"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"}
|
|
@@ -28,12 +28,7 @@ function pushImageToECR(_a) {
|
|
|
28
28
|
`-u ${username} ` +
|
|
29
29
|
`-p ${password} ` +
|
|
30
30
|
registryEndpoint, { stdio: 'inherit' });
|
|
31
|
-
|
|
32
|
-
const remoteImage = `${registryEndpoint.replace('https://', '')}/${ecr}`;
|
|
33
|
-
(0, child_process_1.execSync)(`docker tag ${ecr} ${remoteImage}`, { stdio: 'inherit' });
|
|
34
|
-
// execSync(`docker tag ${repositoryName}:${imageTag} ${remoteImage}`, { stdio: 'inherit' });
|
|
35
|
-
// Push image
|
|
36
|
-
(0, child_process_1.execSync)(`docker push ${remoteImage}`, { stdio: 'inherit' });
|
|
31
|
+
(0, child_process_1.execSync)(`docker push ${ecr}`, { stdio: 'inherit' });
|
|
37
32
|
console.log('Successfully pushed image to ECR');
|
|
38
33
|
}
|
|
39
34
|
catch (error) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"push-image-to-ecr.function.js","sourceRoot":"","sources":["../../../../onix/src/functions/push-image-to-ecr.function.ts"],"names":[],"mappings":";;AAWA,
|
|
1
|
+
{"version":3,"file":"push-image-to-ecr.function.js","sourceRoot":"","sources":["../../../../onix/src/functions/push-image-to-ecr.function.ts"],"names":[],"mappings":";;AAWA,wCA4CC;;AAvDD,oDAA+F;AAC/F,wEAAwD;AACxD,iDAAyC;AASzC,SAAsB,cAAc;iEAAC,EACnC,MAAM,EACN,GAAG,EACH,UAAU,EACV,OAAO,EACS;;QAChB,IAAI,CAAC;YACH,MAAM,MAAM,GAAoB,EAAE,MAAM,EAAE,WAAW,EAAE,OAAO,CAAC,CAAC,CAAC,IAAA,8BAAO,EAAC,EAAE,OAAO,EAAE,CAAC,CAAC,CAAC,CAAC,SAAS,EAAE,CAAC;YACpG,MAAM,SAAS,GAAG,IAAI,sBAAS,CAAC,MAAM,CAAC,CAAC;YAExC,MAAM,WAAW,GAAG,IAAI,yCAA4B,CAAC;gBACnD,WAAW,EAAE,UAAU,CAAC,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,SAAS;aACnD,CAAC,CAAC;YACH,MAAM,YAAY,GAAG,MAAM,SAAS,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;YAEvD,IAAI,CAAC,CAAA,MAAA,MAAA,YAAY,CAAC,iBAAiB,0CAAG,CAAC,CAAC,0CAAE,kBAAkB,CAAA,EAAE,CAAC;gBAC7D,MAAM,IAAI,KAAK,CAAC,mCAAmC,CAAC,CAAC;YACvD,CAAC;YAED,MAAM,SAAS,GAAG,MAAM,CAAC,IAAI,CAC3B,YAAY,CAAC,iBAAiB,CAAC,CAAC,CAAC,CAAC,kBAAkB,EACpD,QAAQ,CACT,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC;YACpB,MAAM,CAAC,QAAQ,EAAE,QAAQ,CAAC,GAAG,SAAS,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;YAElD,MAAM,gBAAgB,GAAG,YAAY,CAAC,iBAAiB,CAAC,CAAC,CAAC,CAAC,aAAa,CAAC;YACzE,IAAI,CAAC,gBAAgB,EAAE,CAAC;gBACtB,MAAM,IAAI,KAAK,CAAC,iCAAiC,CAAC,CAAC;YACrD,CAAC;YAED,IAAA,wBAAQ,EAAC,eAAe;gBACtB,MAAM,QAAQ,GAAG;gBACjB,MAAM,QAAQ,GAAG;gBACjB,gBAAgB,EAChB,EAAE,KAAK,EAAE,SAAS,EAAE,CACrB,CAAC;YAEF,IAAA,wBAAQ,EAAC,eAAe,GAAG,EAAE,EAAE,EAAE,KAAK,EAAE,SAAS,EAAE,CAAC,CAAC;YAErD,OAAO,CAAC,GAAG,CAAC,kCAAkC,CAAC,CAAC;QAClD,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,OAAO,CAAC,KAAK,CAAC,6BAA6B,EAAE,KAAK,CAAC,CAAC;YACpD,MAAM,KAAK,CAAC;QACd,CAAC;IACH,CAAC;CAAA"}
|