From 726512b4e0fedf78ea8a5ee89bca21b8bf83860a Mon Sep 17 00:00:00 2001 From: Josh Black Date: Fri, 5 May 2023 09:37:31 -0700 Subject: [PATCH] use internal docker mirror for CI (#20435) * use internal docker mirror for CI * maybe it needs to be https * no just kidding it's docker:// * apparently overriding it globally causes creates to fail. time to override each image individually lol * maybe this works --- builtin/logical/nomad/backend_test.go | 2 +- plugins/database/influxdb/influxdb_test.go | 7 ++++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/builtin/logical/nomad/backend_test.go b/builtin/logical/nomad/backend_test.go index 447a31d82..dc575832c 100644 --- a/builtin/logical/nomad/backend_test.go +++ b/builtin/logical/nomad/backend_test.go @@ -47,7 +47,7 @@ func prepareTestContainer(t *testing.T, bootstrap bool) (func(), *Config) { } runner, err := docker.NewServiceRunner(docker.RunOptions{ - ImageRepo: "multani/nomad", + ImageRepo: "docker.mirror.hashicorp.services/multani/nomad", ImageTag: "1.1.6", ContainerName: "nomad", Ports: []string{"4646/tcp"}, diff --git a/plugins/database/influxdb/influxdb_test.go b/plugins/database/influxdb/influxdb_test.go index 28231dc52..a7a825841 100644 --- a/plugins/database/influxdb/influxdb_test.go +++ b/plugins/database/influxdb/influxdb_test.go @@ -14,7 +14,7 @@ import ( "testing" "time" - dbplugin "github.com/hashicorp/vault/sdk/database/dbplugin/v5" + "github.com/hashicorp/vault/sdk/database/dbplugin/v5" dbtesting "github.com/hashicorp/vault/sdk/database/dbplugin/v5/testing" "github.com/hashicorp/vault/sdk/helper/docker" influx "github.com/influxdata/influxdb1-client/v2" @@ -61,8 +61,9 @@ func prepareInfluxdbTestContainer(t *testing.T) (func(), *Config) { } runner, err := docker.NewServiceRunner(docker.RunOptions{ - ImageRepo: "influxdb", - ImageTag: "1.8-alpine", + ImageRepo: "docker.mirror.hashicorp.services/influxdb", + ContainerName: "influxdb", + ImageTag: "1.8-alpine", Env: []string{ "INFLUXDB_DB=vault", "INFLUXDB_ADMIN_USER=" + c.Username,