diff --git a/bake/bake_test.go b/bake/bake_test.go index 1d8e86c2c9c..7f92842bfa9 100644 --- a/bake/bake_test.go +++ b/bake/bake_test.go @@ -297,9 +297,6 @@ services: ctx := context.TODO() - cwd, err := os.Getwd() - require.NoError(t, err) - m, g, err := ReadTargets(ctx, []File{fp, fp2, fp3}, []string{"default"}, nil, nil) require.NoError(t, err) @@ -308,7 +305,7 @@ services: require.True(t, ok) require.Equal(t, "Dockerfile.webapp", *m["webapp"].Dockerfile) - require.Equal(t, cwd, *m["webapp"].Context) + require.Equal(t, ".", *m["webapp"].Context) require.Equal(t, ptrstr("1"), m["webapp"].Args["buildno"]) require.Equal(t, ptrstr("12"), m["webapp"].Args["buildno2"]) @@ -347,9 +344,6 @@ services: ctx := context.TODO() - cwd, err := os.Getwd() - require.NoError(t, err) - m, _, err := ReadTargets(ctx, []File{fp}, []string{"web.app"}, nil, nil) require.NoError(t, err) require.Equal(t, 1, len(m)) @@ -372,7 +366,7 @@ services: _, ok = m["web_app"] require.True(t, ok) require.Equal(t, "Dockerfile.webapp", *m["web_app"].Dockerfile) - require.Equal(t, cwd, *m["web_app"].Context) + require.Equal(t, ".", *m["web_app"].Context) require.Equal(t, ptrstr("1"), m["web_app"].Args["buildno"]) require.Equal(t, ptrstr("12"), m["web_app"].Args["buildno2"]) @@ -581,9 +575,6 @@ services: ctx := context.TODO() - cwd, err := os.Getwd() - require.NoError(t, err) - m, _, err := ReadTargets(ctx, []File{fp, fp2}, []string{"app1", "app2"}, nil, nil) require.NoError(t, err) @@ -596,7 +587,7 @@ services: require.Equal(t, "Dockerfile", *m["app1"].Dockerfile) require.Equal(t, ".", *m["app1"].Context) require.Equal(t, "Dockerfile", *m["app2"].Dockerfile) - require.Equal(t, cwd, *m["app2"].Context) + require.Equal(t, ".", *m["app2"].Context) } func TestReadContextFromTargetChain(t *testing.T) { diff --git a/bake/compose_test.go b/bake/compose_test.go index f0998555007..4ef1019b12a 100644 --- a/bake/compose_test.go +++ b/bake/compose_test.go @@ -49,9 +49,6 @@ secrets: file: /root/.aws/credentials `) - cwd, err := os.Getwd() - require.NoError(t, err) - c, err := ParseCompose([]composetypes.ConfigFile{{Content: dt}}, nil) require.NoError(t, err) @@ -65,12 +62,12 @@ secrets: return c.Targets[i].Name < c.Targets[j].Name }) require.Equal(t, "db", c.Targets[0].Name) - require.Equal(t, filepath.Join(cwd, "db"), *c.Targets[0].Context) + require.Equal(t, "db", *c.Targets[0].Context) require.Equal(t, []string{"docker.io/tonistiigi/db"}, c.Targets[0].Tags) require.Equal(t, "webapp", c.Targets[1].Name) - require.Equal(t, filepath.Join(cwd, "dir"), *c.Targets[1].Context) - require.Equal(t, map[string]string{"foo": filepath.Join(cwd, "bar")}, c.Targets[1].Contexts) + require.Equal(t, "dir", *c.Targets[1].Context) + require.Equal(t, map[string]string{"foo": "bar"}, c.Targets[1].Contexts) require.Equal(t, "Dockerfile-alternate", *c.Targets[1].Dockerfile) require.Equal(t, 1, len(c.Targets[1].Args)) require.Equal(t, ptrstr("123"), c.Targets[1].Args["buildno"]) @@ -83,7 +80,7 @@ secrets: }, c.Targets[1].Secrets) require.Equal(t, "webapp2", c.Targets[2].Name) - require.Equal(t, filepath.Join(cwd, "dir"), *c.Targets[2].Context) + require.Equal(t, "dir", *c.Targets[2].Context) require.Equal(t, "FROM alpine\n", *c.Targets[2].DockerfileInline) }