From b57735dfa0bba14446552eb2453db38917a71803 Mon Sep 17 00:00:00 2001
From: jwijenbergh <jeroenwijenbergh@protonmail.com>
Date: Fri, 25 Mar 2022 13:04:23 +0100
Subject: Wait for pid to finish instead of sleeping

---
 ci/docker/docker-compose.yml | 1 -
 ci/docker/starteduvpn.sh     | 3 ++-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'ci/docker')

diff --git a/ci/docker/docker-compose.yml b/ci/docker/docker-compose.yml
index 6563fba..f924571 100644
--- a/ci/docker/docker-compose.yml
+++ b/ci/docker/docker-compose.yml
@@ -16,7 +16,6 @@ services:
     build:
       context: "."
       dockerfile: 'ci/docker/eduvpn-server.docker'
-    tty: true
     sysctls:
       - net.ipv6.conf.all.disable_ipv6=0
     networks:
diff --git a/ci/docker/starteduvpn.sh b/ci/docker/starteduvpn.sh
index cddf88c..39eb53e 100644
--- a/ci/docker/starteduvpn.sh
+++ b/ci/docker/starteduvpn.sh
@@ -15,10 +15,11 @@ systemctl start httpd
 systemctl start crond
 
 vpn-daemon &
+pid_daemon=$!
 sleep 5
 
 vpn-maint-apply-changes
 
 sudo -u apache vpn-user-portal-account --add "${PORTAL_USER}" --password "${PORTAL_PASS}"
 
-sleep infinity
+wait $pid_daemon
-- 
cgit v1.2.3