From 95495a54c2d780fac2f7b17f8b8e96120babe6e2 Mon Sep 17 00:00:00 2001 From: Flynn Date: Wed, 4 Dec 2024 22:52:38 -0500 Subject: [PATCH] Switch to the GCR mirror for the base Envoy image Signed-off-by: Flynn --- _cxx/envoy.mk | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/_cxx/envoy.mk b/_cxx/envoy.mk index 5d62a91d25..034a22dd5a 100644 --- a/_cxx/envoy.mk +++ b/_cxx/envoy.mk @@ -24,7 +24,8 @@ BASE_ENVOY_RELVER ?= 0 FIPS_MODE ?= export FIPS_MODE -ENVOY_DOCKER_REPO ?= docker.io/emissaryingress/base-envoy +# ENVOY_DOCKER_REPO ?= docker.io/emissaryingress/base-envoy +ENVOY_DOCKER_REPO ?= gcr.io/datawire/ambassador-base ENVOY_DOCKER_VERSION ?= $(BASE_ENVOY_RELVER).$(ENVOY_COMMIT).$(ENVOY_COMPILATION_MODE)$(if $(FIPS_MODE),.FIPS) ENVOY_DOCKER_TAG ?= $(ENVOY_DOCKER_REPO):envoy-$(ENVOY_DOCKER_VERSION) # END LIST OF VARIABLES REQUIRING `make update-base`. @@ -40,8 +41,8 @@ ENVOY_DOCKER_TAG ?= $(ENVOY_DOCKER_REPO):envoy-$(ENVOY_DOCKER_VERSION) ENVOY_GO_CONTROL_PLANE_COMMIT = f888b4f71207d0d268dee7cb824de92848da9ede # Set ENVOY_DOCKER_REPO to the list of mirrors to check -ENVOY_DOCKER_REPOS = docker.io/emissaryingress/base-envoy -ENVOY_DOCKER_REPOS += gcr.io/datawire/ambassador-base +# ENVOY_DOCKER_REPOS = docker.io/emissaryingress/base-envoy +# ENVOY_DOCKER_REPOS += gcr.io/datawire/ambassador-base # Intro include $(OSS_HOME)/build-aux/prelude.mk