diff --git a/pkg/acceptance/compose/flyway/docker-compose.yml b/pkg/acceptance/compose/flyway/docker-compose.yml index 50757c95b133..9c621ab9305d 100644 --- a/pkg/acceptance/compose/flyway/docker-compose.yml +++ b/pkg/acceptance/compose/flyway/docker-compose.yml @@ -1,4 +1,3 @@ -version: '3' services: cockroach: image: ubuntu:xenial-20210804 diff --git a/pkg/acceptance/compose/gss/docker-compose-python.yml b/pkg/acceptance/compose/gss/docker-compose-python.yml index c52bddde5336..a4f9e327f6bc 100644 --- a/pkg/acceptance/compose/gss/docker-compose-python.yml +++ b/pkg/acceptance/compose/gss/docker-compose-python.yml @@ -1,4 +1,3 @@ -version: '3' services: kdc: image: us-east1-docker.pkg.dev/crl-ci-images/cockroach/acceptance-gss-kdc:20221214-131000 diff --git a/pkg/acceptance/compose/gss/docker-compose.yml b/pkg/acceptance/compose/gss/docker-compose.yml index 45b39d860eaf..0d43066546a3 100644 --- a/pkg/acceptance/compose/gss/docker-compose.yml +++ b/pkg/acceptance/compose/gss/docker-compose.yml @@ -1,4 +1,3 @@ -version: '3' services: kdc: image: us-east1-docker.pkg.dev/crl-ci-images/cockroach/acceptance-gss-kdc:20221214-131000 diff --git a/pkg/acceptance/compose_test.go b/pkg/acceptance/compose_test.go index 8b6adafc1a59..77fc29454224 100644 --- a/pkg/acceptance/compose_test.go +++ b/pkg/acceptance/compose_test.go @@ -73,8 +73,13 @@ func testCompose(t *testing.T, path string, exitCodeFrom string) { t.Fatalf(err.Error()) } cmd := exec.Command( - "docker-compose", - "--no-ansi", + "docker", + "compose", + // NB: Using --compatibility here in order to preserve compose V1 hostnames + // (with underscores) instead of V2 hostnames (with -), because the + // hostnames are hardcoded in the Kerberos keys. + "--compatibility", + "--ansi=never", "-f", path, "up", "--force-recreate", diff --git a/pkg/compose/compare/docker-compose.yml b/pkg/compose/compare/docker-compose.yml index 0f26c7bdcc46..9b99286a8465 100644 --- a/pkg/compose/compare/docker-compose.yml +++ b/pkg/compose/compare/docker-compose.yml @@ -1,4 +1,3 @@ -version: '3' services: cockroach1: image: ubuntu:xenial-20170214 diff --git a/pkg/compose/compose_test.go b/pkg/compose/compose_test.go index 95b54a282972..4d90a68be6e6 100644 --- a/pkg/compose/compose_test.go +++ b/pkg/compose/compose_test.go @@ -123,7 +123,7 @@ func TestComposeCompare(t *testing.T) { "docker", "compose", "-f", dockerComposeYml, - "--no-ansi", + "--ansi=never", "up", "--force-recreate", "--exit-code-from", "test",