@nx/docker 21.4.0-beta.7 → 21.4.0-beta.9

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.7",
+  "version": "21.4.0-beta.9",
   "type": "commonjs",
   "publishConfig": {
     "access": "public"
@@ -47,12 +47,12 @@
   "executors": "./executors.json",
   "generators": "./generators.json",
   "dependencies": {
-    "@nx/devkit": "21.4.0-beta.7",
+    "@nx/devkit": "21.4.0-beta.9",
     "enquirer": "~2.3.6",
     "tslib": "^2.3.0"
   },
   "devDependencies": {
-    "nx": "21.4.0-beta.7"
+    "nx": "21.4.0-beta.9"
   },
   "types": "./src/index.d.ts"
 }

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

@@ -5,6 +5,7 @@
  * {currentDate|DATE FORMAT} - the current date with custom format such as YYMM.DD
  * {commitSha} - The full commit sha for the current commit
  * {shortCommitSha} - The seven character commit sha for the current commit
+ * {env.VAR_NAME} - The value of the environment variable VAR_NAME
  */
 export interface PatternTokens {
     projectName: string;

package/src/release/version-pattern-utils.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"version-pattern-utils.d.ts","sourceRoot":"","sources":["../../../../../packages/docker/src/release/version-pattern-utils.ts"],"names":[],"mappings":"AAEA;;;;;;;GAOG;AACH,MAAM,WAAW,aAAa;IAC5B,WAAW,EAAE,MAAM,CAAC;IACpB,WAAW,EAAE,IAAI,CAAC;IAClB,SAAS,EAAE,MAAM,CAAC;IAClB,cAAc,EAAE,MAAM,CAAC;CACxB;AAsBD,wBAAgB,yBAAyB,CACvC,cAAc,EAAE,MAAM,EACtB,IAAI,EAAE,OAAO,CAAC,aAAa,CAAC,UA4B7B"}
+{"version":3,"file":"version-pattern-utils.d.ts","sourceRoot":"","sources":["../../../../../packages/docker/src/release/version-pattern-utils.ts"],"names":[],"mappings":"AAEA;;;;;;;;GAQG;AACH,MAAM,WAAW,aAAa;IAC5B,WAAW,EAAE,MAAM,CAAC;IACpB,WAAW,EAAE,IAAI,CAAC;IAClB,SAAS,EAAE,MAAM,CAAC;IAClB,cAAc,EAAE,MAAM,CAAC;CACxB;AAsBD,wBAAgB,yBAAyB,CACvC,cAAc,EAAE,MAAM,EACtB,IAAI,EAAE,OAAO,CAAC,aAAa,CAAC,UAsC7B"}

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

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.interpolateVersionPattern = interpolateVersionPattern;
 const git_utils_1 = require("nx/src/utils/git-utils");
-const tokenRegex = /\{([^|{}]+)(?:\|([^{}]+))?\}/g;
+const tokenRegex = /\{(env\.([^}]+)|([^|{}]+)(?:\|([^{}]+))?)\}/g;
 function formatDate(date, format) {
     const year = String(date.getUTCFullYear());
     const month = String(date.getUTCMonth() + 1).padStart(2, '0');
@@ -27,7 +27,13 @@ function interpolateVersionPattern(versionPattern, data) {
         commitSha: data.commitSha ?? commitSha,
         shortCommitSha: data.shortCommitSha ?? commitSha.slice(0, 7),
     };
-    return versionPattern.replace(tokenRegex, (match, identifier, format) => {
+    return versionPattern.replace(tokenRegex, (match, fullMatch, envVarName, identifier, format) => {
+        // Handle environment variables
+        if (envVarName) {
+            const envValue = process.env[envVarName];
+            return envValue !== undefined ? envValue : match;
+        }
+        // Handle other tokens
         const value = substitutions[identifier];
         if (value === undefined) {
             return match; // Keep original token if no data

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

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

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

@@ -1 +1 @@
-{"version":3,"file":"version-utils.d.ts","sourceRoot":"","sources":["../../../../../packages/docker/src/release/version-utils.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,uBAAuB,EAAE,MAAM,YAAY,CAAC;AAC1D,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,6DAA6D,CAAC;AAQzG,eAAO,MAAM,oBAAoB,GAC/B,eAAe,MAAM,EACrB,aAAa,MAAM,WAGpB,CAAC;AAEF,wBAAsB,mBAAmB,CACvC,aAAa,EAAE,MAAM,EACrB,gBAAgB,EAAE,uBAAuB,EACzC,qBAAqB,EAAE,qBAAqB,EAC5C,mBAAmB,CAAC,EAAE,MAAM;;;GA4B7B"}
+{"version":3,"file":"version-utils.d.ts","sourceRoot":"","sources":["../../../../../packages/docker/src/release/version-utils.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,uBAAuB,EAAE,MAAM,YAAY,CAAC;AAC1D,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,6DAA6D,CAAC;AAQzG,eAAO,MAAM,oBAAoB,GAC/B,eAAe,MAAM,EACrB,aAAa,MAAM,WAGpB,CAAC;AAEF,wBAAsB,mBAAmB,CACvC,aAAa,EAAE,MAAM,EACrB,gBAAgB,EAAE,uBAAuB,EACzC,qBAAqB,EAAE,qBAAqB,EAC5C,mBAAmB,CAAC,EAAE,MAAM,EAC5B,aAAa,CAAC,EAAE,MAAM;;;GAkCvB"}

package/src/release/version-utils.js

@@ -15,13 +15,20 @@ const getDockerVersionPath = (workspaceRoot, projectRoot) => {
     return (0, path_1.join)(workspaceRoot, 'tmp', projectRoot, '.docker-version');
 };
 exports.getDockerVersionPath = getDockerVersionPath;
-async function handleDockerVersion(workspaceRoot, projectGraphNode, finalConfigForProject, dockerVersionScheme) {
-    const availableVersionSchemes = finalConfigForProject.dockerOptions.versionSchemes ??
-        DEFAULT_VERSION_SCHEMES;
-    const versionScheme = dockerVersionScheme && dockerVersionScheme in availableVersionSchemes
-        ? dockerVersionScheme
-        : await promptForNewVersion(availableVersionSchemes, projectGraphNode.name);
-    const newVersion = calculateNewVersion(projectGraphNode.name, versionScheme, availableVersionSchemes);
+async function handleDockerVersion(workspaceRoot, projectGraphNode, finalConfigForProject, dockerVersionScheme, dockerVersion) {
+    // If an explicit dockerVersion is provided, use it directly
+    let newVersion;
+    if (dockerVersion) {
+        newVersion = dockerVersion;
+    }
+    else {
+        const availableVersionSchemes = finalConfigForProject.dockerOptions.versionSchemes ??
+            DEFAULT_VERSION_SCHEMES;
+        const versionScheme = dockerVersionScheme && dockerVersionScheme in availableVersionSchemes
+            ? dockerVersionScheme
+            : await promptForNewVersion(availableVersionSchemes, projectGraphNode.name);
+        newVersion = calculateNewVersion(projectGraphNode.name, versionScheme, availableVersionSchemes);
+    }
     const logs = updateProjectVersion(newVersion, workspaceRoot, projectGraphNode.data.root, finalConfigForProject.dockerOptions.repositoryName, finalConfigForProject.dockerOptions.registryUrl);
     return {
         newVersion,