From 0493747f5d1b30008b4170b3d48080abfa224700 Mon Sep 17 00:00:00 2001 From: ckonstanski Date: Tue, 24 Oct 2017 18:27:27 -0600 Subject: make it work for all 4 git branches --- build-docker-containers.sh | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'build-docker-containers.sh') diff --git a/build-docker-containers.sh b/build-docker-containers.sh index 11a8d79..38fbb24 100755 --- a/build-docker-containers.sh +++ b/build-docker-containers.sh @@ -1,5 +1,7 @@ #!/bin/bash +artifact="${1}" +branch="${2}" buildroot="$(pwd)" # clean docker containers @@ -29,10 +31,10 @@ sudo ln -s ${buildroot}/salt /srv/salt cp ${HOME}/config.yaml /srv/bootstrap/ # run salt to create build scripts -sudo /srv/bootstrap/run_salt.sh +sudo /srv/bootstrap/run_salt.sh --branch=${branch} # build new docker containers -sudo /root/openbook_build/ci/build.sh ${1} +sudo /root/openbook_build/ci/build.sh ${artifact} # refresh openbook-v4-installer repo (ansible playbook) pushd ${HOME} -- cgit v1.3