From d9a26320220b4a3be19d82ba66e0178811efb232 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Krist=C3=B3f=20T=C3=B3th?= Date: Tue, 27 Mar 2018 15:44:08 +0200 Subject: [PATCH] Remove build phase from TFW bootstrap script --- hack/bootstrap_tfw_dev.sh | 9 +++------ hack/oneline_install.sh | 2 +- 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/hack/bootstrap_tfw_dev.sh b/hack/bootstrap_tfw_dev.sh index 3e49e2d..a026ac2 100755 --- a/hack/bootstrap_tfw_dev.sh +++ b/hack/bootstrap_tfw_dev.sh @@ -20,14 +20,11 @@ echo -n "test... " && git clone git@github.com:avatao-content/${BACKEND}.git >> echo "Done!" echo -echo -n "Building baseimage and installing frontend dependencies... " -cd $BASEIMAGE -docker build -t $BASEIMAGE . >> $LOGFILE 2>&1 & - -cd ../${FRONTEND} +echo -n "Installing frontend dependencies... " +cd ${FRONTEND} yarn install >> $LOGFILE 2>&1 wait echo "Done!" echo -echo "You can start TFW by executing the ${BACKEND}/hack/tfw_magic_start.sh script." +echo "You can build & start TFW by executing the ${BACKEND}/hack/tfw_magic_start.sh script." diff --git a/hack/oneline_install.sh b/hack/oneline_install.sh index 1133b86..6ee2111 100644 --- a/hack/oneline_install.sh +++ b/hack/oneline_install.sh @@ -1 +1 @@ -URL=https://git.io/vxBfj SHA=8f5be5035c20621b0727ce51d67d591272ed83fe0681f108fb7b2fc29d717df3 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=059d470bc3d87d90118834af484fa94ed2fda4e4db6453d8b1824075f6b5e46e bash -c 'cmd="$(curl -fsSL $URL)" && [ $(echo "$cmd" | sha256sum | cut -d " " -f1) == $SHA ] && echo "$cmd" | bash || echo Checksum mismatch!'