airship/drydock
Code Issues Proposed changes

Remove ubuntu_focal as image alias

Browse Source 
Change-Id: I433adb8b9145f8f817ae4f147846e0f18ea2789a
This commit is contained in:
Sergiy Markin 2024-10-15 05:17:35 +00:00
parent c4d60b8527
commit 9b727752ed
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Makefile
View File

@ -20,7 +20,7 @@ IMAGE_TAG ?= latest
HELM := $(shell realpath $(BUILD_DIR))/helm HELM := $(shell realpath $(BUILD_DIR))/helm
UBUNTU_BASE_IMAGE ?= UBUNTU_BASE_IMAGE ?=
DISTRO ?= ubuntu_jammy DISTRO ?= ubuntu_jammy
DISTRO_ALIAS ?= ubuntu_focal DISTRO_ALIAS ?= ubuntu_jammy
PROXY ?= http://proxy.foo.com:8000 PROXY ?= http://proxy.foo.com:8000
NO_PROXY ?= localhost,127.0.0.1,.svc.cluster.local NO_PROXY ?= localhost,127.0.0.1,.svc.cluster.local
USE_PROXY ?= false USE_PROXY ?= false
@ -93,10 +93,12 @@ build_drydock:
ifneq ($(DISTRO), $(DISTRO_ALIAS)) ifneq ($(DISTRO), $(DISTRO_ALIAS))
docker tag $(IMAGE) $(IMAGE_ALIAS) docker tag $(IMAGE) $(IMAGE_ALIAS)
ifeq ($(DOCKER_REGISTRY), localhost:5000)
docker push $(IMAGE_ALIAS)
endif
endif endif
ifeq ($(DOCKER_REGISTRY), localhost:5000) ifeq ($(DOCKER_REGISTRY), localhost:5000)
docker push $(IMAGE) docker push $(IMAGE)
docker push $(IMAGE_ALIAS)
endif endif
ifeq ($(PUSH_IMAGE), true) ifeq ($(PUSH_IMAGE), true)
docker push $(IMAGE) docker push $(IMAGE)