airship
/
maas
Code Issues Proposed changes

Update Makefile individual image build 

This patchset will allow for Jenkins jobs to build each image
using the Jenkins job name.

Change-Id: Ic4dfda4290b6d9ba3f7c95329719abc5fe6545bc
This commit is contained in:
Stacey Fletcher 2017-12-07 16:58:38 -06:00
parent 08c1da5be1
commit 847b7d4965
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
Makefile
View File

@ -27,7 +27,7 @@ USE_PROXY ?= false
# Build all docker images for this project
.PHONY: images
images: build_rack build_region build_cache
images: build_maas-rack-controller build_maas-region-controller build_sstream-cache
# Create tgz of the chart
.PHONY: charts
@ -47,24 +47,24 @@ dry-run: clean
# Make targets intended for use by the primary targets above.
.PHONY: build_rack
build_rack:
.PHONY: build_maas-rack-controller
build_maas-rack-controller:
ifeq ($(USE_PROXY), true)
docker build -t $(IMAGE_PREFIX)/$(MAAS_IMAGE_COMMON)-$(RACK_SUFFIX):$(IMAGE_TAG) -f $(RACK_IMG_DIR)/Dockerfile $(RACK_IMG_DIR) --build-arg http_proxy=$(PROXY) --build-arg https_proxy=$(PROXY)
else
docker build -t $(IMAGE_PREFIX)/$(MAAS_IMAGE_COMMON)-$(RACK_SUFFIX):$(IMAGE_TAG) -f $(RACK_IMG_DIR)/Dockerfile $(RACK_IMG_DIR)
endif
.PHONY: build_region
build_region:
.PHONY: build_maas-region-controller
build_maas-region-controller:
ifeq ($(USE_PROXY), true)
docker build -t $(IMAGE_PREFIX)/$(MAAS_IMAGE_COMMON)-$(REGION_SUFFIX):$(IMAGE_TAG) -f $(REGION_IMG_DIR)/Dockerfile $(REGION_IMG_DIR) --build-arg http_proxy=$(PROXY) --build-arg https_proxy=$(PROXY)
else
docker build -t $(IMAGE_PREFIX)/$(MAAS_IMAGE_COMMON)-$(REGION_SUFFIX):$(IMAGE_TAG) -f $(REGION_IMG_DIR)/Dockerfile $(REGION_IMG_DIR)
endif
.PHONY: build_cache
build_cache:
.PHONY: build_sstream-cache
build_sstream-cache:
ifeq ($(USE_PROXY), true)
docker build -t $(IMAGE_PREFIX)/$(MAAS_IMAGE_COMMON)-$(CACHE_SUFFIX):$(IMAGE_TAG) -f $(CACHE_IMG_DIR)/Dockerfile $(CACHE_IMG_DIR) --build-arg http_proxy=$(PROXY) --build-arg https_proxy=$(PROXY)
else