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

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

@@ -9,6 +9,13 @@ const fs_1 = require("fs");
 const version_utils_1 = require("../../release/version-utils");
 exports.LARGE_BUFFER = 1024 * 1000000;
 async function dockerReleasePublish(schema, context) {
+    const projectVersionData = schema.nxReleaseVersionData?.[context.projectName];
+    if (projectVersionData?.dockerVersion === null) {
+        console.warn(`Skipped Docker image for project "${context.projectName}", because no new Docker version was resolved for this project.`);
+        return {
+            success: true,
+        };
+    }
     const projectConfig = context.projectGraph.nodes[context.projectName];
     const options = await normalizeOptions(projectConfig, schema);
     if (!options.dryRun) {
@@ -53,7 +60,9 @@ async function checkDockerImageExistsLocally(imageRef) {
             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', windowsHide: true });
+            // Pass args as an array (no shell) so the reference read back from the
+            // .docker-version file can't break out into command injection.
+            const childProcess = (0, child_process_1.execFile)('docker', ['images', '--filter', `reference=${normalizedImageRef}`, '--quiet'], { encoding: 'utf8', windowsHide: true });
             let result = '';
             childProcess.stdout?.on('data', (data) => {
                 result += data;
@@ -77,7 +86,7 @@ async function checkDockerImageExistsLocally(imageRef) {
 async function dockerPush(imageReference, quiet) {
     try {
         return await new Promise((res, rej) => {
-            const childProcess = (0, child_process_1.exec)(`docker push ${imageReference}${quiet ? ' --quiet' : ''}`, {
+            const childProcess = (0, child_process_1.execFile)('docker', ['push', imageReference, ...(quiet ? ['--quiet'] : [])], {
                 encoding: 'utf8',
                 maxBuffer: exports.LARGE_BUFFER,
                 windowsHide: true,

package/dist/src/executors/release-publish/schema.d.ts

@@ -1,4 +1,13 @@
 export interface DockerReleasePublishSchema {
   dryRun?: boolean;
   quiet?: boolean;
+  nxReleaseVersionData?: Record<
+    string,
+    {
+      currentVersion: string | null;
+      newVersion: string | null;
+      dockerVersion: string | null;
+      [key: string]: any;
+    }
+  >;
 }

package/dist/src/plugins/plugin.js

@@ -4,18 +4,16 @@ exports.createNodesV2 = exports.createNodes = void 0;
 exports.getProjectNameFromPath = getProjectNameFromPath;
 const internal_1 = require("@nx/devkit/internal");
 const devkit_1 = require("@nx/devkit");
-const file_hasher_1 = require("nx/src/hasher/file-hasher");
-const cache_directory_1 = require("nx/src/utils/cache-directory");
 const fs_1 = require("fs");
 const path_1 = require("path");
-const git_utils_1 = require("nx/src/utils/git-utils");
+const internal_2 = require("@nx/devkit/internal");
 const interpolate_pattern_1 = require("../utils/interpolate-pattern");
 const dockerfileGlob = '**/Dockerfile';
 exports.createNodes = [
     dockerfileGlob,
     async (configFilePaths, options, context) => {
-        const optionsHash = (0, file_hasher_1.hashObject)(options);
-        const cachePath = (0, path_1.join)(cache_directory_1.workspaceDataDirectory, `docker-${optionsHash}.hash`);
+        const optionsHash = (0, internal_1.hashObject)(options);
+        const cachePath = (0, path_1.join)(internal_2.workspaceDataDirectory, `docker-${optionsHash}.hash`);
         const targetsCache = new internal_1.PluginCache(cachePath);
         const projectRoots = configFilePaths.map((c) => (0, path_1.dirname)(c));
         const normalizedOptions = normalizePluginOptions(options);
@@ -50,7 +48,7 @@ async function createNodesInternal(configFilePath, hash, normalizedOptions, cont
     };
 }
 function interpolateDockerTargetOptions(options, projectRoot, imageRef, context) {
-    const commitSha = (0, git_utils_1.getLatestCommitSha)();
+    const commitSha = (0, internal_2.getLatestCommitSha)();
     const projectName = getProjectName(projectRoot, context.workspaceRoot);
     const tokens = {
         projectRoot,

package/dist/src/release/version-pattern-utils.js

@@ -1,10 +1,10 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.interpolateVersionPattern = interpolateVersionPattern;
-const git_utils_1 = require("nx/src/utils/git-utils");
+const internal_1 = require("@nx/devkit/internal");
 const interpolate_pattern_1 = require("../utils/interpolate-pattern");
 function interpolateVersionPattern(versionPattern, data) {
-    const commitSha = (0, git_utils_1.getLatestCommitSha)();
+    const commitSha = (0, internal_1.getLatestCommitSha)();
     const substitutions = {
         projectName: data.projectName ?? '',
         currentDate: data.currentDate ?? new Date(),

package/dist/src/release/version-utils.d.ts

@@ -1,7 +1,7 @@
 import { ProjectGraphProjectNode } from '@nx/devkit';
-import type { FinalConfigForProject } from 'nx/src/command-line/release/utils/release-graph';
+import { type FinalConfigForProject } from '@nx/devkit/internal';
 export declare const getDockerVersionPath: (workspaceRoot: string, projectRoot: string) => string;
-export declare function handleDockerVersion(workspaceRoot: string, projectGraphNode: ProjectGraphProjectNode, finalConfigForProject: FinalConfigForProject, dockerVersionScheme?: string, dockerVersion?: string, versionActionsVersion?: string): Promise<{
+export declare function handleDockerVersion(workspaceRoot: string, projectGraphNode: ProjectGraphProjectNode, finalConfigForProject: FinalConfigForProject, dockerVersionScheme?: string, dockerVersion?: string, versionActionsVersion?: string | null): Promise<{
     newVersion: string;
     logs: string[];
 }>;

package/dist/src/release/version-utils.js

@@ -33,6 +33,15 @@ async function handleDockerVersion(workspaceRoot, projectGraphNode, finalConfigF
                 : Object.keys(availableVersionSchemes).length === 1
                     ? Object.keys(availableVersionSchemes)[0]
                     : await promptForNewVersion(availableVersionSchemes, projectGraphNode.name);
+            if (availableVersionSchemes[versionScheme].includes('{versionActionsVersion}') &&
+                versionActionsVersion == null) {
+                return {
+                    newVersion: null,
+                    logs: [
+                        `Skipped ${projectGraphNode.name}, because no new version was resolved for this project.`,
+                    ],
+                };
+            }
             newVersion = calculateNewVersion(projectGraphNode.name, versionScheme, availableVersionSchemes, versionActionsVersion);
         }
     }
@@ -80,7 +89,9 @@ function updateProjectVersion(newVersion, nxDockerImageRefEnvOverride, workspace
     const newImageRef = getImageReference(projectRoot, repositoryName, registry);
     const fullImageRef = nxDockerImageRefEnvOverride ?? `${newImageRef}:${newVersion}`;
     if (!isDryRun) {
-        (0, child_process_1.execSync)(`docker tag ${imageRef} ${fullImageRef}`, {
+        // argv array, not a shell string - the image ref is assembled from workspace
+        // config, CLI flags and env, so it can't be trusted as shell input.
+        (0, child_process_1.execFileSync)('docker', ['tag', imageRef, fullImageRef], {
             windowsHide: true,
         });
     }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@nx/docker",
   "description": "The Nx Plugin for Docker to aid in containerizing projects.",
-  "version": "23.2.0-beta.3",
+  "version": "23.2.0-beta.5",
   "type": "commonjs",
   "files": [
     "dist",
@@ -87,9 +87,9 @@
   "dependencies": {
     "enquirer": "~2.3.6",
     "tslib": "^2.3.0",
-    "@nx/devkit": "23.2.0-beta.3"
+    "@nx/devkit": "23.2.0-beta.5"
   },
   "devDependencies": {
-    "nx": "23.2.0-beta.3"
+    "nx": "23.2.0-beta.5"
   }
 }