Use Hashicorp docker proxy for CI docker images (#22195)

* Use Hashicorp docker proxy for CI docker images

* Use library/consul as the mirror path instead of hashicorp/consul

 - Looks like the older 1.4.4 image was not published within the
   hashicorp/consul space, only newer images are.
 - Switch to library/consul which seems to have both versions
This commit is contained in:
Steven Clark
2023-08-03 13:42:20 -04:00
committed by GitHub
parent 689d556b09
commit 3a46df2077
2 changed files with 3 additions and 4 deletions

View File

@@ -127,9 +127,8 @@ func SubtestACMECaddy(configTemplate string, enableEAB bool) func(*testing.T, *V
// Kick off Caddy container.
t.Logf("creating on network: %v", vaultNetwork)
caddyRunner, err := hDocker.NewServiceRunner(hDocker.RunOptions{
// TODO: Replace with pull-through cache. - schultz
ImageRepo: "library/caddy",
ImageTag: "latest",
ImageRepo: "docker.mirror.hashicorp.services/library/caddy",
ImageTag: "2.6.4",
ContainerName: fmt.Sprintf("caddy_test_%s", runID),
NetworkName: vaultNetwork,
Ports: []string{"80/tcp", "443/tcp", "443/udp"},

View File

@@ -55,7 +55,7 @@ func PrepareTestContainer(t *testing.T, version string, isEnterprise bool, doBoo
}
name := "consul"
repo := "consul"
repo := "docker.mirror.hashicorp.services/library/consul"
var envVars []string
// If running the enterprise container, set the appropriate values below.
if isEnterprise {