From 2714b0d72698bb8b5e41acb0a9059c7e7b5af60b Mon Sep 17 00:00:00 2001
From: Ryan Northey <ryan@synca.io>
Date: Tue, 22 Jun 2021 14:56:44 +0100
Subject: [PATCH] ci: Only publish the required docker image

Signed-off-by: Ryan Northey <ryan@synca.io>
---
 ci/docker_ci.sh | 19 ++++++++++++++-----
 1 file changed, 14 insertions(+), 5 deletions(-)

diff --git a/ci/docker_ci.sh b/ci/docker_ci.sh
index f83e1f281a581..b51980febf41e 100755
--- a/ci/docker_ci.sh
+++ b/ci/docker_ci.sh
@@ -71,7 +71,6 @@ build_images() {
       IMAGE_TAG="${BUILD_TAG}-${ARCH/linux\//}"
     fi
     docker buildx build --platform "${ARCH}" "${args[@]}" -t "${IMAGE_TAG}" . --load
-    IMAGES_TO_SAVE+=("${IMAGE_TAG}")
   done
 }
 
@@ -118,13 +117,23 @@ VRP_BASE_IMAGE="${DOCKER_IMAGE_PREFIX}${IMAGE_POSTFIX}:${IMAGE_NAME}"
 # Test the docker build in all cases, but use a local tag that we will overwrite before push in the
 # cases where we do push.
 for BUILD_TYPE in "${BUILD_TYPES[@]}"; do
-  build_images "${BUILD_TYPE}" "${DOCKER_IMAGE_PREFIX}${BUILD_TYPE}${IMAGE_POSTFIX}:${IMAGE_NAME}"
+    image_tag="${DOCKER_IMAGE_PREFIX}${BUILD_TYPE}${IMAGE_POSTFIX}:${IMAGE_NAME}"
+    build_images "${BUILD_TYPE}" "$image_tag"
+
+    if [[ "$BUILD_TYPE" == "" || "$BUILD_TYPE" == "-alpine" ]]; then
+        # verify_examples expects the base and alpine images, and for them to be named `-dev`
+        dev_image="envoyproxy/envoy${BUILD_TYPE}-dev:latest"
+        docker tag "$image_tag" "$dev_image"
+        IMAGES_TO_SAVE+=("$dev_image")
+    fi
 done
 
 mkdir -p "${ENVOY_DOCKER_IMAGE_DIRECTORY}"
-ENVOY_DOCKER_TAR="${ENVOY_DOCKER_IMAGE_DIRECTORY}/envoy-docker-images.tar.xz"
-echo "Saving built images to ${ENVOY_DOCKER_TAR}."
-docker save "${IMAGES_TO_SAVE[@]}" | xz -T0 -2 >"${ENVOY_DOCKER_TAR}"
+if [[ ${#IMAGES_TO_SAVE[@]} -ne 0 ]]; then
+    ENVOY_DOCKER_TAR="${ENVOY_DOCKER_IMAGE_DIRECTORY}/envoy-docker-images.tar.xz"
+    echo "Saving built images to ${ENVOY_DOCKER_TAR}: ${IMAGES_TO_SAVE[*]}"
+    docker save "${IMAGES_TO_SAVE[@]}" | xz -T0 -2 >"${ENVOY_DOCKER_TAR}"
+fi
 
 # Only push images for main builds, release branch builds, and tag builds.
 if [[ "${AZP_BRANCH}" != "${MAIN_BRANCH}" ]] &&