Merge pull request #124918 from cockroachdb/blathers/backport-release…

…-23.2-124876

release-23.2: acceptance: use `docker compose` (part 2)

pkg/acceptance/compose/flyway/docker-compose.yml

@@ -1,4 +1,3 @@
-version: '3'
 services:
   cockroach:
     image: ubuntu:xenial-20210804

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

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

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",

pkg/compose/compare/docker-compose.yml

@@ -1,4 +1,3 @@
-version: '3'
 services:
   cockroach1:
     image: ubuntu:xenial-20170214

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",