Update Makefiles

platform9 · Sep 24, 2024 · 655b425 · 655b425
1 parent 5d18c93
commit 655b425
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/Makefile b/Makefile
@@ -3,10 +3,12 @@ SHELL=/bin/bash
 #IMG ?= controller:latest
 
 ifndef OVERRIDE_LUIGI_VERSION
-ifneq ($(strip $(OVERRIDE_LUIGI_VERSION)),)
 IMG_TAG = $(shell ./get-label.bash)
 else
+ifneq ($(strip $(OVERRIDE_LUIGI_VERSION)),)
 IMG_TAG ?= $(OVERRIDE_LUIGI_VERSION)
+else
+IMG_TAG = $(shell ./get-label.bash)
 endif
 endif
 IMG_TAG = $(shell ./get-label.bash)

diff --git a/hostplumber/Makefile b/hostplumber/Makefile
@@ -2,10 +2,12 @@ SHELL=/bin/bash
 # Image URL to use all building/pushing image targets
 
 ifndef OVERRIDE_HOSTPLUMBER_VERSION
-ifneq ($(strip $(OVERRIDE_HOSTPLUMBER_VERSION)),)
 IMG_TAG = $(shell ./get-label.bash)
 else
+ifneq ($(strip $(OVERRIDE_HOSTPLUMBER_VERSION)),)
 IMG_TAG ?= $(OVERRIDE_HOSTPLUMBER_VERSION)
+else
+IMG_TAG = $(shell ./get-label.bash)
 endif
 endif
 IMG ?= quay.io/platform9/hostplumber:$(IMG_TAG)