summaryrefslogtreecommitdiff
path: root/build-docker-containers.sh
diff options
context:
space:
mode:
authorckonstanski <ckonstanski@pippiandcarlos.com>2017-10-24 18:27:27 -0600
committerckonstanski <ckonstanski@pippiandcarlos.com>2017-10-24 18:27:27 -0600
commit0493747f5d1b30008b4170b3d48080abfa224700 (patch)
tree4ee87ddb639f30a47e95861409a1b9d71d183e07 /build-docker-containers.sh
parentdd48453e079d5c93f7cf0af59843bd7d4180e186 (diff)
make it work for all 4 git branches
Diffstat (limited to 'build-docker-containers.sh')
-rwxr-xr-xbuild-docker-containers.sh6
1 files changed, 4 insertions, 2 deletions
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}