Merge pull request #104 from DSD-DBS/remove-fileservice

Remove fileservice

Makefile

@@ -52,9 +52,6 @@ GIT_PASSWORD ?= password
 # Preferred RDP port on your host system
 RDP_PORT ?= 3390
 
-# Preferred fileservice port on your host system
-FILESYSTEM_PORT ?= 8081
-
 # Preferred metrics port on your host system
 METRICS_PORT ?= 9118
 
@@ -266,7 +263,6 @@ run-t4c/client/remote-legacy: t4c/client/remote
 		-e T4C_SERVER_PORT=$(T4C_SERVER_PORT) \
 		-e T4C_REPOSITORIES=$(T4C_REPOSITORIES) \
 		-e RMT_PASSWORD=$(RMT_PASSWORD) \
-		-e FILESERVICE_PASSWORD=$(RMT_PASSWORD) \
 		-e T4C_USERNAME=$(T4C_USERNAME) \
 		-p $(RDP_PORT):3389 \
 		-p $(FILESYSTEM_PORT):8000 \
@@ -280,7 +276,6 @@ run-t4c/client/remote-json: t4c/client/remote
 		-e T4C_LICENCE_SECRET=$(T4C_LICENCE_SECRET) \
 		-e T4C_JSON=$(T4C_JSON) \
 		-e RMT_PASSWORD=$(RMT_PASSWORD) \
-		-e FILESERVICE_PASSWORD=$(RMT_PASSWORD) \
 		-e T4C_USERNAME=$(T4C_USERNAME) \
 		-p $(RDP_PORT):3389 \
 		-p $(FILESYSTEM_PORT):8000 \
@@ -293,7 +288,6 @@ run-t4c/client/remote/pure-variants: t4c/client/remote/pure-variants
 		-e T4C_LICENCE_SECRET=$(T4C_LICENCE_SECRET) \
 		-e T4C_JSON=$(T4C_JSON) \
 		-e RMT_PASSWORD=$(RMT_PASSWORD) \
-		-e FILESERVICE_PASSWORD=$(RMT_PASSWORD) \
 		-e T4C_USERNAME=$(T4C_USERNAME) \
 		-e PURE_VARIANTS_LICENSE_SERVER=$(PURE_VARIANTS_LICENSE_SERVER) \
 		-v $$(pwd)/volumes/pure-variants:/inputs/pure-variants \

README.md

@@ -263,7 +263,7 @@ The remote images allow to extend the
 - Capella base image (`capella/base`) or
 - the T4C base image (`t4c/client/base`)
 
-with an RDP server, a metrics endpoint to measure the container activity and a fileservice that serves the current workspace structure.
+with an RDP server, a metrics endpoint to measure the container activity.
 
 It is a basic Linux server with an [Openbox](http://openbox.org/) installation.
 
@@ -470,7 +470,6 @@ docker run -d \
     -e T4C_SERVER_PORT=$T4C_SERVER_PORT \
     -e T4C_REPOSITORIES=$T4C_REPOSITORIES \
     -e RMT_PASSWORD=$RMT_PASSWORD \
-    -e FILESERVICE_PASSWORD=$FILESERVICE_PASSWORD \
     -e T4C_USERNAME=$T4C_USERNAME \
     -e AUTOSTART_CAPELLA=$AUTOSTART_CAPELLA \
     -e RESTART_CAPELLA=$RESTART_CAPELLA \
@@ -483,7 +482,6 @@ Please replace the followings variables:
 - `$RMT_PASSWORD` is the password for remote connections (for the login via RDP).
 - `$T4C_LICENCE_SECRET` to your TeamForCapella licence secret.
 - `$T4C_USERNAME` is the username that is suggested when connecting to t4c.
-- `$FILESERVICE_PASSWORD` with the password for the fileservice, which is used as basic authentication password.
 - `AUTOSTART_CAPELLA` defines the auto-start behaviour of Capella. When set to 1 (default), Capella will be started as soon
   as an RDP connection has been established to the running container.
 - `RESTART_CAPELLA` defines the restart behaviour of Capella. When set to 1 (default) and when `AUTOSTART_CAPELLA=1`,

remote/Dockerfile

@@ -56,10 +56,6 @@ RUN pip install prometheus-client
 
 COPY metrics.py .metrics.py
 
-# Run fileservice endpoint
-COPY fastapi /opt/fastapi
-RUN pip install /opt/fastapi
-
 ENV AUTOSTART_CAPELLA=1
 ENV RESTART_CAPELLA=1
 

remote/supervisord.conf

@@ -19,12 +19,6 @@ user=techuser
 autorestart=true
 environment=DISPLAY=":10"
 
-[program:fileservice]
-; Serves the workspace structure
-command=uvicorn fileservice:app --host 0.0.0.0
-user=techuser
-autorestart=true
-
 [supervisord]
 nodaemon=true
 childlogdir=/var/log

tests/test_t4c_repository_injection.py

@@ -16,7 +16,6 @@
 default_env = {
     "T4C_LICENCE_SECRET": "",
     "RMT_PASSWORD": "my_long_password",
-    "FILESERVICE_PASSWORD": "password",
     "T4C_USERNAME": "techuser",
 }