Skip to content

Commit 1af3448

Browse files
committed
fix DB connect test message (#87)
1 parent df8dd09 commit 1af3448

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

docker/entrypoint.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#!/bin/bash
2-
set -e
2+
set -eo pipefail
33

44
[[ $DEBUG == true ]] && set -x
55

@@ -16,7 +16,7 @@ check_database_connection() {
1616
timeout=60
1717
while ! ${prog} >/dev/null 2>&1
1818
do
19-
timeout=$(expr $timeout - 1)
19+
timeout=$(( $timeout - 1 ))
2020
if [[ $timeout -eq 0 ]]; then
2121
echo
2222
echo "Could not connect to database server. Aborting..."

docker/supervisord.conf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ supervisor.rpcinterface_factory = supervisor.rpcinterface:make_main_rpcinterface
1515
[supervisorctl]
1616
serverurl=unix:///var/run/supervisor.sock ; use a unix:// URL for a unix socket
1717

18-
[program:php-fpm7.0]
18+
[program:php-fpm]
1919
command=/usr/sbin/php5-fpm -c /etc/php5/fpm
2020

2121
[program:cron]

0 commit comments

Comments
 (0)