Add ARGoS service to docker-compose.yml and create Bash script for x1…

…1docker

docker-compose.yml

@@ -5,6 +5,7 @@ services:
         image: hivexplore/client
         ports:
             - 3995:80
+
     server:
         image: hivexplore/server
         command: argos # TODO: Crazyflie vs ARGoS args? How to pass args to Docker Compose?
@@ -13,3 +14,13 @@ services:
         volumes:
             - /tmp/hivexplore:/tmp/hivexplore # TODO: Document this directory
             - /tmp/logs:/hivexplore/logs # TODO: Change server code to use different directory (env variable maybe?)
+
+    argos:
+        image: hivexplore/argos
+        volumes:
+            - $XSOCKET:$XSOCKET
+            - $XAUTHORITY:$XAUTHORITY
+            - /tmp/hivexplore:/tmp/hivexplore # TODO: Document this directory
+        environment:
+            DISPLAY: $DISPLAY
+            XAUTHORITY: $XAUTHORITY

start.sh

@@ -0,0 +1,19 @@
+#!/usr/bin/env bash
+
+# Shell script necessary to initialize x11docker before starting containers
+# with Docker Compose. See https://github.com/mviereck/x11docker/issues/227
+
+function exit_handler() {
+    echo Cleaning up x11docker
+    x11docker --cleanup --quiet
+}
+
+trap exit_handler EXIT
+
+echo Initializing x11docker
+read x_env < <(x11docker --hostdisplay --showenv --quiet)
+echo $x_env
+export $x_env
+
+echo Running Docker Compose
+docker-compose up