From 68870eb0b62a38f736cfe7c7ec71a4a263c23ada Mon Sep 17 00:00:00 2001 From: Franco Bruno Lavayen Date: Fri, 22 Jul 2022 12:23:11 -0300 Subject: [PATCH] [CONSUL-250] Build/tag Kubernetes/pause image (#24) --- build-support-windows/build-images.sh | 9 +++++++++ test/integration/connect/envoy/run-tests.windows.sh | 2 +- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/build-support-windows/build-images.sh b/build-support-windows/build-images.sh index dd04491c9b..67ccf7fc9f 100644 --- a/build-support-windows/build-images.sh +++ b/build-support-windows/build-images.sh @@ -35,6 +35,15 @@ echo " " echo "Tag Windows Envoy image" docker tag "envoyproxy/envoy-windows:v${ENVOY_VERSION}" "${HASHICORP_DOCKER_PROXY}/windows/envoy-windows:v${ENVOY_VERSION}" +# Pull Kubernetes/pause image +echo " " +echo "Pull Kubernetes/pause image" +docker mcr.microsoft.com/oss/kubernetes/pause:3.6 +# Tag Kubernetes/pause image +echo " " +echo "Tag Kubernetes/pause image" +docker tag mcr.microsoft.com/oss/kubernetes/pause:3.6 "${HASHICORP_DOCKER_PROXY}/windows/kubernetes/pause" + # Build Bats-Core-Windows Image echo " " echo "Build Bats-Core-Windows Image" diff --git a/test/integration/connect/envoy/run-tests.windows.sh b/test/integration/connect/envoy/run-tests.windows.sh index 69584c35bb..d4752a355a 100644 --- a/test/integration/connect/envoy/run-tests.windows.sh +++ b/test/integration/connect/envoy/run-tests.windows.sh @@ -553,7 +553,7 @@ function suite_setup { docker.exe run -d --name envoy_workdir_1 \ $WORKDIR_SNIPPET \ --net=none \ - mcr.microsoft.com/oss/kubernetes/pause:3.6 &>/dev/null + "${HASHICORP_DOCKER_PROXY}/windows/kubernetes/pause" &>/dev/null # TODO(rb): switch back to "${HASHICORP_DOCKER_PROXY}/google/pause" once that is cached # pre-build the verify container