Stub out direct registry access

aaronlehmann · Nov 25, 2022 · 9da8bb6 · 9da8bb6
1 parent 15fe6d9
commit 9da8bb6
Showing 1 changed file with 4 additions and 6 deletions.
diff --git a/src/spec-node/imageMetadata.ts b/src/spec-node/imageMetadata.ts
@@ -9,7 +9,7 @@ import { Feature, FeaturesConfig, Mount, parseMount } from '../spec-configuratio
 import { ContainerDetails, DockerCLIParameters, ImageDetails } from '../spec-shutdown/dockerUtils';
 import { Log } from '../spec-utils/log';
 import { getBuildInfoForService, readDockerComposeConfig } from './dockerCompose';
-import { Dockerfile, extractDockerfile, findBaseImage, findUserStatement } from './dockerfileUtils';
+import { Dockerfile, extractDockerfile, findUserStatement } from './dockerfileUtils';
 import { SubstituteConfig, SubstitutedConfig, DockerResolverParameters, inspectDockerImage, uriToWSLFsPath, envListToObj } from './utils';
 
 const pickConfigProperties: (keyof DevContainerConfig & keyof ImageMetadataEntry)[] = [
@@ -347,11 +347,9 @@ export async function getImageBuildInfoFromDockerfile(params: DockerResolverPara
 
 export async function internalGetImageBuildInfoFromDockerfile(inspectDockerImage: (imageName: string) => Promise<ImageDetails>, dockerfileText: string, dockerBuildArgs: Record<string, string>, targetStage: string | undefined, substitute: SubstituteConfig, experimentalImageMetadata: boolean, output: Log): Promise<ImageBuildInfo> {
 	const dockerfile = extractDockerfile(dockerfileText);
-	const baseImage = findBaseImage(dockerfile, dockerBuildArgs, targetStage);
-	const imageDetails = baseImage && await inspectDockerImage(baseImage) || undefined;
-	const dockerfileUser = findUserStatement(dockerfile, dockerBuildArgs, envListToObj(imageDetails?.Config.Env), targetStage);
-	const user = dockerfileUser || imageDetails?.Config.User || 'root';
-	const metadata = imageDetails ? getImageMetadata(imageDetails, substitute, experimentalImageMetadata, output) : { config: [], raw: [], substitute };
+	const dockerfileUser = findUserStatement(dockerfile, dockerBuildArgs, {}, targetStage);
+	const user = dockerfileUser || 'root';
+	const metadata = { config: [], raw: [], substitute };
 	return {
 		user,
 		metadata,