From 9b727752edd170f034841b1f88137afe94f1e595 Mon Sep 17 00:00:00 2001 From: Sergiy Markin Date: Tue, 15 Oct 2024 05:17:35 +0000 Subject: [PATCH] Remove ubuntu_focal as image alias Change-Id: I433adb8b9145f8f817ae4f147846e0f18ea2789a --- Makefile | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 03b60869..c7982cad 100644 --- a/Makefile +++ b/Makefile @@ -20,7 +20,7 @@ IMAGE_TAG ?= latest HELM := $(shell realpath $(BUILD_DIR))/helm UBUNTU_BASE_IMAGE ?= DISTRO ?= ubuntu_jammy -DISTRO_ALIAS ?= ubuntu_focal +DISTRO_ALIAS ?= ubuntu_jammy PROXY ?= http://proxy.foo.com:8000 NO_PROXY ?= localhost,127.0.0.1,.svc.cluster.local USE_PROXY ?= false @@ -93,10 +93,12 @@ build_drydock: ifneq ($(DISTRO), $(DISTRO_ALIAS)) docker tag $(IMAGE) $(IMAGE_ALIAS) +ifeq ($(DOCKER_REGISTRY), localhost:5000) + docker push $(IMAGE_ALIAS) +endif endif ifeq ($(DOCKER_REGISTRY), localhost:5000) docker push $(IMAGE) - docker push $(IMAGE_ALIAS) endif ifeq ($(PUSH_IMAGE), true) docker push $(IMAGE)