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

Remove TFWServer logic (handled in baseimage from now)

Browse Source
This commit is contained in:
Kristóf Tóth
2018-06-29 22:52:39 +02:00
parent 9b3e62852d
commit 6b1fa664c4
4 changed files with 3 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
solvable/Dockerfile
View File

@@ -7,13 +7,13 @@ RUN pip3 install Flask==1.0 \
git+https://github.com/avatao-content/tfwconnector.git#subdirectory=python3 git+https://github.com/avatao-content/tfwconnector.git#subdirectory=python3
# Define variables to use later # Define variables to use later
ENV TFW_SERVER_DIR="/srv/.tfw" \ ENV TFW_EHMAIN_DIR="/srv/.tfw_builtin_ehs" \
TFW_WEBSERVICE_DIR="/srv/webservice" \ TFW_WEBSERVICE_DIR="/srv/webservice" \
TFW_IDE_WD="/home/${AVATAO_USER}/workdir" \ TFW_IDE_WD="/home/${AVATAO_USER}/workdir" \
TFW_TERMINADO_WD="/home/${AVATAO_USER}/workdir" TFW_TERMINADO_WD="/home/${AVATAO_USER}/workdir"
# Copy TFW related stuff to a dedicated directory # Copy TFW related stuff to a dedicated directory
COPY solvable/src ${TFW_SERVER_DIR}/ COPY solvable/src ${TFW_EHMAIN_DIR}/
# Copy webservice to a dedicated directory # Copy webservice to a dedicated directory
COPY solvable/src/webservice/ ${TFW_WEBSERVICE_DIR}/ COPY solvable/src/webservice/ ${TFW_WEBSERVICE_DIR}/

9
solvable/src/tfw_server.py
View File

@@ -1,9 +0,0 @@
from tornado.ioloop import IOLoop
from tfw.networking import TFWServer
from tfw.config import TFWENV
if __name__ == '__main__':
TFWServer().listen(TFWENV.WEB_PORT)
IOLoop.instance().start()

2
solvable/supervisor/event_handler_main.conf
View File

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

4
solvable/supervisor/tfw_server.conf
View File

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