diff options
| author | jwijenbergh <jeroenwijenbergh@protonmail.com> | 2022-03-25 13:04:23 +0100 |
|---|---|---|
| committer | jwijenbergh <jeroenwijenbergh@protonmail.com> | 2022-03-25 13:04:23 +0100 |
| commit | b57735dfa0bba14446552eb2453db38917a71803 (patch) | |
| tree | 2dd3c7ec1b2e359512f3652d4187069f1f15526a /ci/docker | |
| parent | 513b400277fe14e4a5b0bb84c41b2faaac3e2338 (diff) | |
Wait for pid to finish instead of sleeping
Diffstat (limited to 'ci/docker')
| -rw-r--r-- | ci/docker/docker-compose.yml | 1 | ||||
| -rw-r--r-- | ci/docker/starteduvpn.sh | 3 |
2 files changed, 2 insertions, 2 deletions
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 |