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

Fix format

This commit is contained in:
TBK 2019-07-31 23:49:33 +02:00
parent 7c5c83739d
commit 4e36278ada
No known key found for this signature in database
GPG Key ID: 5FFB25718720C7D7
3 changed files with 49 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
app/docker-entrypoint.sh
View File

@ -16,7 +16,16 @@ echo "Starting Nginx:"
nginx nginx
echo "Getting PPM ready:" echo "Getting PPM ready:"
trapIt () { "$@"& pid="$!"; trap 'kill -INT $pid' INT TERM; while kill -0 $pid > /dev/null 2>&1; do wait $pid; ec="$?"; done; exit $ec;}; trapIt() {
"$@" &
pid="$!"
trap 'kill -INT $pid' INT TERM
while kill -0 $pid >/dev/null 2>&1; do
wait $pid
ec="$?"
done
exit $ec
}
echo "Starting PPM:" echo "Starting PPM:"
trapIt /ppm/vendor/bin/ppm start --ansi --no-interaction --config=ppm.json trapIt /ppm/vendor/bin/ppm start --ansi --no-interaction --config=ppm.json

5
bookstack.sh
View File

@ -2,10 +2,8 @@
# Setup process # Setup process
# Check if .env exists # Check if .env exists
## if not create .env and start guided setup ## if not create .env and start guided setup
### Check dependencies e.g. openssl/libressl ### Check dependencies e.g. openssl/libressl
@ -14,6 +12,3 @@ openssl rand -base64 32
# Check is there is new version and offer to download # Check is there is new version and offer to download
## if .env exists but is and old version then Update and get user input ## if .env exists but is and old version then Update and get user input