diff --git a/docker-compose.argos.yml b/docker-compose.argos.yml new file mode 100644 index 0000000..48566c3 --- /dev/null +++ b/docker-compose.argos.yml @@ -0,0 +1,21 @@ +version: "3.8" + +services: + server: + command: argos + volumes: + - socket:/tmp/hivexplore # TODO: Document this directory # TODO: Check if /tmp/ is conventional for socket location inside container + + argos: + build: ./argos + image: hivexplore/argos + volumes: + - $XSOCKET:$XSOCKET + - $XAUTHORITY:$XAUTHORITY + - socket:/tmp/hivexplore # TODO: Document this directory + environment: + DISPLAY: $DISPLAY + XAUTHORITY: $XAUTHORITY + +volumes: + socket: diff --git a/docker-compose.drone.yml b/docker-compose.drone.yml new file mode 100644 index 0000000..600f6ec --- /dev/null +++ b/docker-compose.drone.yml @@ -0,0 +1,6 @@ +version: "3.8" + +services: + server: + devices: + - /dev/bus/usb diff --git a/docker-compose.yml b/docker-compose.yml index fb80cb3..8ee6971 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,14 +1,5 @@ version: "3.8" -x-server: - &server-base - build: ./server - image: hivexplore/server - ports: - - 5678:5678 - volumes: - - logs:/hivexplore/logs # TODO: Change server code to use different directory (env variable maybe?) - services: client: build: ./client @@ -16,35 +7,16 @@ services: ports: - 3995:80 - server_crazyflie: - << : *server-base - profiles: ["crazyflie"] - devices: - - /dev/bus/usb - - server_argos: - << : *server-base - profiles: ["argos"] - command: argos - volumes: - - socket:/tmp/hivexplore # TODO: Document this directory # TODO: Check if /tmp/ is conventional for socket location inside container - - argos: - build: ./argos - image: hivexplore/argos - profiles: ["argos"] + server: + build: ./server + image: hivexplore/server + ports: + - 5678:5678 volumes: - - $XSOCKET:$XSOCKET - - $XAUTHORITY:$XAUTHORITY - - socket:/tmp/hivexplore # TODO: Document this directory - environment: - DISPLAY: $DISPLAY - XAUTHORITY: $XAUTHORITY + - logs:/hivexplore/logs # TODO: Change server code to use different directory (env variable maybe?) volumes: - socket: logs: # TODO: Rename volumes? - # TODO: Multiple volumes or one volume? # TODO: Fix permission issue, maybe this link: https://stackoverflow.com/questions/24288616/permission-denied-on-accessing-host-directory-in-docker - # TODO: Profiles? + diff --git a/start.sh b/start.sh index b0647f6..ed54a5e 100755 --- a/start.sh +++ b/start.sh @@ -16,4 +16,6 @@ echo $x_env export $x_env echo Running Docker Compose -docker-compose up +docker-compose -f docker-compose.yml -f docker-compose.argos.yml up + +# TODO: Arguments