From 8e32f62bbff6233c9f6590c884fd84cb7e5a87e3 Mon Sep 17 00:00:00 2001
From: Sean Eagan <sean.eagan@att.com>
Date: Wed, 20 Feb 2019 22:34:47 +0000
Subject: [PATCH] Revert "Revert "Use UBUNTU_BASE_IMAGE instead of BASE_IMAGE""

Jenkins has now been updated to pass UBUNTU_BASE_IMAGE to armada [0].

[0]: https://review.gerrithub.io/c/att-comdev/cicd/+/443953

This reverts commit 074e36ee43c0da9ba92ca9e6a4d631495f14538e.

Change-Id: I00e57fb64989bd949548a9c9e08ec89762cb8144
---
 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: