airship/armada
Code Issues Proposed changes

Revert "Revert "Use UBUNTU_BASE_IMAGE instead of BASE_IMAGE""

Browse Source 
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
This commit is contained in:
Sean Eagan 2019-02-20 22:34:47 +00:00
parent 074e36ee43
commit 8e32f62bbf
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
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: