@nx/docker 22.1.0-rc.3 → 22.1.0-rc.4

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@nx/docker",
   "description": "The Nx Plugin for Docker to aid in containerizing projects.",
-  "version": "22.1.0-rc.3",
+  "version": "22.1.0-rc.4",
   "type": "commonjs",
   "publishConfig": {
     "access": "public"
@@ -51,12 +51,12 @@
   "executors": "./executors.json",
   "generators": "./generators.json",
   "dependencies": {
-    "@nx/devkit": "22.1.0-rc.3",
+    "@nx/devkit": "22.1.0-rc.4",
     "enquirer": "~2.3.6",
     "tslib": "^2.3.0"
   },
   "devDependencies": {
-    "nx": "22.1.0-rc.3"
+    "nx": "22.1.0-rc.4"
   },
   "types": "./src/index.d.ts"
 }

package/src/plugins/plugin.d.ts

@@ -5,6 +5,17 @@ export interface DockerTargetOptions {
     env?: Record<string, string>;
     envFile?: string;
     cwd?: string;
+    /**
+     * Skip adding the default `--tag` argument to the Docker build command.
+     * When set to `true`, you must provide your own tag via the `args` property.
+     *
+     * **Important:** Setting this to `true` opts out of Nx Release support for this project.
+     * The automatic versioning and publishing features of `nx release` will not work
+     * with Docker projects that have `skipDefaultTag` enabled.
+     *
+     * @default false
+     */
+    skipDefaultTag?: boolean;
     configurations?: Record<string, Omit<DockerTargetOptions, 'configurations' | 'name'>>;
 }
 export interface DockerPluginOptions {

package/src/plugins/plugin.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"plugin.d.ts","sourceRoot":"","sources":["../../../../../packages/docker/src/plugins/plugin.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,KAAK,aAAa,EAQnB,MAAM,YAAY,CAAC;AAUpB,MAAM,WAAW,mBAAmB;IAClC,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,CAAC,EAAE,MAAM,EAAE,CAAC;IAChB,GAAG,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAC7B,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,cAAc,CAAC,EAAE,MAAM,CACrB,MAAM,EACN,IAAI,CAAC,mBAAmB,EAAE,gBAAgB,GAAG,MAAM,CAAC,CACrD,CAAC;CACH;AAED,MAAM,WAAW,mBAAmB;IAClC,WAAW,CAAC,EAAE,MAAM,GAAG,mBAAmB,CAAC;IAC3C,SAAS,CAAC,EAAE,MAAM,GAAG,mBAAmB,CAAC;CAC1C;AAsBD,eAAO,MAAM,aAAa,EAAE,aAAa,CAAC,mBAAmB,CAmC5D,CAAC;AAmDF,wBAAgB,sBAAsB,CACpC,WAAW,EAAE,MAAM,EACnB,aAAa,EAAE,MAAM,GACpB,MAAM,CAOR"}
+{"version":3,"file":"plugin.d.ts","sourceRoot":"","sources":["../../../../../packages/docker/src/plugins/plugin.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,KAAK,aAAa,EAQnB,MAAM,YAAY,CAAC;AAUpB,MAAM,WAAW,mBAAmB;IAClC,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,CAAC,EAAE,MAAM,EAAE,CAAC;IAChB,GAAG,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAC7B,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,GAAG,CAAC,EAAE,MAAM,CAAC;IACb;;;;;;;;;OASG;IACH,cAAc,CAAC,EAAE,OAAO,CAAC;IACzB,cAAc,CAAC,EAAE,MAAM,CACrB,MAAM,EACN,IAAI,CAAC,mBAAmB,EAAE,gBAAgB,GAAG,MAAM,CAAC,CACrD,CAAC;CACH;AAED,MAAM,WAAW,mBAAmB;IAClC,WAAW,CAAC,EAAE,MAAM,GAAG,mBAAmB,CAAC;IAC3C,SAAS,CAAC,EAAE,MAAM,GAAG,mBAAmB,CAAC;CAC1C;AAsBD,eAAO,MAAM,aAAa,EAAE,aAAa,CAAC,mBAAmB,CAmC5D,CAAC;AAmDF,wBAAgB,sBAAsB,CACpC,WAAW,EAAE,MAAM,EACnB,aAAa,EAAE,MAAM,GACpB,MAAM,CAOR"}

package/src/plugins/plugin.js

@@ -99,8 +99,13 @@ function buildTargetOptions(interpolatedTarget, projectRoot, imageRef, isRunTarg
         }
     }
     else {
-        // Build target always includes --tag default
-        options.args = [`--tag ${imageRef}`, ...(interpolatedTarget.args ?? [])];
+        // Build target includes --tag default unless skipDefaultTag is true
+        if (interpolatedTarget.skipDefaultTag) {
+            options.args = interpolatedTarget.args ?? [];
+        }
+        else {
+            options.args = [`--tag ${imageRef}`, ...(interpolatedTarget.args ?? [])];
+        }
     }
     if (interpolatedTarget.env) {
         options.env = interpolatedTarget.env;
@@ -117,7 +122,12 @@ function buildTargetConfigurations(interpolatedTarget, projectRoot, imageRef, is
     const configurations = {};
     for (const [configName, configOptions] of Object.entries(interpolatedTarget.configurations)) {
         // Each configuration gets the full treatment with defaults
-        configurations[configName] = buildTargetOptions({ ...configOptions, name: interpolatedTarget.name }, projectRoot, imageRef, isRunTarget);
+        // Inherit skipDefaultTag from parent if not explicitly set in config
+        configurations[configName] = buildTargetOptions({
+            ...configOptions,
+            name: interpolatedTarget.name,
+            skipDefaultTag: configOptions.skipDefaultTag ?? interpolatedTarget.skipDefaultTag,
+        }, projectRoot, imageRef, isRunTarget);
     }
     return configurations;
 }