From 402961394e6cb0678629eadba25822dc82448528 Mon Sep 17 00:00:00 2001 From: Mario Alfredo Carrillo Arevalo Date: Tue, 30 Oct 2018 16:46:04 -0600 Subject: [PATCH] Update Makefile 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 --- Makefile | 27 ++++----------------------- 1 file changed, 4 insertions(+), 23 deletions(-) diff --git a/Makefile b/Makefile index ffe894c4..c4ebff49 100644 --- a/Makefile +++ b/Makefile @@ -11,31 +11,12 @@ NULL := $(shell bash -c "source buildrc; set | sed -E '/^[[:alnum:]_]+/s/=/:=/' include .makeenv 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_TAG := local/$(MYUNAME)-stx-builder:7.3 -TC_DOCKERFILE := Dockerfile.centos73.TC-builder +TC_CONTAINER_TAG := local/$(MYUNAME)-stx-builder:7.4 +TC_DOCKERFILE := Dockerfile - -# 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: +all: docker build \ --build-arg MYUID=$(UID) \ --build-arg MYUNAME=$(MYUNAME) \ @@ -60,4 +41,4 @@ env: @echo "LOCALDISK=${LOCALDISK}" @echo "GUEST_LOCALDISK=${GUEST_LOCALDISK}" -.PHONY: base-build base-clean build clean env +.PHONY: all clean env