Skip to content

Commit 1fa47ec

Browse files
authored
Update devcontainer_test.go
1 parent b8b3dcc commit 1fa47ec

File tree

1 file changed

+15
-3
lines changed

1 file changed

+15
-3
lines changed

devcontainer/devcontainer_test.go

Lines changed: 15 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -232,9 +232,6 @@ func TestImageFromDockerfileWithArgs(t *testing.T) {
232232
},
233233
},
234234
}
235-
fs := memfs.New()
236-
params, err := dc.Compile(fs, "", workingDir, "", "", false, stubLookupEnv)
237-
require.Equal(t, "VARIANT=3.11-bookworm", params.BuildArgs[0])
238235

239236
for _, tc := range []struct {
240237
content string
@@ -249,6 +246,21 @@ func TestImageFromDockerfileWithArgs(t *testing.T) {
249246
tc := tc
250247
t.Run(tc.image, func(t *testing.T) {
251248
t.Parallel()
249+
250+
fs := memfs.New()
251+
dcDir := "/workspaces/coder/.devcontainer"
252+
err := fs.MkdirAll(dcDir, 0o755)
253+
require.NoError(t, err)
254+
file, err := fs.OpenFile(filepath.Join(dcDir, "Dockerfile"), os.O_CREATE|os.O_WRONLY, 0o644)
255+
require.NoError(t, err)
256+
_, err = io.WriteString(file, tc.content)
257+
require.NoError(t, err)
258+
_ = file.Close()
259+
params, err := dc.Compile(fs, dcDir, workingDir, "", "/var/workspace", false, stubLookupEnv)
260+
261+
require.Equal(t, "VARIANT=3.11-bookworm", params.BuildArgs[0])
262+
require.Equal(t, params.DockerfileContent, tc.content)
263+
252264
ref, err := devcontainer.ImageFromDockerfile(tc.content)
253265
require.NoError(t, err)
254266
require.Equal(t, tc.image, ref.Name())

0 commit comments

Comments
 (0)