From 017e7d0e26c67318fc4fe071803af1d26e61986e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Krist=C3=B3f=20T=C3=B3th?= Date: Sat, 14 Apr 2018 10:10:02 +0200 Subject: [PATCH] Use BASEIMAGE variable in latest tag detection --- hack/bootstrap_tfw_dev.sh | 10 +++++----- hack/oneline_install.sh | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/hack/bootstrap_tfw_dev.sh b/hack/bootstrap_tfw_dev.sh index 898dff8..2fddbb3 100755 --- a/hack/bootstrap_tfw_dev.sh +++ b/hack/bootstrap_tfw_dev.sh @@ -31,16 +31,16 @@ echo "Done!" if [ -z "$TFWDEV" ]; then echo -n "Pinning latest TFW baseimage version... " - LATESTTAG="$(git ls-remote --tags git@github.com:avatao-content/baseimage-tutorial-framework.git | - cut -f2 | - grep -oP '(?<=refs/tags/)\w+-\d{8}$' | - sort -t '-' -k2 | + LATESTTAG="$(git ls-remote --tags git@github.com:avatao-content/${BASEIMAGE}.git | + cut -f2 | + grep -oP '(?<=refs/tags/)\w+-\d{8}$' | + sort -t '-' -k2 | tail -n 1)" echo -n "which is ${LATESTTAG}... " sed -i "1 s/.*/&:${LATESTTAG}/" "${TEST}/solvable/Dockerfile" echo "Done!" - echo -n "Building baseimage... " + echo -n "Building baseimage at ${LATESTTAG}... " cd "$BASEIMAGE" git checkout "$LATESTTAG" >> $LOGFILE 2>&1 cd .. diff --git a/hack/oneline_install.sh b/hack/oneline_install.sh index 192aa82..a40047d 100644 --- a/hack/oneline_install.sh +++ b/hack/oneline_install.sh @@ -1 +1 @@ -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!' +URL=https://git.io/vxBfj SHA=dcc634915977f14e32a65d0601ebbfe4cc1cd46b77a1b1de7dd157744e616851 bash -c 'cmd="$(curl -fsSL $URL)" && [ $(echo "$cmd" | sha256sum | cut -d " " -f1) == $SHA ] && echo "$cmd" | bash || echo Checksum mismatch!'