From 392c896a4e94af245193c5f5cddeaf33710732ec Mon Sep 17 00:00:00 2001 From: Philipp Holzer Date: Tue, 22 May 2018 21:47:37 +0200 Subject: [PATCH] Fixing `cron.sh` --- README.md | 2 +- develop/apache/cron.sh | 5 +---- develop/fpm-alpine/cron.sh | 5 +---- develop/fpm/cron.sh | 5 +---- stable/apache/cron.sh | 7 ++----- stable/fpm-alpine/cron.sh | 7 ++----- stable/fpm/cron.sh | 7 ++----- 7 files changed, 10 insertions(+), 28 deletions(-) diff --git a/README.md b/README.md index 115f901..319b126 100644 --- a/README.md +++ b/README.md @@ -31,7 +31,7 @@ The apache image contains a webserver and exposes port 80. To start the container type: ```console -$ docker run -d -p 8080:80 --link some-mysql:mysql friendica +$ docker run -d -p 8080:80 --link some-mysql:mysql friendica/server ``` Now you can access the Friendica installation wizard at http://localhost:8080/ from your host system. diff --git a/develop/apache/cron.sh b/develop/apache/cron.sh index e8f064b..8c29dee 100644 --- a/develop/apache/cron.sh +++ b/develop/apache/cron.sh @@ -1,14 +1,11 @@ #!/bin/sh -set -eu - -trap "break;exit" SIGHUP SIGINT SIGTERM +trap "break;exit" HUP INT TERM while [ ! -f /var/www/html/.htconfig.php ]; do sleep 1 done while true; do - cd /var/www/html php -f /var/www/html/bin/worker.php sleep 10m done \ No newline at end of file diff --git a/develop/fpm-alpine/cron.sh b/develop/fpm-alpine/cron.sh index e8f064b..8c29dee 100644 --- a/develop/fpm-alpine/cron.sh +++ b/develop/fpm-alpine/cron.sh @@ -1,14 +1,11 @@ #!/bin/sh -set -eu - -trap "break;exit" SIGHUP SIGINT SIGTERM +trap "break;exit" HUP INT TERM while [ ! -f /var/www/html/.htconfig.php ]; do sleep 1 done while true; do - cd /var/www/html php -f /var/www/html/bin/worker.php sleep 10m done \ No newline at end of file diff --git a/develop/fpm/cron.sh b/develop/fpm/cron.sh index e8f064b..8c29dee 100644 --- a/develop/fpm/cron.sh +++ b/develop/fpm/cron.sh @@ -1,14 +1,11 @@ #!/bin/sh -set -eu - -trap "break;exit" SIGHUP SIGINT SIGTERM +trap "break;exit" HUP INT TERM while [ ! -f /var/www/html/.htconfig.php ]; do sleep 1 done while true; do - cd /var/www/html php -f /var/www/html/bin/worker.php sleep 10m done \ No newline at end of file diff --git a/stable/apache/cron.sh b/stable/apache/cron.sh index e8f064b..432692c 100644 --- a/stable/apache/cron.sh +++ b/stable/apache/cron.sh @@ -1,14 +1,11 @@ #!/bin/sh -set -eu - -trap "break;exit" SIGHUP SIGINT SIGTERM +trap "break;exit" HUP INT TERM while [ ! -f /var/www/html/.htconfig.php ]; do sleep 1 done while true; do - cd /var/www/html - php -f /var/www/html/bin/worker.php + php -f /var/www/html/scripts/worker.php sleep 10m done \ No newline at end of file diff --git a/stable/fpm-alpine/cron.sh b/stable/fpm-alpine/cron.sh index e8f064b..432692c 100644 --- a/stable/fpm-alpine/cron.sh +++ b/stable/fpm-alpine/cron.sh @@ -1,14 +1,11 @@ #!/bin/sh -set -eu - -trap "break;exit" SIGHUP SIGINT SIGTERM +trap "break;exit" HUP INT TERM while [ ! -f /var/www/html/.htconfig.php ]; do sleep 1 done while true; do - cd /var/www/html - php -f /var/www/html/bin/worker.php + php -f /var/www/html/scripts/worker.php sleep 10m done \ No newline at end of file diff --git a/stable/fpm/cron.sh b/stable/fpm/cron.sh index e8f064b..432692c 100644 --- a/stable/fpm/cron.sh +++ b/stable/fpm/cron.sh @@ -1,14 +1,11 @@ #!/bin/sh -set -eu - -trap "break;exit" SIGHUP SIGINT SIGTERM +trap "break;exit" HUP INT TERM while [ ! -f /var/www/html/.htconfig.php ]; do sleep 1 done while true; do - cd /var/www/html - php -f /var/www/html/bin/worker.php + php -f /var/www/html/scripts/worker.php sleep 10m done \ No newline at end of file