From 404ab5a28b931d32e479de58682af728f87672d5 Mon Sep 17 00:00:00 2001
From: Logan Davis <38335829+logand22@users.noreply.github.com>
Date: Mon, 1 Aug 2022 16:43:13 -0500
Subject: [PATCH] [v10] Check manifest before attempting to push docker images
 (#15095)

---
 Makefile | 6 +++++-
 e        | 2 +-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/Makefile b/Makefile
index d3b845a9164f3..626446532a534 100644
--- a/Makefile
+++ b/Makefile
@@ -1009,7 +1009,11 @@ image-ci: clean docker-binaries
 
 .PHONY: publish-ci
 publish-ci: image-ci
-	docker push $(DOCKER_IMAGE_STAGING):$(VERSION)
+	@if DOCKER_CLI_EXPERIMENTAL=enabled docker manifest inspect $(DOCKER_IMAGE_STAGING):$(VERSION) 2>&1 >/dev/null; then\
+		echo "$(DOCKER_IMAGE_STAGING):$(VERSION) already exists. ";     \
+	else                                                                \
+		docker push $(DOCKER_IMAGE_STAGING):$(VERSION);                 \
+	fi
 	if [ -f e/Makefile ]; then $(MAKE) -C e publish-ci; fi
 
 # Docker image build for Teleport Operator
diff --git a/e b/e
index 174c1c8b5de51..918cf9becf9fb 160000
--- a/e
+++ b/e
@@ -1 +1 @@
-Subproject commit 174c1c8b5de51491561a4aec5ab2125e5be6ba2b
+Subproject commit 918cf9becf9fbd11515ef1add8a35621d82e960a