redundant dockerfile issue with build

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,
 	};

src/test/cli.build.test.ts

@@ -27,6 +27,21 @@ describe('Dev Containers CLI', function () {
 
 	describe('Command build', () => {
 
+		it('should fail to push --image-name with --push true', async () => {
+			let success = false;
+			const testFolder = `${__dirname}/configs/example-push`;
+			try {
+				await shellExec(`${cli} build --workspace-folder ${testFolder} --image-name demo:v1 --push true`);
+			} catch (error) {
+				assert.equal(error.error.code, 1, 'Should fail with exit code 1');
+				const res = JSON.parse(error.stdout);
+				assert.equal(res.outcome, 'error');
+				assert.match(JSON.stringify(error.error.message), /unauthorized: access token has insufficient scopes/);
+				assert.match(JSON.stringify(error.error.message), /pushing demo:v1 with docker/);
+			}
+			assert.equal(success, false, 'expect non-successful call');
+		});
+
 		buildKitOptions.forEach(({ text, options }) => {
 			it(`should execute successfully with valid image config  [${text}]`, async () => {
 				const testFolder = `${__dirname}/configs/image`;

src/test/configs/example-push/.devcontainer.json

@@ -0,0 +1,10 @@
+// Example devcontainer.json configuration, 
+// wired into the vscode launch task (.vscode/launch.json)
+{
+	"image": "mcr.microsoft.com/devcontainers/base:ubuntu",
+	"features": {
+		"ghcr.io/devcontainers/features/node:1": {
+			"version": "16.18.1"
+		}
+	}
+}