mrtoth/test-tutorial-framework
1
0
Fork 0
mirror of https://github.com/avatao-content/test-tutorial-framework synced 2025-11-04 03:52:56 +00:00
Code Issues Releases Wiki Activity

Move TFW stuff to hidden location with proper permissions

Browse Source
This commit is contained in:
Kristóf Tóth
2018-04-19 17:33:12 +02:00
parent 709c61d130
commit d6ff80230f
4 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
hack/tfw.sh
View File

@@ -93,7 +93,7 @@ run_test()
{ {
cd "$TAO_PATH" cd "$TAO_PATH"
mount_baseimage="-v ${BASEIMAGE_PATH}/lib/tfw:/usr/local/lib/tfw" mount_baseimage="-v ${BASEIMAGE_PATH}/lib/tfw:/usr/local/lib/tfw"
mount_test="-v $TEST_PATH/solvable/src:/srv/app" mount_test="-v $TEST_PATH/solvable/src:/srv/.tfw"
mount_volumes="" mount_volumes=""
[ "${HOTRELOAD:-0}" == "1" ] && mount_volumes="${mount_baseimage} ${mount_test}" [ "${HOTRELOAD:-0}" == "1" ] && mount_volumes="${mount_baseimage} ${mount_test}"
docker run --rm \ docker run --rm \

8
solvable/Dockerfile
View File

@@ -1,17 +1,19 @@
FROM eu.gcr.io/avatao-challengestore/tutorial-framework FROM eu.gcr.io/avatao-challengestore/tutorial-framework
ENV TFW_APP_DIR="/srv/app" \ ENV TFW_SERVER_DIR="/srv/.tfw" \
TFW_LOGIN_APP_DIR="/tmp/source_code_server" \ TFW_LOGIN_APP_DIR="/tmp/source_code_server" \
TFW_WEBIDE_WD="/home/${AVATAO_USER}/workdir" \ TFW_WEBIDE_WD="/home/${AVATAO_USER}/workdir" \
TFW_TERMINADO_WD="/home/${AVATAO_USER}/workdir" TFW_TERMINADO_WD="/home/${AVATAO_USER}/workdir"
COPY solvable/src ${TFW_APP_DIR}/ COPY solvable/src ${TFW_SERVER_DIR}/
COPY solvable/src/source_code_server/server.py ${TFW_LOGIN_APP_DIR}/ COPY solvable/src/source_code_server/server.py ${TFW_LOGIN_APP_DIR}/
COPY solvable/src/source_code_server/users.db ${TFW_LOGIN_APP_DIR}/ COPY solvable/src/source_code_server/users.db ${TFW_LOGIN_APP_DIR}/
COPY solvable/src/source_code_server/login_component.py ${TFW_WEBIDE_WD}/ COPY solvable/src/source_code_server/login_component.py ${TFW_WEBIDE_WD}/
RUN chown -R ${AVATAO_USER} ${TFW_WEBIDE_WD} &&\ RUN chown -R ${AVATAO_USER} ${TFW_WEBIDE_WD} &&\
chmod -R 755 ${TFW_WEBIDE_WD} chmod -R 755 ${TFW_WEBIDE_WD} &&\
chown -R root ${TFW_SERVER_DIR} &&\
chmod -R 700 ${TFW_SERVER_DIR}
VOLUME ["/home/${AVATAO_USER}"] VOLUME ["/home/${AVATAO_USER}"]
WORKDIR /home/${AVATAO_USER} WORKDIR /home/${AVATAO_USER}

2
solvable/supervisor/event_handlers.conf
View File

@@ -1,4 +1,4 @@
[program:event_handler_main] [program:event_handler_main]
user=root user=root
directory=%(ENV_TFW_APP_DIR)s directory=%(ENV_TFW_SERVER_DIR)s
command=python3 event_handler_main.py command=python3 event_handler_main.py

2
solvable/supervisor/tfw_server.conf
View File

@@ -1,4 +1,4 @@
[program:tfwserver] [program:tfwserver]
user=root user=root
directory=%(ENV_TFW_APP_DIR)s directory=%(ENV_TFW_SERVER_DIR)s
command=python3 tfw_server.py command=python3 tfw_server.py