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
This commit is contained in:
Josh Black 2023-05-05 09:37:31 -07:00 committed by GitHub
parent edbbd3106c
commit 726512b4e0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 4 deletions

View File

@ -47,7 +47,7 @@ func prepareTestContainer(t *testing.T, bootstrap bool) (func(), *Config) {
} }
runner, err := docker.NewServiceRunner(docker.RunOptions{ runner, err := docker.NewServiceRunner(docker.RunOptions{
ImageRepo: "multani/nomad", ImageRepo: "docker.mirror.hashicorp.services/multani/nomad",
ImageTag: "1.1.6", ImageTag: "1.1.6",
ContainerName: "nomad", ContainerName: "nomad",
Ports: []string{"4646/tcp"}, Ports: []string{"4646/tcp"},

View File

@ -14,7 +14,7 @@ import (
"testing" "testing"
"time" "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" dbtesting "github.com/hashicorp/vault/sdk/database/dbplugin/v5/testing"
"github.com/hashicorp/vault/sdk/helper/docker" "github.com/hashicorp/vault/sdk/helper/docker"
influx "github.com/influxdata/influxdb1-client/v2" influx "github.com/influxdata/influxdb1-client/v2"
@ -61,8 +61,9 @@ func prepareInfluxdbTestContainer(t *testing.T) (func(), *Config) {
} }
runner, err := docker.NewServiceRunner(docker.RunOptions{ runner, err := docker.NewServiceRunner(docker.RunOptions{
ImageRepo: "influxdb", ImageRepo: "docker.mirror.hashicorp.services/influxdb",
ImageTag: "1.8-alpine", ContainerName: "influxdb",
ImageTag: "1.8-alpine",
Env: []string{ Env: []string{
"INFLUXDB_DB=vault", "INFLUXDB_DB=vault",
"INFLUXDB_ADMIN_USER=" + c.Username, "INFLUXDB_ADMIN_USER=" + c.Username,