From 2d43e7ae2088fb2a6800666f9ba64661ce2a4717 Mon Sep 17 00:00:00 2001 From: Jimmy Zelinskie Date: Thu, 11 Apr 2024 11:35:15 -0400 Subject: [PATCH] internal: use GCR mirror for Docker images --- internal/datastore/crdb/crdb_test.go | 2 +- internal/testserver/datastore/crdb.go | 2 +- internal/testserver/datastore/mysql.go | 2 +- internal/testserver/datastore/postgres.go | 4 ++-- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/internal/datastore/crdb/crdb_test.go b/internal/datastore/crdb/crdb_test.go index 6463f8200..097176a9f 100644 --- a/internal/datastore/crdb/crdb_test.go +++ b/internal/datastore/crdb/crdb_test.go @@ -303,7 +303,7 @@ func newCRDBWithUser(t *testing.T, pool *dockertest.Pool) (adminConn *pgx.Conn, require.NoError(t, rootCertFile.Close()) resource, err := pool.RunWithOptions(&dockertest.RunOptions{ - Repository: "cockroachdb/cockroach", + Repository: "mirror.gcr.io/cockroachdb/cockroach", Tag: testdatastore.CRDBTestVersionTag, Cmd: []string{"start-single-node", "--certs-dir", "/certs", "--accept-sql-without-tls"}, Mounts: []string{certDir + ":/certs"}, diff --git a/internal/testserver/datastore/crdb.go b/internal/testserver/datastore/crdb.go index be61279a1..e74b891b3 100644 --- a/internal/testserver/datastore/crdb.go +++ b/internal/testserver/datastore/crdb.go @@ -40,7 +40,7 @@ func RunCRDBForTesting(t testing.TB, bridgeNetworkName string) RunningEngineForT name := fmt.Sprintf("crds-%s", uuid.New().String()) resource, err := pool.RunWithOptions(&dockertest.RunOptions{ Name: name, - Repository: "cockroachdb/cockroach", + Repository: "mirror.gcr.io/cockroachdb/cockroach", Tag: CRDBTestVersionTag, Cmd: []string{"start-single-node", "--insecure", "--max-offset=50ms"}, NetworkID: bridgeNetworkName, diff --git a/internal/testserver/datastore/mysql.go b/internal/testserver/datastore/mysql.go index 0710cccf7..f7752061b 100644 --- a/internal/testserver/datastore/mysql.go +++ b/internal/testserver/datastore/mysql.go @@ -58,7 +58,7 @@ func RunMySQLForTestingWithOptions(t testing.TB, options MySQLTesterOptions, bri name := fmt.Sprintf("mysql-%s", uuid.New().String()) resource, err := pool.RunWithOptions(&dockertest.RunOptions{ Name: name, - Repository: "mysql", + Repository: "mirror.gcr.io/library/mysql", Tag: containerImageTag, Env: []string{"MYSQL_ROOT_PASSWORD=secret"}, // increase max connections (default 151) to accommodate tests using the same docker container diff --git a/internal/testserver/datastore/postgres.go b/internal/testserver/datastore/postgres.go index 8a748004d..2915b467c 100644 --- a/internal/testserver/datastore/postgres.go +++ b/internal/testserver/datastore/postgres.go @@ -69,7 +69,7 @@ func RunPostgresForTestingWithCommitTimestamps(t testing.TB, bridgeNetworkName s postgres, err := pool.RunWithOptions(&dockertest.RunOptions{ Name: postgresContainerHostname, - Repository: "postgres", + Repository: "mirror.gcr.io/library/postgres", Tag: pgVersion, Env: []string{ "POSTGRES_USER=" + POSTGRES_TEST_USER, @@ -173,7 +173,7 @@ func (b *postgresTester) runPgbouncerForTesting(t testing.TB, pool *dockertest.P pgbouncer, err := pool.RunWithOptions(&dockertest.RunOptions{ Name: pgbouncerContainerHostname, - Repository: "edoburu/pgbouncer", + Repository: "mirror.gcr.io/edoburu/pgbouncer", Tag: "latest", Env: []string{ "DB_USER=" + POSTGRES_TEST_USER,