From 83b05a5a538c4052ef3c7ee161aba7f5aca6be2e Mon Sep 17 00:00:00 2001 From: Logan Davis Date: Mon, 1 Aug 2022 13:33:57 -0500 Subject: [PATCH 1/5] Check for existing manifest --- Makefile | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 02ba0c68c5c40..45f9f52fcd389 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 manifest inspect $(DOCKER_IMAGE_STAGING):$(VERSION); 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 From 099c9c7365e4e9a18b20345410d529622ee79c0c Mon Sep 17 00:00:00 2001 From: Logan Davis Date: Mon, 1 Aug 2022 13:35:11 -0500 Subject: [PATCH 2/5] Updated e commit --- e | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/e b/e index ffe8c99e88ed5..84654ea7ecf9a 160000 --- a/e +++ b/e @@ -1 +1 @@ -Subproject commit ffe8c99e88ed56349b15efa1f887b1fc81042812 +Subproject commit 84654ea7ecf9a96c2e9de7d0e11fb849bb8e9dfd From 46f81eb2535cae7a97d1e20584cb57cf4759148f Mon Sep 17 00:00:00 2001 From: Logan Davis Date: Mon, 1 Aug 2022 13:57:53 -0500 Subject: [PATCH 3/5] Updated e commit --- e | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/e b/e index 84654ea7ecf9a..89ea60a70eb5a 160000 --- a/e +++ b/e @@ -1 +1 @@ -Subproject commit 84654ea7ecf9a96c2e9de7d0e11fb849bb8e9dfd +Subproject commit 89ea60a70eb5ab1b2de3acd03ee1bcf92370b1df From fdfdc6e938f0a86ccf0e317e2e38163a92ac458e Mon Sep 17 00:00:00 2001 From: Logan Davis Date: Mon, 1 Aug 2022 13:58:12 -0500 Subject: [PATCH 4/5] Updaetd makefile --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 45f9f52fcd389..8713a68f009eb 100644 --- a/Makefile +++ b/Makefile @@ -1014,7 +1014,7 @@ image-ci: clean docker-binaries .PHONY: publish-ci publish-ci: image-ci - @if docker manifest inspect $(DOCKER_IMAGE_STAGING):$(VERSION); then\ + @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); \ From 0ad02c9a0de88412356ebcf1f32d0820968e7229 Mon Sep 17 00:00:00 2001 From: Logan Davis Date: Mon, 1 Aug 2022 15:24:48 -0500 Subject: [PATCH 5/5] Update e ref --- e | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/e b/e index 89ea60a70eb5a..24d036d44fe84 160000 --- a/e +++ b/e @@ -1 +1 @@ -Subproject commit 89ea60a70eb5ab1b2de3acd03ee1bcf92370b1df +Subproject commit 24d036d44fe8460275e39ebe48c538b42148abc0