From 7c9ffde932bcd6e7bb1cde2861243f483ac0e97d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Krist=C3=B3f=20T=C3=B3th?= Date: Fri, 23 Mar 2018 15:05:56 +0100 Subject: [PATCH] Update magic starter to support new baseimage --- tfw_magic_start.sh | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/tfw_magic_start.sh b/tfw_magic_start.sh index 7c594a7..0452eeb 100755 --- a/tfw_magic_start.sh +++ b/tfw_magic_start.sh @@ -5,14 +5,15 @@ set -e SCRIPT_DIR="$(dirname $($readlink_cmd -f $0))" TAO_PATH="${TAO_PATH:-$SCRIPT_DIR/..}" -BACKEND_REPO="${BACKEND_REPO:-tutorial-framework-wip}" -FRONTEND_REPO="${FRONTEND_REPO:-tutorial-framework-ng}" +BACKEND_REPO="${BACKEND_REPO:-test-tutorial-framework}" +FRONTEND_REPO="${FRONTEND_REPO:-frontend-tutorial-framework}" BACKEND_PATH="${TAO_PATH}/${BACKEND_REPO}" FRONTEND_PATH="${TAO_PATH}/${FRONTEND_REPO}" -IMAGE_NAME="${IMAGE_NAME:-tfw}" +IMAGE_NAME="${IMAGE_NAME:-baseimage-tutorial-framework}" BACKEND_PORT="${BACKEND_PORT:-8888}" AVATAO_SECRET="${AVATAO_SECRET:-secret}" +BUILD_CONTEXT="${BUILD_CONTEXT:-solvable}" function run_frontend() { @@ -23,7 +24,7 @@ function run_frontend() function run_backend() { cd $BACKEND_PATH - docker build -t $IMAGE_NAME . + docker build -t $IMAGE_NAME -f ${BUILD_CONTEXT}/Dockerfile --build-arg BUILD_CONTEXT=$BUILD_CONTEXT --build-arg NOFRONTEND=1 . docker run --rm -p $BACKEND_PORT:$BACKEND_PORT -e AVATAO_SECRET=$AVATAO_SECRET $IMAGE_NAME }