Include config (#299)

devcontainers · Nov 28, 2022 · 4aa0e55 · 4aa0e55
1 parent 1de0059
commit 4aa0e55
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 1 deletion.
diff --git a/src/spec-node/containerFeatures.ts b/src/spec-node/containerFeatures.ts
@@ -39,7 +39,7 @@ export async function extendImage(params: DockerResolverParameters, config: Subs
 		// no feature extensions - return
 		return {
 			updatedImageName: [imageName],
-			imageMetadata: imageBuildInfo.metadata,
+			imageMetadata: getDevcontainerMetadata(imageBuildInfo.metadata, config, extendImageDetails?.featuresConfig),
 			imageDetails: async () => imageBuildInfo.imageDetails,
 			labels: extendImageDetails?.labels,
 		};

diff --git a/src/test/configs/compose-image-without-features-minimal/.devcontainer/devcontainer.json b/src/test/configs/compose-image-without-features-minimal/.devcontainer/devcontainer.json
@@ -2,6 +2,7 @@
 	"dockerComposeFile": "docker-compose.yml",
 	"service": "app",
 	"workspaceFolder": "/workspace",
+	"postCreateCommand": "touch /postCreateCommand.txt",
 	"remoteEnv": {
 		"TEST": "ENV"
 	}

diff --git a/src/test/configs/image/.devcontainer.json b/src/test/configs/image/.devcontainer.json
@@ -1,5 +1,6 @@
 {
 	"image": "ubuntu:latest",
+	"postCreateCommand": "touch /postCreateCommand.txt",
 	"remoteEnv": {
 		"LOCAL_PATH": "${localEnv:PATH}",
 		"CONTAINER_PATH": "${containerEnv:PATH}"

diff --git a/src/test/imageMetadata.test.ts b/src/test/imageMetadata.test.ts
@@ -156,6 +156,7 @@ describe('Image Metadata', function () {
 					const metadata = internalGetImageMetadata0(details, true, nullLog);
 					assert.strictEqual(metadata.length, 1);
 					assert.ok(metadata[0].remoteEnv);
+					await shellExec(`docker exec ${response.containerId} test -f /postCreateCommand.txt`);
 					await shellExec(`docker rm -f ${response.containerId}`);
 				});
 			});