From 9569beb73d862f68888f06a616172c80d5f4663c Mon Sep 17 00:00:00 2001 From: hc-github-team-consul-core Date: Thu, 2 Nov 2023 13:13:25 -0500 Subject: [PATCH] Backport of build: ensure we pull through the hashicorp proxy instead of going directly to the docker hub into release/1.16.x (#19485) backport of commit 5ab1e9888e96c8f0af46d5145031456e3a3dd461 Co-authored-by: R.B. Boyer --- build-support/docker/Consul-Dev-Multiarch.dockerfile | 2 +- build-support/docker/Consul-Dev.dockerfile | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build-support/docker/Consul-Dev-Multiarch.dockerfile b/build-support/docker/Consul-Dev-Multiarch.dockerfile index 265a1804c..d42dda62f 100644 --- a/build-support/docker/Consul-Dev-Multiarch.dockerfile +++ b/build-support/docker/Consul-Dev-Multiarch.dockerfile @@ -2,7 +2,7 @@ # SPDX-License-Identifier: MPL-2.0 ARG CONSUL_IMAGE_VERSION=latest -FROM hashicorp/consul:${CONSUL_IMAGE_VERSION} +FROM docker.mirror.hashicorp.services/hashicorp/consul:${CONSUL_IMAGE_VERSION} RUN apk update && apk add iptables ARG TARGETARCH COPY linux_${TARGETARCH}/consul /bin/consul diff --git a/build-support/docker/Consul-Dev.dockerfile b/build-support/docker/Consul-Dev.dockerfile index 122bc3192..830d32b4d 100644 --- a/build-support/docker/Consul-Dev.dockerfile +++ b/build-support/docker/Consul-Dev.dockerfile @@ -2,6 +2,6 @@ # SPDX-License-Identifier: MPL-2.0 ARG CONSUL_IMAGE_VERSION=latest -FROM hashicorp/consul:${CONSUL_IMAGE_VERSION} +FROM docker.mirror.hashicorp.services/hashicorp/consul:${CONSUL_IMAGE_VERSION} RUN apk update && apk add iptables COPY consul /bin/consul