From 78fd31e2aa3d209d4082dbb19c54932deaf19ce1 Mon Sep 17 00:00:00 2001
From: Charlotte Van Petegem <charlotte@vanpetegem.me>
Date: Thu, 7 May 2020 10:36:53 +0200
Subject: [PATCH] Rework docker container script for dodona

---
 shells/dodona.nix | 20 +++++++++++++-------
 1 file changed, 13 insertions(+), 7 deletions(-)

diff --git a/shells/dodona.nix b/shells/dodona.nix
index 38c5cc10..c9e27003 100644
--- a/shells/dodona.nix
+++ b/shells/dodona.nix
@@ -11,16 +11,22 @@ pkgs.mkShell {
     zlib
     (
       pkgs.writeScriptBin "start-db" ''
-        #!${zsh}/bin/zsh
+        #!${bash}/bin/bash
 
-        trap "docker stop dodona-db" 0
-        trap "docker stop dodona-cache" 0
+        function stopdockers {
+          docker stop dodona-db
+          docker stop dodona-cache
+        }
 
-        docker run --name dodona-db -p 3306:3306 --rm -v dodona-db-data:/var/lib/mysql -e MYSQL_ROOT_PASSWORD=dodona mariadb:latest &
-        docker run --name dodona-cache -p 11211:11211 --rm memcached:latest &
+        trap stopdockers 0
 
-        child=$!
-        wait $child
+        docker run -d --name dodona-db -p 3306:3306 --rm -v dodona-db-data:/var/lib/mysql -e MYSQL_ROOT_PASSWORD=dodona mariadb:latest
+        docker run -d --name dodona-cache -p 11211:11211 --rm memcached:latest
+
+        while [ 1 -eq 1 ]
+        do
+          sleep 1000
+        done
       ''
     )
   ];