Symlink webservice server.py to webide workdir

solvable/Dockerfile

@@ -2,7 +2,7 @@ FROM eu.gcr.io/avatao-challengestore/tutorial-framework
 
 # Define variables to use later
 ENV TFW_SERVER_DIR="/srv/.tfw"                      \
-    TFW_LOGIN_SERVICE_DIR="/srv/login_service"      \
+    TFW_WEBSERVICE_DIR="/srv/login_service"      \
     TFW_IDE_WD="/home/${AVATAO_USER}/workdir"       \
     TFW_TERMINADO_WD="/home/${AVATAO_USER}/workdir"
 
@@ -10,12 +10,12 @@ ENV TFW_SERVER_DIR="/srv/.tfw"                      \
 COPY solvable/src ${TFW_SERVER_DIR}/
 
 # Copy webservice to a dedicated directory
-COPY solvable/src/webservice/ ${TFW_LOGIN_SERVICE_DIR}/
-ADD solvable/src/webservice/frontend-deps.tar ${TFW_LOGIN_SERVICE_DIR}/static
+COPY solvable/src/webservice/ ${TFW_WEBSERVICE_DIR}/
+ADD solvable/src/webservice/frontend-deps.tar ${TFW_WEBSERVICE_DIR}/static
 
-# Create IDE directory, add a file to it and give proper permissions to AVATAO_USER
+# Create IDE directory, symlink server source and give proper permissions to AVATAO_USER
 RUN mkdir -p ${TFW_IDE_WD}                                               &&\
-    echo "This is a file in ${TFW_IDE_WD}" > ${TFW_IDE_WD}/text.txt      &&\
+    ln -s ${TFW_WEBSERVICE_DIR}/server.py ${TFW_IDE_WD}                  &&\
     chown -R ${AVATAO_USER}: ${TFW_IDE_WD} && chmod -R 755 ${TFW_IDE_WD}
 
 # Hide TFW related code from user

solvable/src/event_handler_main.py

@@ -55,7 +55,7 @@ class TestCommands(TerminalCommands):
 
 if __name__ == '__main__':
     # pylint: disable=invalid-name
-    ide = IdeEventHandler(key='ide', allowed_directories=[TFWENV.IDE_WD],
+    ide = IdeEventHandler(key='ide', allowed_directories=[TFWENV.IDE_WD, TFWENV.WEBSERVICE_DIR],
                           directory=TFWENV.IDE_WD, exclude=['*.pyc'])
     terminado = TerminalEventHandler(key='shell', monitor=BashMonitor(TFWENV.HISTFILE))
     terminado.historymonitor.subscribe_callback(cenator)

solvable/supervisor/webservice.conf

@@ -1,5 +1,5 @@
 [program:webservice]
-directory=%(ENV_TFW_LOGIN_SERVICE_DIR)s
+directory=%(ENV_TFW_WEBSERVICE_DIR)s
 environment=BASEURL="/webservice"
 command=python3 server.py
 autostart=true