diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index a2046b7e82..c738288f67 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -8,6 +8,9 @@ on: permissions: contents: read +env: + DOCKER_MIRROR: docker.mirror.hashicorp.services + jobs: setup: outputs: diff --git a/internal/credential/vault/supported.go b/internal/credential/vault/supported.go index 8c59148d85..6610fbe951 100644 --- a/internal/credential/vault/supported.go +++ b/internal/credential/vault/supported.go @@ -28,9 +28,20 @@ import ( const DefaultVaultVersion = "1.7.2" +var ( + vaultRepository = "vault" + postgresRepository = "postgres" +) + func init() { newVaultServer = gotNewServer mountDatabase = gotMountDatabase + + mirror := os.Getenv("DOCKER_MIRROR") + if mirror != "" { + vaultRepository = strings.Join([]string{mirror, vaultRepository}, "/") + postgresRepository = strings.Join([]string{mirror, postgresRepository}, "/") + } } func gotDocker(t testing.TB) {} @@ -84,7 +95,7 @@ func gotNewServer(t testing.TB, opt ...TestOption) *TestVaultServer { } dockerOptions := &dockertest.RunOptions{ - Repository: "vault", + Repository: vaultRepository, Tag: vaultVersion, Env: []string{fmt.Sprintf("VAULT_DEV_ROOT_TOKEN_ID=%s", server.RootToken)}, } @@ -212,7 +223,7 @@ func gotMountDatabase(t testing.TB, v *TestVaultServer, opt ...TestOption) *Test require.True(ok) dockerOptions := &dockertest.RunOptions{ - Repository: "postgres", + Repository: postgresRepository, Tag: "11", Networks: []*dockertest.Network{network}, Env: []string{"POSTGRES_PASSWORD=password", "POSTGRES_DB=boundarytest"}, diff --git a/testing/dbtest/docker/Makefile b/testing/dbtest/docker/Makefile index 2c7d84378a..eb4ee98ff2 100644 --- a/testing/dbtest/docker/Makefile +++ b/testing/dbtest/docker/Makefile @@ -3,9 +3,10 @@ all: docker-build CWD := $(shell pwd) DOCKER_ARGS ?= -d -REGISTRY_NAME?=docker.io/hashicorpboundary +DOCKER_MIRROR?=docker.io +REGISTRY_NAME?=hashicorpboundary TEST_IMAGE_NAME=postgres -TEST_IMAGE_TAG ?= $(REGISTRY_NAME)/$(TEST_IMAGE_NAME):11-alpine +TEST_IMAGE_TAG ?= $(DOCKER_MIRROR)/$(REGISTRY_NAME)/$(TEST_IMAGE_NAME):11-alpine PG_OPTS ?= TEST_DB_PORT ?= 5432 TEST_CONTAINER_NAME ?= boundary-sql-tests @@ -21,7 +22,7 @@ ${docker-buildxs}: %-buildx: docker buildx build \ --platform linux/amd64,linux/arm64 \ --push \ - -t $(REGISTRY_NAME)/$(TEST_IMAGE_NAME):$* \ + -t $(DOCKER_MIRROR)/$(REGISTRY_NAME)/$(TEST_IMAGE_NAME):$* \ -f Dockerfile.$* . docker-load: ${docker-load-buildxs} @@ -29,7 +30,7 @@ docker-load: ${docker-load-buildxs} ${docker-load-buildxs}: %-load-buildx: docker buildx build \ --load \ - -t $(REGISTRY_NAME)/$(TEST_IMAGE_NAME):$* \ + -t $(DOCKER_MIRROR)/$(REGISTRY_NAME)/$(TEST_IMAGE_NAME):$* \ -f Dockerfile.$* . database-up: