From 6cf211b71964ca0d6a170045d9ed93cf3df8c6f3 Mon Sep 17 00:00:00 2001
From: Keith Mattix II <keithmattix@microsoft.com>
Date: Thu, 26 Oct 2023 12:20:35 -0500
Subject: [PATCH] Add var to force docker save (#30502)

Signed-off-by: Keith Mattix II <keithmattix@microsoft.com>
---
 ci/do_ci.sh            | 2 +-
 ci/run_envoy_docker.sh | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/ci/do_ci.sh b/ci/do_ci.sh
index 603ddc669bf3..fb008e6ed362 100755
--- a/ci/do_ci.sh
+++ b/ci/do_ci.sh
@@ -624,7 +624,7 @@ case $CI_TARGET in
         fi
         PLATFORMS="$(IFS=, ; echo "${_PLATFORMS[*]}")"
         export DOCKER_PLATFORM="$PLATFORMS"
-        if [[ -z "${DOCKERHUB_PASSWORD}" && "${#_PLATFORMS[@]}" -eq 1 ]]; then
+        if [[ -z "${DOCKERHUB_PASSWORD}" && "${#_PLATFORMS[@]}" -eq 1 && -z $ENVOY_DOCKER_SAVE_IMAGE ]]; then
             # if you are not pushing the images and there is only one platform
             # then load to Docker (ie local build)
             export DOCKER_LOAD_IMAGES=1
diff --git a/ci/run_envoy_docker.sh b/ci/run_envoy_docker.sh
index 558bfcc229ca..33a667d4c913 100755
--- a/ci/run_envoy_docker.sh
+++ b/ci/run_envoy_docker.sh
@@ -126,6 +126,7 @@ docker run --rm \
        -e CI_TARGET_BRANCH \
        -e DOCKERHUB_USERNAME \
        -e DOCKERHUB_PASSWORD \
+       -e ENVOY_DOCKER_SAVE_IMAGE \
        -e ENVOY_STDLIB \
        -e BUILD_REASON \
        -e BAZEL_REMOTE_INSTANCE \