From 25cedbd3d4d13b1ad99d198316e59d434c8d65a7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Krist=C3=B3f=20T=C3=B3th?= Date: Sat, 14 Apr 2018 02:48:26 +0200 Subject: [PATCH] Implement baseimage building of latest tag in bootstrap script --- hack/bootstrap_tfw_dev.sh | 10 +++++++++- hack/oneline_install.sh | 2 +- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/hack/bootstrap_tfw_dev.sh b/hack/bootstrap_tfw_dev.sh index 9f00df3..898dff8 100755 --- a/hack/bootstrap_tfw_dev.sh +++ b/hack/bootstrap_tfw_dev.sh @@ -18,7 +18,7 @@ trap cleanlog EXIT : > $LOGFILE echo -n "Cloning TFW repositories... " -[ ! -z "$TFWDEV" ] && echo -n "baseimage... " && git clone git@github.com:avatao-content/${BASEIMAGE}.git >> $LOGFILE 2>&1 || : +echo -n "baseimage... " && git clone git@github.com:avatao-content/${BASEIMAGE}.git >> $LOGFILE 2>&1 echo -n "frontend... " && git clone git@github.com:avatao-content/${FRONTEND}.git >> $LOGFILE 2>&1 echo -n "test... " && git clone git@github.com:avatao-content/${TEST}.git >> $LOGFILE 2>&1 echo "Done!" @@ -40,6 +40,14 @@ if [ -z "$TFWDEV" ]; then sed -i "1 s/.*/&:${LATESTTAG}/" "${TEST}/solvable/Dockerfile" echo "Done!" + echo -n "Building baseimage... " + cd "$BASEIMAGE" + git checkout "$LATESTTAG" >> $LOGFILE 2>&1 + cd .. + TFWTAG=$LATESTTAG ${TEST}/hack/tfw.sh buildtfw >> $LOGFILE 2>&1 + echo "Done!" + + rm -rf "${BASEIMAGE}" rm -rf "${TEST}/.git" rm -rf "${FRONTEND}/.git" diff --git a/hack/oneline_install.sh b/hack/oneline_install.sh index 75d3cc7..192aa82 100644 --- a/hack/oneline_install.sh +++ b/hack/oneline_install.sh @@ -1 +1 @@ -URL=https://git.io/vxBfj SHA=a782b61bb9bbc28aaae174a0ed31aec35108a11068bc3f91ff33f43e29585ea7 bash -c 'cmd="$(curl -fsSL $URL)" && [ $(echo "$cmd" | sha256sum | cut -d " " -f1) == $SHA ] && echo "$cmd" | bash || echo Checksum mismatch!' +URL=https://git.io/vxBfj SHA=d25b55064dcecaf76e09919bfaae4bc321ec3c4c5c8e868001973af024a41d68 bash -c 'cmd="$(curl -fsSL $URL)" && [ $(echo "$cmd" | sha256sum | cut -d " " -f1) == $SHA ] && echo "$cmd" | bash || echo Checksum mismatch!'