From 9a155283f1ce4b1e42913d043e5b16f64f808573 Mon Sep 17 00:00:00 2001 From: ChantYuCN Date: Tue, 21 Jun 2022 16:39:26 +0000 Subject: [PATCH] feat: Modify layer build process After compile-layer build, there should be a new container for distro-layer. So do flock-layer. These three layer's environemnt are different. However, the container is hard to change environment after launched. So, Three layers, three environments and three containers. The process is cp localrc-compiler localrc ./tb.sh env ./tb.sh run ./tb.sh exec cp localrc-distro localrc ./tb.sh env ./tb.sh run ./tb.sh exec docker ps | awk 'NR>1{print $12}' stx-distro-centos-builder stx-compiler-centos-builder Signed-off-by: ChantYuCN Change-Id: Ibded97dbc9f7541b0a7f0f8c71fb90816510a8b6 --- localrc-compiler | 6 ++++++ localrc-distro | 6 ++++++ localrc-flock | 6 ++++++ tb.sh | 2 +- 4 files changed, 19 insertions(+), 1 deletion(-) create mode 100644 localrc-compiler create mode 100644 localrc-distro create mode 100644 localrc-flock diff --git a/localrc-compiler b/localrc-compiler new file mode 100644 index 00000000..b342f96f --- /dev/null +++ b/localrc-compiler @@ -0,0 +1,6 @@ +MYPROJECTNAME=starlingx +MYUNAME=`whoami` +PROJECT=compiler +HOST_PREFIX=$HOME/starlingx/workspace +HOST_MIRROR_DIR=$HOME/starlingx/mirror +LAYER=compiler diff --git a/localrc-distro b/localrc-distro new file mode 100644 index 00000000..75c87c6b --- /dev/null +++ b/localrc-distro @@ -0,0 +1,6 @@ +MYPROJECTNAME=starlingx +MYUNAME=`whoami` +PROJECT=distro +HOST_PREFIX=$HOME/starlingx/workspace +HOST_MIRROR_DIR=$HOME/starlingx/mirror +LAYER=distro diff --git a/localrc-flock b/localrc-flock new file mode 100644 index 00000000..e1327513 --- /dev/null +++ b/localrc-flock @@ -0,0 +1,6 @@ +MYPROJECTNAME=starlingx +MYUNAME=`whoami` +PROJECT=flock +HOST_PREFIX=$HOME/starlingx/workspace +HOST_MIRROR_DIR=$HOME/starlingx/mirror +LAYER=flock diff --git a/tb.sh b/tb.sh index e1b86ef5..56782c8e 100755 --- a/tb.sh +++ b/tb.sh @@ -21,7 +21,7 @@ fi CMD=$1 -TC_CONTAINER_NAME=${MYUNAME}-centos-builder +TC_CONTAINER_NAME=${MYUNAME}-${LAYER}-centos-builder TC_CONTAINER_TAG=local/${MYUNAME}-stx-builder:7.8 TC_DOCKERFILE=Dockerfile NO_CACHE=0