starlingx/tools
Code Issues Proposed changes

Update Makefile

Browse Source 
Now the Makefile will be dedicated to build just one docker image,
this commit updates the Makefile rules.

Story: 2003712
Task: 226370
Depends-On: https://review.openstack.org/#/c/601306/

Change-Id: Icaf303ce387cab39eea25c5079e27edb73afad89
Signed-off-by: Mario Alfredo Carrillo Arevalo <mario.alfredo.c.arevalo@intel.com>
This commit is contained in:
Mario Alfredo Carrillo Arevalo 2018-10-30 16:46:04 -06:00
parent 9ffc055d76
commit 402961394e
1 changed files with 4 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
Makefile
View File

@ -11,31 +11,12 @@ NULL := $(shell bash -c "source buildrc; set | sed -E '/^[[:alnum:]_]+/s/=/:=/'
include .makeenv include .makeenv
MYUNAME ?= $(USER) MYUNAME ?= $(USER)
BASE_CONTAINER := centos73
BASE_CONTAINER_TAG := local/dev-centos:7.3
BASE_DOCKERFILE := Dockerfile.centos73
TC_CONTAINER_NAME := $(MYUNAME)-centos-builder TC_CONTAINER_NAME := $(MYUNAME)-centos-builder
TC_CONTAINER_TAG := local/$(MYUNAME)-stx-builder:7.3 TC_CONTAINER_TAG := local/$(MYUNAME)-stx-builder:7.4
TC_DOCKERFILE := Dockerfile.centos73.TC-builder TC_DOCKERFILE := Dockerfile
all:
# Base CentOS container
base-build:
docker build \
--ulimit core=0 \
--network host \
-t $(BASE_CONTAINER_TAG) \
-f $(BASE_DOCKERFILE) \
.
base-clean:
docker image rm $(BASE_CONTAINER_TAG)
# TC builder container
build:
docker build \ docker build \
--build-arg MYUID=$(UID) \ --build-arg MYUID=$(UID) \
--build-arg MYUNAME=$(MYUNAME) \ --build-arg MYUNAME=$(MYUNAME) \
@ -60,4 +41,4 @@ env:
@echo "LOCALDISK=${LOCALDISK}" @echo "LOCALDISK=${LOCALDISK}"
@echo "GUEST_LOCALDISK=${GUEST_LOCALDISK}" @echo "GUEST_LOCALDISK=${GUEST_LOCALDISK}"
.PHONY: base-build base-clean build clean env .PHONY: all clean env