From 5071ef0ca565e09946a6fddc83867222404e8729 Mon Sep 17 00:00:00 2001
From: Bryan Strassner <strassner.bryan@gmail.com>
Date: Wed, 6 Feb 2019 16:58:34 -0600
Subject: [PATCH] Use UBUNTU_BASE_IMAGE instead of BASE_IMAGE

Offering better alignment with some downstream build jobs.

Change-Id: Ide49c08df1f1d0ff8cf570500f2285bc152ed32a
---
 Makefile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Makefile b/Makefile
index 1ff8238c..5125c40b 100644
--- a/Makefile
+++ b/Makefile
@@ -29,7 +29,7 @@ COMMIT            ?= $(shell git rev-parse HEAD)
 PYTHON            = python3
 CHARTS            := $(patsubst charts/%/.,%,$(wildcard charts/*/.))
 IMAGE             := ${DOCKER_REGISTRY}/${IMAGE_PREFIX}/${IMAGE_NAME}:${IMAGE_TAG}
-BASE_IMAGE        ?=
+UBUNTU_BASE_IMAGE ?=
 
 # VERSION INFO
 GIT_COMMIT = $(shell git rev-parse HEAD)
@@ -99,7 +99,7 @@ run_images: run_armada
 run_armada: build_armada
 	./tools/armada_image_run.sh $(IMAGE)
 
-_BASE_IMAGE_ARG := $(if $(BASE_IMAGE),--build-arg FROM="${BASE_IMAGE}" ,)
+_BASE_IMAGE_ARG := $(if $(UBUNTU_BASE_IMAGE),--build-arg FROM="${UBUNTU_BASE_IMAGE}" ,)
 
 .PHONY: build_armada
 build_armada: