@@ -222,17 +222,7 @@ func TestImageFromDockerfile(t *testing.T) {
222
222
}
223
223
224
224
func TestImageFromDockerfileWithArgs (t * testing.T ) {
225
- t .Parallel ()
226
- dc := & devcontainer.Spec {
227
- Build : devcontainer.BuildSpec {
228
- Dockerfile : "Dockerfile" ,
229
- Context : "." ,
230
- Args : map [string ]string {
231
- "VARIANT" : "3.11-bookworm" ,
232
- },
233
- },
234
- }
235
-
225
+ t .Parallel ()
236
226
for _ , tc := range []struct {
237
227
content string
238
228
image string
@@ -246,7 +236,15 @@ func TestImageFromDockerfileWithArgs(t *testing.T) {
246
236
tc := tc
247
237
t .Run (tc .image , func (t * testing.T ) {
248
238
t .Parallel ()
249
-
239
+ dc := & devcontainer.Spec {
240
+ Build : devcontainer.BuildSpec {
241
+ Dockerfile : "Dockerfile" ,
242
+ Context : "." ,
243
+ Args : map [string ]string {
244
+ "VARIANT" : "3.11-bookworm" ,
245
+ },
246
+ },
247
+ }
250
248
fs := memfs .New ()
251
249
dcDir := "/workspaces/coder/.devcontainer"
252
250
err := fs .MkdirAll (dcDir , 0o755 )
@@ -257,10 +255,8 @@ func TestImageFromDockerfileWithArgs(t *testing.T) {
257
255
require .NoError (t , err )
258
256
_ = file .Close ()
259
257
params , err := dc .Compile (fs , dcDir , workingDir , "" , "/var/workspace" , false , stubLookupEnv )
260
-
261
258
require .Equal (t , "VARIANT=3.11-bookworm" , params .BuildArgs [0 ])
262
259
require .Equal (t , params .DockerfileContent , tc .content )
263
-
264
260
ref , err := devcontainer .ImageFromDockerfile (tc .content )
265
261
require .NoError (t , err )
266
262
require .Equal (t , tc .image , ref .Name ())
0 commit comments