Skip to content

Commit c9c7e07

Browse files
author
Aaron Lehmann
committed
Stub out direct registry access
1 parent 3ef1e10 commit c9c7e07

1 file changed

Lines changed: 4 additions & 6 deletions

File tree

src/spec-node/imageMetadata.ts

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ import { Feature, FeaturesConfig, Mount, parseMount } from '../spec-configuratio
99
import { ContainerDetails, DockerCLIParameters, ImageDetails } from '../spec-shutdown/dockerUtils';
1010
import { Log } from '../spec-utils/log';
1111
import { getBuildInfoForService, readDockerComposeConfig } from './dockerCompose';
12-
import { Dockerfile, extractDockerfile, findBaseImage, findUserStatement } from './dockerfileUtils';
12+
import { Dockerfile, extractDockerfile, findUserStatement } from './dockerfileUtils';
1313
import { SubstituteConfig, SubstitutedConfig, DockerResolverParameters, inspectDockerImage, uriToWSLFsPath, envListToObj } from './utils';
1414

1515
const pickConfigProperties: (keyof DevContainerConfig & keyof ImageMetadataEntry)[] = [
@@ -347,11 +347,9 @@ export async function getImageBuildInfoFromDockerfile(params: DockerResolverPara
347347

348348
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> {
349349
const dockerfile = extractDockerfile(dockerfileText);
350-
const baseImage = findBaseImage(dockerfile, dockerBuildArgs, targetStage);
351-
const imageDetails = baseImage && await inspectDockerImage(baseImage) || undefined;
352-
const dockerfileUser = findUserStatement(dockerfile, dockerBuildArgs, envListToObj(imageDetails?.Config.Env), targetStage);
353-
const user = dockerfileUser || imageDetails?.Config.User || 'root';
354-
const metadata = imageDetails ? getImageMetadata(imageDetails, substitute, experimentalImageMetadata, output) : { config: [], raw: [], substitute };
350+
const dockerfileUser = findUserStatement(dockerfile, dockerBuildArgs, {}, targetStage);
351+
const user = dockerfileUser || 'root';
352+
const metadata = { config: [], raw: [], substitute };
355353
return {
356354
user,
357355
metadata,

0 commit comments

Comments
 (0)