tyler.durden
/
compose
mirror of https://github.com/docker/compose.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

run build tests against bake 

Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
This commit is contained in:
Nicolas De Loof 2024-11-26 11:01:51 +01:00 committed by Guillaume Lours
parent 095f65cb42
commit a85f8a40a9
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkg/e2e/build_test.go
View File

@ -33,8 +33,8 @@ import (
func TestLocalComposeBuild(t *testing.T) { func TestLocalComposeBuild(t *testing.T) {
for _, env := range []string{"DOCKER_BUILDKIT=0", "DOCKER_BUILDKIT=1"} { for _, env := range []string{"DOCKER_BUILDKIT=0", "DOCKER_BUILDKIT=1", "DOCKER_BUILDKIT=1,COMPOSE-BAKE=1"} {
c := NewCLI(t, WithEnv(env)) c := NewCLI(t, WithEnv(strings.Split(env, ",")...))
t.Run(env+" build named and unnamed images", func(t *testing.T) { t.Run(env+" build named and unnamed images", func(t *testing.T) {
// ensure local test run does not reuse previously build image // ensure local test run does not reuse previously build image

2
pkg/e2e/fixtures/network-test/compose.subnet.yaml
View File

@ -8,5 +8,5 @@ networks:
test: test:
ipam: ipam:
config: config:
- subnet: ${SUBNET-172.28.0.0/16} - subnet: ${SUBNET-172.99.0.0/16}

2
pkg/e2e/networks_test.go
View File

@ -159,7 +159,7 @@ func TestNetworkConfigChanged(t *testing.T) {
}) })
res := c.RunDockerComposeCmd(t, "--project-name", projectName, "exec", "test", "hostname", "-i") res := c.RunDockerComposeCmd(t, "--project-name", projectName, "exec", "test", "hostname", "-i")
res.Assert(t, icmd.Expected{Out: "172.28.0."}) res.Assert(t, icmd.Expected{Out: "172.99.0."})
res.Combined() res.Combined()
cmd := c.NewCmdWithEnv([]string{"SUBNET=192.168.0.0/16"}, cmd := c.NewCmdWithEnv([]string{"SUBNET=192.168.0.0/16"},