Browse Source

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 074e36ee43.

Change-Id: I00e57fb64989bd949548a9c9e08ec89762cb8144
changes/82/638282/1
Sean Eagan 3 months ago
parent
commit
8e32f62bbf
1 changed files with 2 additions and 2 deletions
  1. 2
    2
      Makefile

+ 2
- 2
Makefile View File

@@ -29,7 +29,7 @@ COMMIT            ?= $(shell git rev-parse HEAD)
29 29
 PYTHON            = python3
30 30
 CHARTS            := $(patsubst charts/%/.,%,$(wildcard charts/*/.))
31 31
 IMAGE             := ${DOCKER_REGISTRY}/${IMAGE_PREFIX}/${IMAGE_NAME}:${IMAGE_TAG}
32
-BASE_IMAGE        ?=
32
+UBUNTU_BASE_IMAGE ?=
33 33
 
34 34
 # VERSION INFO
35 35
 GIT_COMMIT = $(shell git rev-parse HEAD)
@@ -99,7 +99,7 @@ run_images: run_armada
99 99
 run_armada: build_armada
100 100
 	./tools/armada_image_run.sh $(IMAGE)
101 101
 
102
-_BASE_IMAGE_ARG := $(if $(BASE_IMAGE),--build-arg FROM="${BASE_IMAGE}" ,)
102
+_BASE_IMAGE_ARG := $(if $(UBUNTU_BASE_IMAGE),--build-arg FROM="${UBUNTU_BASE_IMAGE}" ,)
103 103
 
104 104
 .PHONY: build_armada
105 105
 build_armada:

Loading…
Cancel
Save