@nx/docker 0.0.0-pr-32120-8333cfc → 0.0.0-pr-32149-2d2cbf3

package/index.d.ts

@@ -1,3 +1,2 @@
 export { createNodesV2, DockerPluginOptions } from './src/plugins/plugin';
-export { initGenerator } from './src/generators/init/init';
 //# sourceMappingURL=index.d.ts.map

package/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../packages/docker/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,mBAAmB,EAAE,MAAM,sBAAsB,CAAC;AAC1E,OAAO,EAAE,aAAa,EAAE,MAAM,4BAA4B,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../packages/docker/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,mBAAmB,EAAE,MAAM,sBAAsB,CAAC"}

package/index.js

@@ -1,7 +1,5 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.initGenerator = exports.createNodesV2 = void 0;
+exports.createNodesV2 = void 0;
 var plugin_1 = require("./src/plugins/plugin");
 Object.defineProperty(exports, "createNodesV2", { enumerable: true, get: function () { return plugin_1.createNodesV2; } });
-var init_1 = require("./src/generators/init/init");
-Object.defineProperty(exports, "initGenerator", { enumerable: true, get: function () { return init_1.initGenerator; } });

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-32120-8333cfc",
+  "version": "0.0.0-pr-32149-2d2cbf3",
   "type": "commonjs",
   "publishConfig": {
     "access": "public"
@@ -43,12 +43,12 @@
   "executors": "./executors.json",
   "generators": "./generators.json",
   "dependencies": {
-    "@nx/devkit": "0.0.0-pr-32120-8333cfc",
+    "@nx/devkit": "0.0.0-pr-32149-2d2cbf3",
     "enquirer": "~2.3.6",
     "tslib": "^2.3.0"
   },
   "devDependencies": {
-    "nx": "0.0.0-pr-32120-8333cfc"
+    "nx": "0.0.0-pr-32149-2d2cbf3"
   },
   "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;;GAiBzB"}
+{"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"}

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 = normalizeOptions(projectConfig, schema);
+    const options = await normalizeOptions(projectConfig, schema);
     if (!options.dryRun) {
-        const digest = dockerPush(options.imageReference, options.quiet);
-        devkit_1.logger.log(`Successfully pushed ${options.imageReference}. Digest: ${digest}`);
+        const digest = await dockerPush(options.imageReference, options.quiet);
+        devkit_1.logger.log(`Successfully pushed ${options.imageReference}. ${options.quiet && `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,
     };
 }
-function normalizeOptions(projectConfig, schema) {
+async function normalizeOptions(projectConfig, schema) {
     return {
         quiet: schema.quiet ?? false,
-        imageReference: findImageReference(projectConfig, schema),
+        imageReference: await findImageReference(projectConfig, schema),
         dryRun: process.env.NX_DRY_RUN === 'true' || schema.dryRun || false,
     };
 }
-function findImageReference(projectConfig, schema) {
+async function findImageReference(projectConfig, schema) {
     let imageRef = readVersionFromFile(projectConfig.data.root);
     if (imageRef) {
-        if (checkDockerImageExistsLocally(imageRef)) {
+        if (await checkDockerImageExistsLocally(imageRef)) {
             return imageRef;
         }
         throw new Error(`Could not find Docker Image ${imageRef}. Did you run 'nx release version'?`);
@@ -45,21 +45,47 @@ function readVersionFromFile(projectRoot) {
     const version = (0, fs_1.readFileSync)(versionFilePath, { encoding: 'utf8' });
     return version.trim();
 }
-function checkDockerImageExistsLocally(imageRef) {
+async function checkDockerImageExistsLocally(imageRef) {
     try {
-        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;
+        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);
+            });
+        });
     }
     catch {
         return false;
     }
 }
-function dockerPush(imageReference, quiet) {
+async function dockerPush(imageReference, quiet) {
     try {
-        const result = (0, child_process_1.execSync)(`docker push ${imageReference}${quiet ? ' --quiet' : ''}`, {
-            encoding: 'utf8',
+        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());
+            });
         });
-        return result.trim();
     }
     catch (e) {
         devkit_1.logger.error(`Failed to push ${imageReference}`);

package/src/generators/init/schema.d.ts

@@ -4,4 +4,5 @@ export interface InitGeneratorSchema {
   updatePackageScripts?: boolean;
   skipFormat?: boolean;
   skipPackageJson?: boolean;
+  addPlugin?: boolean;
 }

package/src/generators/init/schema.json

@@ -30,6 +30,11 @@
       "description": "Do not add dependencies to `package.json`.",
       "type": "boolean",
       "default": false
+    },
+    "addPlugin": {
+      "type": "boolean",
+      "description": "Add the plugin to the nx.json file.",
+      "default": true
     }
   },
   "required": []