From 0a0eb9d1ec5c5f8bf54b40e82748fee8cee6e53d Mon Sep 17 00:00:00 2001 From: Logan Davis <38335829+logand22@users.noreply.github.com> Date: Mon, 1 Aug 2022 16:19:54 -0500 Subject: [PATCH] Check manifest before attempting to push docker images (#15093) --- Makefile | 7 +++++-- e | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index 02ba0c68c5c40..8713a68f009eb 100644 --- a/Makefile +++ b/Makefile @@ -13,7 +13,6 @@ # Master/dev branch: "1.0.0-dev" VERSION=11.0.0-dev - DOCKER_IMAGE_OPERATOR_CI ?= quay.io/gravitational/teleport-operator-ci DOCKER_IMAGE_QUAY ?= quay.io/gravitational/teleport DOCKER_IMAGE_ECR ?= public.ecr.aws/gravitational/teleport @@ -1015,7 +1014,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 ffe8c99e88ed5..24d036d44fe84 160000 --- a/e +++ b/e @@ -1 +1 @@ -Subproject commit ffe8c99e88ed56349b15efa1f887b1fc81042812 +Subproject commit 24d036d44fe8460275e39ebe48c538b42148abc0