diff --git a/hack/bootstrap_tfw_dev.sh b/hack/bootstrap_tfw_dev.sh index 3adc14d..078c09a 100755 --- a/hack/bootstrap_tfw_dev.sh +++ b/hack/bootstrap_tfw_dev.sh @@ -20,7 +20,6 @@ echo -n "Cloning TFW repositories... " 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!" -echo echo -n "Installing frontend dependencies... " cd ${FRONTEND} @@ -29,17 +28,21 @@ cd .. echo "Done!" if [ -z "$TFWDEV" ]; then + echo -n "Pinning latest TFW baseimage version... " TFWURL=https://registry.hub.docker.com/v1/repositories/avatao/tutorial-framework/tags PYTHON_PARSEJSON="import sys, json; print json.load(sys.stdin)[-1]['name']" LATESTTAG="$(curl -fsSL ${TFWURL} | python -c "${PYTHON_PARSEJSON}")" $sed_cmd -i "1 s/.*/&:${LATESTTAG}/" "${TEST}/solvable/Dockerfile" + echo "Done!" rm -rf "${TEST}/.git" rm -rf "${FRONTEND}/.git" + echo -n "Merging repositories... " NESTED_FRONTEND="${TEST}/solvable/frontend" rm -rf $NESTED_FRONTEND mv "$FRONTEND" "$NESTED_FRONTEND" + echo "Done!" fi echo diff --git a/hack/oneline_install.sh b/hack/oneline_install.sh index 1338e11..9679133 100644 --- a/hack/oneline_install.sh +++ b/hack/oneline_install.sh @@ -1 +1 @@ -URL=https://git.io/vxBfj SHA=b0acf85933764cd11c1755dc05b317c14d28b23b7312621d1a1433a8362b75f0 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=835ef74695dfcc1003376a19f5e67a9363ab875e4360651aafe7a2597134cc0b bash -c 'cmd="$(curl -fsSL $URL)" && [ $(echo "$cmd" | sha256sum | cut -d " " -f1) == $SHA ] && echo "$cmd" | bash || echo Checksum mismatch!'