Added labels to build with dockerfile

Author: Roemer

src/spec-node/singleContainer.ts

@@ -244,6 +244,10 @@ async function buildAndExtendImage(buildParams: DockerResolverParameters, config
 			}
 		}
 	}
+
+	// Add labels
+	args.push(...buildParams.additionalLabels.length > 0 ? buildParams.additionalLabels.map(label => ['--label', label]).flat() : []);
+
 	const buildArgs = config.build?.args;
 	if (buildArgs) {
 		for (const key in buildArgs) {

src/test/cli.build.test.ts

@@ -27,13 +27,26 @@ describe('Dev Containers CLI', function () {
 
 	describe('Command build', () => {
 
-		it('should build successfully with valid image metadata --label property', async () => {
+		it('should build successfully with valid image metadata --label property (image)', async () => {
 			const testFolder = `${__dirname}/configs/example`;
 			const response = await shellExec(`${cli} build --workspace-folder ${testFolder} --label 'name=label-test' --label 'type=multiple-labels'`);
 			const res = JSON.parse(response.stdout);
 			assert.equal(res.outcome, 'success');
-			const labels = await shellExec(`docker inspect --format '{{json .Config.Labels}}' ${res.imageName} | jq`);
-			assert.match(labels.stdout.toString(), /\"name\": \"label-test\"/);
+			const labelsResponse = await shellExec(`docker inspect --format '{{json .Config.Labels}}' ${res.imageName}`);
+			const labels = JSON.parse(labelsResponse.stdout);
+			assert.equal(labels.name, 'label-test');
+			assert.equal(labels.type, 'multiple-labels');
+		});
+
+		it('should build successfully with valid image metadata --label property (dockerfile)', async () => {
+			const testFolder = `${__dirname}/configs/example-dockerfile`;
+			const response = await shellExec(`${cli} build --workspace-folder ${testFolder} --label 'name=label-test' --label 'type=multiple-labels'`);
+			const res = JSON.parse(response.stdout);
+			assert.equal(res.outcome, 'success');
+			const labelsResponse = await shellExec(`docker inspect --format '{{json .Config.Labels}}' ${res.imageName}`);
+			const labels = JSON.parse(labelsResponse.stdout);
+			assert.equal(labels.name, 'label-test');
+			assert.equal(labels.type, 'multiple-labels');
 		});
 
 		it('should fail to build with correct error message for local feature', async () => {

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

@@ -0,0 +1,11 @@
+// Example devcontainer.json configuration with a Dockerfile
+{
+	"build": {
+		"dockerfile": "Dockerfile"
+	},
+	"features": {
+		"ghcr.io/devcontainers/features/go:1": {
+			"version": "latest"
+		}
+	}
+}

src/test/configs/example-dockerfile/Dockerfile

@@ -0,0 +1 @@
+FROM mcr.microsoft.com/devcontainers/base:bookworm