redundant dockerfile issue with build

devcontainers · May 14, 2024 · de4d1bf · de4d1bf
1 parent c1c8b08
commit de4d1bf
Show file tree

Hide file tree

Showing 3 changed files with 33 additions and 4 deletions.
diff --git a/src/spec-node/containerFeatures.ts b/src/spec-node/containerFeatures.ts
@@ -111,9 +111,8 @@ export async function extendImage(params: DockerResolverParameters, config: Subs
 	cliHost.mkdirp(emptyTempDir);
 	args.push(
 		'--target', featureBuildInfo.overrideTarget,
-		'-t', updatedImageName,
-		...additionalImageNames.map(name => ['-t', name]).flat(),
 		'-f', dockerfilePath,
+		...additionalImageNames.length > 0 ? additionalImageNames.map(name => ['-t', name]).flat() : ['-t', updatedImageName],
 		emptyTempDir
 	);
 
@@ -125,7 +124,7 @@ export async function extendImage(params: DockerResolverParameters, config: Subs
 		await dockerCLI(infoParams, ...args);
 	}
 	return {
-		updatedImageName: [ updatedImageName ],
+		updatedImageName: additionalImageNames.length > 0 ? additionalImageNames : [updatedImageName],
 		imageMetadata: getDevcontainerMetadata(imageBuildInfo.metadata, config, featuresConfig),
 		imageDetails: async () => imageBuildInfo.imageDetails,
 	};

diff --git a/src/spec-node/devContainersSpecCLI.ts b/src/spec-node/devContainersSpecCLI.ts
@@ -507,6 +507,22 @@ function buildHandler(args: BuildArgs) {
 	(async () => build(args))().catch(console.error);
 }
 
+function removeDuplicateImages(images: string[]): string[] {
+	const uniqueImageNames = new Set<string>();
+	const filteredImages: string[] = [];
+	console.log('images before filtering : ' + images);
+	for (const image of images) {
+		const [name] = image.split(':');
+		if (!uniqueImageNames.has(name)) {
+			uniqueImageNames.add(name);
+			filteredImages.push(image);
+			console.log('image unique tags : ' + filteredImages);
+		}
+	}
+
+	return filteredImages;
+}
+
 async function build(args: BuildArgs) {
 	const result = await doBuild(args);
 	const exitCode = result.outcome === 'error' ? 1 : 0;
@@ -610,7 +626,11 @@ async function doBuild({
 		await ensureNoDisallowedFeatures(buildParams, config, additionalFeatures, undefined);
 
 		// Support multiple use of `--image-name`
-		const imageNames = (argImageName && (Array.isArray(argImageName) ? argImageName : [argImageName]) as string[]) || undefined;
+		const duplicateImageNames = (argImageName && (Array.isArray(argImageName) ? argImageName : [argImageName]) as string[]) || undefined;
+		let imageNames = undefined;
+		if (duplicateImageNames !== undefined) {
+			imageNames = removeDuplicateImages(duplicateImageNames);
+		}
 
 		if (isDockerFileConfig(config)) {
 

diff --git a/src/test/cli.build.test.ts b/src/test/cli.build.test.ts
@@ -27,6 +27,16 @@ describe('Dev Containers CLI', function () {
 
 	describe('Command build', () => {
 
+		it('should correctly configure the image name to push from --image-name with --push true', async () => {
+			const testFolder = `${__dirname}/configs/example`;
+			try {
+				await shellExec(`${cli} build --workspace-folder ${testFolder} --image-name demo:v1 --image-name demo:v2 --image-name demo:v3`);
+				assert.ok(false, 'should not succeed');
+			} catch (error) {
+				assert.equal(error.code, 'ERR_ASSERTION', 'Should fail with ERR_ASSERTION');
+			}
+		});
+
 		buildKitOptions.forEach(({ text, options }) => {
 			it(`should execute successfully with valid image config  [${text}]`, async () => {
 				const testFolder = `${__dirname}/configs/image`;