@nx/docker 21.4.0-beta.3 → 21.4.0-beta.5

package/generators.d.ts

@@ -0,0 +1,2 @@
+export * from './src/generators/init/init';
+//# sourceMappingURL=generators.d.ts.map

package/generators.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"generators.d.ts","sourceRoot":"","sources":["../../../packages/docker/generators.ts"],"names":[],"mappings":"AAAA,cAAc,4BAA4B,CAAC"}

package/generators.js

@@ -0,0 +1,4 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const tslib_1 = require("tslib");
+tslib_1.__exportStar(require("./src/generators/init/init"), exports);

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@nx/docker",
   "description": "The Nx Plugin for Docker to aid in containerizing projects.",
-  "version": "21.4.0-beta.3",
+  "version": "21.4.0-beta.5",
   "type": "commonjs",
   "publishConfig": {
     "access": "public"
@@ -32,6 +32,10 @@
       "types": "./src/release/version-utils.d.ts",
       "default": "./src/release/version-utils.js"
     },
+    "./generators": {
+      "types": "./generators.d.ts",
+      "default": "./generators.js"
+    },
     "./package.json": "./package.json",
     "./generators.json": "./generators.json",
     "./executors.json": "./executors.json",
@@ -43,12 +47,12 @@
   "executors": "./executors.json",
   "generators": "./generators.json",
   "dependencies": {
-    "@nx/devkit": "21.4.0-beta.3",
+    "@nx/devkit": "21.4.0-beta.5",
     "enquirer": "~2.3.6",
     "tslib": "^2.3.0"
   },
   "devDependencies": {
-    "nx": "21.4.0-beta.3"
+    "nx": "21.4.0-beta.5"
   },
   "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,63 @@ 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) => {
+            // If the ref starts with 'docker.io/', then we need to strip it since it is the default value and Docker CLI will not find it.
+            const normalizedImageRef = imageRef.startsWith('docker.io/')
+                ? imageRef.split('docker.io/')[1]
+                : imageRef;
+            const childProcess = (0, child_process_1.exec)(`docker images --filter "reference=${normalizedImageRef}" --quiet`, { encoding: 'utf8' });
+            let result = '';
+            childProcess.stdout?.on('data', (data) => {
+                result += data;
+            });
+            childProcess.stderr?.on('data', (data) => {
+                console.error(data);
+            });
+            childProcess.on('error', (error) => {
+                console.error('Docker command failed:', error);
+                res(false);
+            });
+            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, rej) => {
+            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('error', (error) => {
+                rej(error);
+            });
+            childProcess.on('exit', (code) => {
+                if (code === 0) {
+                    res(result.trim());
+                }
+                else {
+                    rej(new Error(`Docker push failed with exit code ${code}`));
+                }
+            });
         });
-        return result.trim();
     }
     catch (e) {
         devkit_1.logger.error(`Failed to push ${imageReference}`);

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

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

package/src/generators/init/schema.json

@@ -30,11 +30,6 @@
       "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": []

package/src/plugins/plugin.js

@@ -51,6 +51,15 @@ async function createDockerTargets(projectRoot, options, context) {
     const imageRef = projectRoot.replace(/^[\\/]/, '').replace(/[\\/\s]+/g, '-');
     const namedInputs = (0, get_named_inputs_1.getNamedInputs)(projectRoot, context);
     const targets = {};
+    const metadata = {
+        targetGroups: {
+            ['Docker']: [
+                `${options.buildTarget}`,
+                `${options.runTarget}`,
+                'nx-release-publish',
+            ],
+        },
+    };
     targets[options.buildTarget] = {
         command: `docker build .`,
         options: {
@@ -103,7 +112,7 @@ async function createDockerTargets(projectRoot, options, context) {
     targets['nx-release-publish'] = {
         executor: '@nx/docker:release-publish',
     };
-    return { targets, metadata: {} };
+    return { targets, metadata };
 }
 function normalizePluginOptions(options) {
     return {