Skip to content

Commit e6283db

Browse files
committed
fix(envbuilder): RunCacheProbe: remove references to constants.MagicDir (#315)
(cherry picked from commit be15d1a)
1 parent 59f0fae commit e6283db

File tree

3 files changed

+225
-117
lines changed

3 files changed

+225
-117
lines changed

envbuilder.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -948,7 +948,7 @@ func RunCacheProbe(ctx context.Context, opts options.Options) (v1.Image, error)
948948
}
949949

950950
defaultBuildParams := func() (*devcontainer.Compiled, error) {
951-
dockerfile := filepath.Join(constants.MagicDir, "Dockerfile")
951+
dockerfile := filepath.Join(buildTimeWorkspaceFolder, "Dockerfile")
952952
file, err := opts.Filesystem.OpenFile(dockerfile, os.O_CREATE|os.O_WRONLY, 0o644)
953953
if err != nil {
954954
return nil, err
@@ -970,7 +970,7 @@ func RunCacheProbe(ctx context.Context, opts options.Options) (v1.Image, error)
970970
return &devcontainer.Compiled{
971971
DockerfilePath: dockerfile,
972972
DockerfileContent: content,
973-
BuildContext: constants.MagicDir,
973+
BuildContext: buildTimeWorkspaceFolder,
974974
}, nil
975975
}
976976

@@ -1010,7 +1010,7 @@ func RunCacheProbe(ctx context.Context, opts options.Options) (v1.Image, error)
10101010
opts.Logger(log.LevelInfo, "No Dockerfile or image specified; falling back to the default image...")
10111011
fallbackDockerfile = defaultParams.DockerfilePath
10121012
}
1013-
buildParams, err = devContainer.Compile(opts.Filesystem, devcontainerDir, constants.MagicDir, fallbackDockerfile, opts.WorkspaceFolder, false, os.LookupEnv)
1013+
buildParams, err = devContainer.Compile(opts.Filesystem, devcontainerDir, buildTimeWorkspaceFolder, fallbackDockerfile, opts.WorkspaceFolder, false, os.LookupEnv)
10141014
if err != nil {
10151015
return nil, fmt.Errorf("compile devcontainer.json: %w", err)
10161016
}

0 commit comments

Comments
 (0)