summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZuul <zuul@review.openstack.org>2019-03-07 14:04:16 +0000
committerGerrit Code Review <review@openstack.org>2019-03-07 14:04:16 +0000
commitb42087de2692d7db96f83e5f89153ab0c84bf3fa (patch)
treebacf0485c9004ed412a9f323bd9261a4c4a18630
parent24867f34db3fcc2283ea353560b141ce7da41089 (diff)
parent8e32f62bbff6233c9f6590c884fd84cb7e5a87e3 (diff)
Merge "Revert "Revert "Use UBUNTU_BASE_IMAGE instead of BASE_IMAGE"""
-rw-r--r--Makefile4
1 files changed, 2 insertions, 2 deletions
diff --git a/Makefile b/Makefile
index 1ff8238..5125c40 100644
--- a/Makefile
+++ b/Makefile
@@ -29,7 +29,7 @@ COMMIT ?= $(shell git rev-parse HEAD)
29PYTHON = python3 29PYTHON = python3
30CHARTS := $(patsubst charts/%/.,%,$(wildcard charts/*/.)) 30CHARTS := $(patsubst charts/%/.,%,$(wildcard charts/*/.))
31IMAGE := ${DOCKER_REGISTRY}/${IMAGE_PREFIX}/${IMAGE_NAME}:${IMAGE_TAG} 31IMAGE := ${DOCKER_REGISTRY}/${IMAGE_PREFIX}/${IMAGE_NAME}:${IMAGE_TAG}
32BASE_IMAGE ?= 32UBUNTU_BASE_IMAGE ?=
33 33
34# VERSION INFO 34# VERSION INFO
35GIT_COMMIT = $(shell git rev-parse HEAD) 35GIT_COMMIT = $(shell git rev-parse HEAD)
@@ -99,7 +99,7 @@ run_images: run_armada
99run_armada: build_armada 99run_armada: build_armada
100 ./tools/armada_image_run.sh $(IMAGE) 100 ./tools/armada_image_run.sh $(IMAGE)
101 101
102_BASE_IMAGE_ARG := $(if $(BASE_IMAGE),--build-arg FROM="${BASE_IMAGE}" ,) 102_BASE_IMAGE_ARG := $(if $(UBUNTU_BASE_IMAGE),--build-arg FROM="${UBUNTU_BASE_IMAGE}" ,)
103 103
104.PHONY: build_armada 104.PHONY: build_armada
105build_armada: 105build_armada: