airship/armada
Code Issues Proposed changes

Revert "Use UBUNTU_BASE_IMAGE instead of BASE_IMAGE"

Browse Source 
This reverts commit 5071ef0ca565e09946a6fddc83867222404e8729.

Change-Id: Ic319728902d772e2c3d34a702839501d0d3fdca9
This commit is contained in:
Sean Eagan 2019-02-08 19:16:04 +00:00
parent 5071ef0ca5
commit 074e36ee43
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Makefile
View File

@ -29,7 +29,7 @@ COMMIT ?= $(shell git rev-parse HEAD)
PYTHON = python3 PYTHON = python3
CHARTS := $(patsubst charts/%/.,%,$(wildcard charts/*/.)) CHARTS := $(patsubst charts/%/.,%,$(wildcard charts/*/.))
IMAGE := ${DOCKER_REGISTRY}/${IMAGE_PREFIX}/${IMAGE_NAME}:${IMAGE_TAG} IMAGE := ${DOCKER_REGISTRY}/${IMAGE_PREFIX}/${IMAGE_NAME}:${IMAGE_TAG}
UBUNTU_BASE_IMAGE ?= BASE_IMAGE ?=
# VERSION INFO # VERSION INFO
GIT_COMMIT = $(shell git rev-parse HEAD) GIT_COMMIT = $(shell git rev-parse HEAD)
@ -99,7 +99,7 @@ run_images: run_armada
run_armada: build_armada run_armada: build_armada
./tools/armada_image_run.sh $(IMAGE) ./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 .PHONY: build_armada
build_armada: build_armada: