summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBryan Strassner <strassner.bryan@gmail.com>2019-02-06 16:58:34 -0600
committerBryan Strassner <strassner.bryan@gmail.com>2019-02-06 17:04:02 -0600
commit5071ef0ca565e09946a6fddc83867222404e8729 (patch)
treefb7bd437cf1091b9a401043186290c58aedca56b
parent03dd1f27c1b0827c4a8d309a3b592acef5fde5aa (diff)
Use UBUNTU_BASE_IMAGE instead of BASE_IMAGE
Offering better alignment with some downstream build jobs. Change-Id: Ide49c08df1f1d0ff8cf570500f2285bc152ed32a
Notes
Notes (review): Code-Review+2: Sean Eagan <sean.eagan@att.com> Code-Review+1: Drew Walters <drewwalters96@gmail.com> Code-Review+2: Aaron Sheffield <ajs@sheffieldfamily.net> Workflow+1: Aaron Sheffield <ajs@sheffieldfamily.net> Verified+2: Zuul Submitted-by: Zuul Submitted-at: Thu, 07 Feb 2019 20:56:40 +0000 Reviewed-on: https://review.openstack.org/635353 Project: openstack/airship-armada Branch: refs/heads/master
-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: