airship
/
armada
Code Issues Proposed changes

Merge "Revert "Use UBUNTU_BASE_IMAGE instead of BASE_IMAGE""

This commit is contained in:
Zuul 2019-02-08 21:28:06 +00:00 committed by Gerrit Code Review
parent 623c5056d8 074e36ee43
commit aa90e5c17e
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}
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: