starlingx
/
tools
Code Issues Proposed changes

Merge "Enable multiple docker images per user."

This commit is contained in:
Zuul 2018-10-05 23:46:56 +00:00 committed by Gerrit Code Review
parent 948fd99251 96cfc9860b
commit fa155b63ab
2 changed files with 13 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
Makefile
View File

@ -5,20 +5,21 @@ MY_TC_RELEASE := tis-r5-pike
UID := $(shell id -u)
USER := $(shell id -un)
MYUNAME := builder
BASE_CONTAINER := centos73
BASE_CONTAINER_TAG := local/dev-centos:7.3
BASE_DOCKERFILE := Dockerfile.centos73
TC_CONTAINER_NAME := $(USER)-centos-builder
TC_CONTAINER_TAG := local/$(USER)-stx-builder:7.3
TC_DOCKERFILE := Dockerfile.centos73.TC-builder
# Import the build config
NULL := $(shell bash -c "source buildrc; set | sed -E '/^[[:alnum:]_]+/s/=/:=/' | sed 's/^//' > .makeenv")
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
# Base CentOS container
base-build:

6
tb.sh
View File

@ -21,8 +21,8 @@ fi
CMD=$1
TC_CONTAINER_NAME=${USER}-centos-builder
TC_CONTAINER_TAG=local/${USER}-stx-builder:7.3
TC_CONTAINER_NAME=${MYUNAME}-centos-builder
TC_CONTAINER_TAG=local/${MYUNAME}-stx-builder:7.3
TC_DOCKERFILE=Dockerfile.centos73.TC-builder
function exec_container {
@ -33,7 +33,7 @@ function exec_container {
function run_container {
# create localdisk
mkdir -p ${LOCALDISK}/designer/${USER}/${PROJECT}
mkdir -p ${LOCALDISK}/designer/${MYUNAME}/${PROJECT}
docker run -it --rm \
--name ${TC_CONTAINER_NAME} \