From 074e36ee43c0da9ba92ca9e6a4d631495f14538e Mon Sep 17 00:00:00 2001
From: Sean Eagan <sean.eagan@att.com>
Date: Fri, 8 Feb 2019 19:16:04 +0000
Subject: [PATCH] Revert "Use UBUNTU_BASE_IMAGE instead of BASE_IMAGE"

This reverts commit 5071ef0ca565e09946a6fddc83867222404e8729.

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

diff --git a/Makefile b/Makefile
index 5125c40b..1ff8238c 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}
-UBUNTU_BASE_IMAGE ?=
+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 $(UBUNTU_BASE_IMAGE),--build-arg FROM="${UBUNTU_BASE_IMAGE}" ,)
+_BASE_IMAGE_ARG := $(if $(BASE_IMAGE),--build-arg FROM="${BASE_IMAGE}" ,)
 
 .PHONY: build_armada
 build_armada: