JJTC-Container-Images
/
bookstack-ppm
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Use multirun

This commit is contained in:
TBK 2020-04-08 09:20:23 +02:00
parent 8689818ac9
commit a1824850c9
No known key found for this signature in database
GPG Key ID: 6D4FD19CB66C95EA
2 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
app/Dockerfile
View File

@ -23,6 +23,7 @@ RUN set -ex \
&& echo "Setting up PHP extensions" \ && echo "Setting up PHP extensions" \
&& apk add --no-cache \ && apk add --no-cache \
curl \ curl \
multirun \
nginx \ nginx \
tar \ tar \
php7 \ php7 \

7
app/docker-entrypoint.sh
View File

@ -12,9 +12,6 @@ chown -R www-data:bookstack bootstrap/cache public/uploads storage
php artisan cache:clear php artisan cache:clear
php artisan view:clear php artisan view:clear
echo "Starting Nginx:"
nginx
echo "Getting PPM ready:" echo "Getting PPM ready:"
trapIt() { trapIt() {
"$@" & "$@" &
@ -27,5 +24,5 @@ trapIt() {
exit $ec exit $ec
} }
echo "Starting PPM:" echo "Starting Nginx & PPM:"
trapIt /ppm/vendor/bin/ppm start --ansi --no-interaction --config=ppm.json multirun nginx trapIt /ppm/vendor/bin/ppm start --ansi --no-interaction --config=ppm.json