@nx/docker 21.6.1-beta.0 → 21.6.1-beta.2

package/package.json

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

package/src/plugins/plugin.js

@@ -61,6 +61,7 @@ async function createDockerTargets(projectRoot, options, context) {
         },
     };
     targets[options.buildTarget] = {
+        dependsOn: ['build', '^build'],
         command: `docker build .`,
         options: {
             cwd: projectRoot,

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,EAC5B,aAAa,CAAC,EAAE,MAAM;;;GAkCvB"}
+{"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;;;GA4CvB"}

package/src/release/version-utils.js

@@ -16,22 +16,26 @@ const getDockerVersionPath = (workspaceRoot, projectRoot) => {
 };
 exports.getDockerVersionPath = getDockerVersionPath;
 async function handleDockerVersion(workspaceRoot, projectGraphNode, finalConfigForProject, dockerVersionScheme, dockerVersion) {
+    // If the full docker image reference is provided, use it directly
+    const nxDockerImageRefEnvOverride = process.env.NX_DOCKER_IMAGE_REF?.trim() || undefined;
     // If an explicit dockerVersion is provided, use it directly
     let newVersion;
-    if (dockerVersion) {
-        newVersion = dockerVersion;
+    if (!nxDockerImageRefEnvOverride) {
+        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);
+        }
     }
-    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);
+    const logs = updateProjectVersion(newVersion, nxDockerImageRefEnvOverride, workspaceRoot, projectGraphNode.data.root, finalConfigForProject.dockerOptions.repositoryName, finalConfigForProject.dockerOptions.registryUrl);
     return {
-        newVersion,
+        newVersion: newVersion || process.env.NX_DOCKER_IMAGE_REF?.split(':')[1] || null,
         logs,
     };
 }
@@ -57,11 +61,11 @@ function calculateNewVersion(projectName, versionScheme, versionSchemes) {
         projectName,
     });
 }
-function updateProjectVersion(newVersion, workspaceRoot, projectRoot, repositoryName, registry) {
+function updateProjectVersion(newVersion, nxDockerImageRefEnvOverride, workspaceRoot, projectRoot, repositoryName, registry) {
     const isDryRun = process.env.NX_DRY_RUN && process.env.NX_DRY_RUN !== 'false';
     const imageRef = getDefaultImageReference(projectRoot);
     const newImageRef = getImageReference(projectRoot, repositoryName, registry);
-    const fullImageRef = `${newImageRef}:${newVersion}`;
+    const fullImageRef = nxDockerImageRefEnvOverride ?? `${newImageRef}:${newVersion}`;
     if (!isDryRun) {
         (0, child_process_1.execSync)(`docker tag ${imageRef} ${fullImageRef}`);
     }