fix contentSourceRootPath

Author: joshspicer

src/spec-configuration/containerFeaturesConfiguration.ts

@@ -239,22 +239,22 @@ export function getSourceInfoString(srcInfo: SourceInformation): string {
 }
 
 // TODO: Move to node layer.
-export function getContainerFeaturesBaseDockerFile(destBasePath = '/opt/build-features/') {
+export function getContainerFeaturesBaseDockerFile(contentSourceRootPath: string, destBasePath: string) {
 	return `
 #{featureBuildStages}
 
 #{nonBuildKitFeatureContentFallback}
 
 FROM $_DEV_CONTAINERS_BASE_IMAGE AS dev_containers_feature_content_normalize
 USER root
-COPY --from=dev_containers_feature_content_source {contentSourceRootPath}/devcontainer-features.builtin.env ${destBasePath}
+COPY --from=dev_containers_feature_content_source ${contentSourceRootPath}/devcontainer-features.builtin.env ${destBasePath}
 RUN chmod -R 0777 ${destBasePath}
 
 FROM $_DEV_CONTAINERS_BASE_IMAGE AS dev_containers_target_stage
 
 USER root
 
-COPY --from=dev_containers_feature_content_normalize {contentSourceRootPath} ${destBasePath}
+COPY --from=dev_containers_feature_content_normalize ${contentSourceRootPath} ${destBasePath}
 
 #{featureLayer}
 

src/spec-node/containerFeatures.ts

@@ -247,6 +247,8 @@ async function getFeaturesBuildOptions(params: DockerResolverParameters, devCont
 		return undefined;
 	}
 
+	output.write(`temporary dstFolder='${dstFolder}'`);
+
 	const buildStageScripts = await Promise.all(featuresConfig.featureSets
 		.map(featureSet => multiStageBuildExploration ? featureSet.features
 			.filter(f => (includeAllConfiguredFeatures || f.included) && f.value)
@@ -284,10 +286,9 @@ async function getFeaturesBuildOptions(params: DockerResolverParameters, devCont
 
 	// When copying via buildkit, the content is accessed via '.' (i.e. in the context root)
 	// When copying via temp image, the content is in '/opt/build-features'
-	const contentSourceRootPath = useBuildKitBuildContexts ? '.' : '/opt/build-features/';
-	const dockerfile = getContainerFeaturesBaseDockerFile()
+	const contentSourceRootPath = useBuildKitBuildContexts ? '.' : '/tmp/build-features/';
+	const dockerfile = getContainerFeaturesBaseDockerFile(contentSourceRootPath, '/opt/build-features/')
 		.replace('#{nonBuildKitFeatureContentFallback}', useBuildKitBuildContexts ? '' : `FROM ${buildContentImageName} as dev_containers_feature_content_source`)
-		.replace('{contentSourceRootPath}', contentSourceRootPath)
 		.replace('#{featureBuildStages}', getFeatureBuildStages(featuresConfig, buildStageScripts, contentSourceRootPath))
 		.replace('#{featureLayer}', getFeatureLayers(featuresConfig, containerUser, remoteUser, useBuildKitBuildContexts, contentSourceRootPath))
 		.replace('#{containerEnv}', generateContainerEnvs(featuresConfig))
@@ -349,7 +350,7 @@ ARG _DEV_CONTAINERS_BASE_IMAGE=placeholder
 	if (!useBuildKitBuildContexts) {
 		const buildContentDockerfile = `
 	FROM scratch
-	COPY . /opt/build-features/
+	COPY . /tmp/build-features/
 	`;
 		const buildContentDockerfilePath = cliHost.path.join(dstFolder, 'Dockerfile.buildContent');
 		await cliHost.writeFile(buildContentDockerfilePath, Buffer.from(buildContentDockerfile));

src/test/container-features/generateFeaturesConfig.test.ts

@@ -76,8 +76,8 @@ echo "_CONTAINER_USER_HOME=$(getent passwd testContainerUser | cut -d: -f6)" >>
 echo "_REMOTE_USER_HOME=$(getent passwd testRemoteUser | cut -d: -f6)" >> /opt/build-features/devcontainer-features.builtin.env
 
 COPY --chown=root:root --from=dev_containers_feature_content_source /tmp/build-features/first_1 /opt/build-features/first_1
-RUN chmod -R 0777 /tmp/build-features/first_1 \\
-&& cd /tmp/build-features/first_1 \\
+RUN chmod -R 0777 /opt/build-features/first_1 \\
+&& cd /opt/build-features/first_1 \\
 && chmod +x ./install.sh \\
 && ./install.sh