From a1824850c96db55ef7804f08e77ab6d454620bd5 Mon Sep 17 00:00:00 2001
From: TBK <tbk@jjtc.eu>
Date: Wed, 8 Apr 2020 09:20:23 +0200
Subject: [PATCH] Use multirun

---
 app/Dockerfile           | 1 +
 app/docker-entrypoint.sh | 7 ++-----
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/app/Dockerfile b/app/Dockerfile
index 5894d0c..eb591ea 100644
--- a/app/Dockerfile
+++ b/app/Dockerfile
@@ -23,6 +23,7 @@ RUN set -ex \
   && echo "Setting up PHP extensions" \
   && apk add --no-cache \
      curl \
+     multirun \
      nginx \
      tar \
      php7 \
diff --git a/app/docker-entrypoint.sh b/app/docker-entrypoint.sh
index 699f305..8862e77 100644
--- a/app/docker-entrypoint.sh
+++ b/app/docker-entrypoint.sh
@@ -12,9 +12,6 @@ chown -R www-data:bookstack bootstrap/cache public/uploads storage
 php artisan cache:clear
 php artisan view:clear
 
-echo "Starting Nginx:"
-nginx
-
 echo "Getting PPM ready:"
 trapIt() {
     "$@" &
@@ -27,5 +24,5 @@ trapIt() {
     exit $ec
 }
 
-echo "Starting PPM:"
-trapIt /ppm/vendor/bin/ppm start --ansi --no-interaction --config=ppm.json
+echo "Starting Nginx & PPM:"
+multirun nginx trapIt /ppm/vendor/bin/ppm start --ansi --no-interaction --config=ppm.json