mrtoth/test-tutorial-framework
1
0
Fork 0
mirror of https://github.com/avatao-content/test-tutorial-framework synced 2024-07-08 13:28:46 +00:00
Code Issues Releases Wiki Activity

Improve code formatting

Browse Source
This commit is contained in:
Kristóf Tóth 2018-03-31 20:54:12 +02:00
parent 797099086d
commit 30fa734711
1 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
hack/tfw.sh
View File

@ -22,7 +22,9 @@ build_baseimage()
{ {
[ ! -d "$BASEIMAGE_PATH" ] && return || : [ ! -d "$BASEIMAGE_PATH" ] && return || :
cd $BASEIMAGE_PATH cd $BASEIMAGE_PATH
docker build -t "${BASEIMAGE_NAME}:$(baseimage_releasename)" -t "${BASEIMAGE_NAME}:latest" . docker build -t "${BASEIMAGE_NAME}:$(baseimage_releasename)" \
-t "${BASEIMAGE_NAME}:latest" \
.
} }
release_baseimage() release_baseimage()
@ -49,12 +51,18 @@ build_test()
{ {
build_baseimage build_baseimage
cd $TEST_PATH cd $TEST_PATH
docker build -t $IMAGE_NAME -f ${BUILD_CONTEXT}/Dockerfile --build-arg BUILD_CONTEXT=$BUILD_CONTEXT --build-arg NOFRONTEND=1 . docker build -t $IMAGE_NAME \
-f ${BUILD_CONTEXT}/Dockerfile \
--build-arg BUILD_CONTEXT=$BUILD_CONTEXT \
--build-arg NOFRONTEND=1 \
.
} }
run_test() run_test()
{ {
docker run --rm -p $TEST_PORT:$TEST_PORT -e AVATAO_SECRET=$AVATAO_SECRET $IMAGE_NAME docker run --rm \
-p $TEST_PORT:$TEST_PORT \
-e AVATAO_SECRET=$AVATAO_SECRET $IMAGE_NAME
} }
build_and_run_test() build_and_run_test()