@nx/docker 0.0.0-pr-32149-2d2cbf3 → 0.0.0-pr-32117-d66fe0d

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@nx/docker",
   "description": "The Nx Plugin for Docker to aid in containerizing projects.",
-  "version": "0.0.0-pr-32149-2d2cbf3",
+  "version": "0.0.0-pr-32117-d66fe0d",
   "type": "commonjs",
   "publishConfig": {
     "access": "public"
@@ -43,12 +43,12 @@
   "executors": "./executors.json",
   "generators": "./generators.json",
   "dependencies": {
-    "@nx/devkit": "0.0.0-pr-32149-2d2cbf3",
+    "@nx/devkit": "0.0.0-pr-32117-d66fe0d",
     "enquirer": "~2.3.6",
     "tslib": "^2.3.0"
   },
   "devDependencies": {
-    "nx": "0.0.0-pr-32149-2d2cbf3"
+    "nx": "0.0.0-pr-32117-d66fe0d"
   },
   "types": "./src/index.d.ts"
 }

package/src/executors/release-publish/release-publish.impl.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"release-publish.impl.d.ts","sourceRoot":"","sources":["../../../../../../packages/docker/src/executors/release-publish/release-publish.impl.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,KAAK,eAAe,EAIrB,MAAM,YAAY,CAAC;AAEpB,OAAO,KAAK,EAAE,0BAA0B,EAAE,MAAM,UAAU,CAAC;AAI3D,MAAM,WAAW,oCAAoC;IACnD,KAAK,EAAE,OAAO,CAAC;IACf,cAAc,EAAE,MAAM,CAAC;IACvB,MAAM,EAAE,OAAO,CAAC;CACjB;AAED,eAAO,MAAM,YAAY,QAAiB,CAAC;AAE3C,wBAA8B,oBAAoB,CAChD,MAAM,EAAE,0BAA0B,EAClC,OAAO,EAAE,eAAe;;GAmBzB"}
+{"version":3,"file":"release-publish.impl.d.ts","sourceRoot":"","sources":["../../../../../../packages/docker/src/executors/release-publish/release-publish.impl.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,KAAK,eAAe,EAIrB,MAAM,YAAY,CAAC;AAEpB,OAAO,KAAK,EAAE,0BAA0B,EAAE,MAAM,UAAU,CAAC;AAI3D,MAAM,WAAW,oCAAoC;IACnD,KAAK,EAAE,OAAO,CAAC;IACf,cAAc,EAAE,MAAM,CAAC;IACvB,MAAM,EAAE,OAAO,CAAC;CACjB;AAED,eAAO,MAAM,YAAY,QAAiB,CAAC;AAE3C,wBAA8B,oBAAoB,CAChD,MAAM,EAAE,0BAA0B,EAClC,OAAO,EAAE,eAAe;;GAiBzB"}

package/src/executors/release-publish/release-publish.impl.js

@@ -9,10 +9,10 @@ const version_utils_1 = require("../../release/version-utils");
 exports.LARGE_BUFFER = 1024 * 1000000;
 async function dockerReleasePublish(schema, context) {
     const projectConfig = context.projectGraph.nodes[context.projectName];
-    const options = await normalizeOptions(projectConfig, schema);
+    const options = normalizeOptions(projectConfig, schema);
     if (!options.dryRun) {
-        const digest = await dockerPush(options.imageReference, options.quiet);
-        devkit_1.logger.log(`Successfully pushed ${options.imageReference}. ${options.quiet && `Digest: ${digest}`}`);
+        const digest = dockerPush(options.imageReference, options.quiet);
+        devkit_1.logger.log(`Successfully pushed ${options.imageReference}. Digest: ${digest}`);
     }
     else {
         devkit_1.logger.log(`Docker Image ${options.imageReference} was not pushed as --dry-run is enabled.`);
@@ -21,17 +21,17 @@ async function dockerReleasePublish(schema, context) {
         success: true,
     };
 }
-async function normalizeOptions(projectConfig, schema) {
+function normalizeOptions(projectConfig, schema) {
     return {
         quiet: schema.quiet ?? false,
-        imageReference: await findImageReference(projectConfig, schema),
+        imageReference: findImageReference(projectConfig, schema),
         dryRun: process.env.NX_DRY_RUN === 'true' || schema.dryRun || false,
     };
 }
-async function findImageReference(projectConfig, schema) {
+function findImageReference(projectConfig, schema) {
     let imageRef = readVersionFromFile(projectConfig.data.root);
     if (imageRef) {
-        if (await checkDockerImageExistsLocally(imageRef)) {
+        if (checkDockerImageExistsLocally(imageRef)) {
             return imageRef;
         }
         throw new Error(`Could not find Docker Image ${imageRef}. Did you run 'nx release version'?`);
@@ -45,47 +45,21 @@ function readVersionFromFile(projectRoot) {
     const version = (0, fs_1.readFileSync)(versionFilePath, { encoding: 'utf8' });
     return version.trim();
 }
-async function checkDockerImageExistsLocally(imageRef) {
+function checkDockerImageExistsLocally(imageRef) {
     try {
-        return await new Promise((res) => {
-            const childProcess = (0, child_process_1.exec)(`docker images --filter "reference=${imageRef}" --quiet`, { encoding: 'utf8' });
-            let result = '';
-            childProcess.stdout?.on('data', (data) => {
-                result += data;
-            });
-            childProcess.stderr?.on('data', (data) => {
-                console.error(data);
-            });
-            childProcess.on('exit', () => {
-                res(result.trim().length > 0);
-            });
-        });
+        const result = (0, child_process_1.execSync)(`docker images --filter "reference=${imageRef}" --quiet`, { encoding: 'utf8', stdio: 'inherit', maxBuffer: exports.LARGE_BUFFER });
+        return result.trim().length > 0;
     }
     catch {
         return false;
     }
 }
-async function dockerPush(imageReference, quiet) {
+function dockerPush(imageReference, quiet) {
     try {
-        return await new Promise((res) => {
-            const childProcess = (0, child_process_1.exec)(`docker push ${imageReference}${quiet ? ' --quiet' : ''}`, {
-                encoding: 'utf8',
-                maxBuffer: exports.LARGE_BUFFER,
-            });
-            let result = '';
-            childProcess.stdout?.on('data', (data) => {
-                result += data;
-                if (!quiet) {
-                    console.log(data);
-                }
-            });
-            childProcess.stderr?.on('data', (data) => {
-                console.error(data);
-            });
-            childProcess.on('exit', () => {
-                res(result.trim());
-            });
+        const result = (0, child_process_1.execSync)(`docker push ${imageReference}${quiet ? ' --quiet' : ''}`, {
+            encoding: 'utf8',
         });
+        return result.trim();
     }
     catch (e) {
         devkit_1.logger.error(`Failed to push ${imageReference}`);