From 331d289aa3b99c9f03a578334cc18cac1720d991 Mon Sep 17 00:00:00 2001 From: nupplaPhil Date: Sun, 5 Jan 2020 01:21:48 +0100 Subject: [PATCH] fixing timeout --- 2019.12/apache/cron.sh | 2 +- 2019.12/apache/entrypoint.sh | 2 +- 2019.12/fpm-alpine/cron.sh | 2 +- 2019.12/fpm-alpine/entrypoint.sh | 2 +- 2019.12/fpm/cron.sh | 2 +- 2019.12/fpm/entrypoint.sh | 2 +- 2020.03-dev/apache/cron.sh | 2 +- 2020.03-dev/apache/entrypoint.sh | 2 +- 2020.03-dev/fpm-alpine/cron.sh | 2 +- 2020.03-dev/fpm-alpine/entrypoint.sh | 2 +- 2020.03-dev/fpm/cron.sh | 2 +- 2020.03-dev/fpm/entrypoint.sh | 2 +- docker-cron.sh | 2 +- docker-entrypoint.sh | 2 +- 14 files changed, 14 insertions(+), 14 deletions(-) diff --git a/2019.12/apache/cron.sh b/2019.12/apache/cron.sh index b57adab..78d6feb 100755 --- a/2019.12/apache/cron.sh +++ b/2019.12/apache/cron.sh @@ -6,7 +6,7 @@ while [ ! -f /var/www/html/bin/daemon.php ]; do done echo "Waiting for MySQL $MYSQL_HOST initialization..." -if run_as "php /var/www/html/bin/wait-for-connection $MYSQL_HOST ${MYSQL_PORT:-3306}" 300; then +if run_as "php /var/www/html/bin/wait-for-connection $MYSQL_HOST ${MYSQL_PORT:-3306} 300"; then exec php /var/www/html/bin/daemon.php -f start else echo "[ERROR] Waited 300 seconds, no response" >&2 diff --git a/2019.12/apache/entrypoint.sh b/2019.12/apache/entrypoint.sh index 2b72298..99b5f4a 100755 --- a/2019.12/apache/entrypoint.sh +++ b/2019.12/apache/entrypoint.sh @@ -118,7 +118,7 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ]; then if [ "$install" = true ]; then echo "Waiting for MySQL $MYSQL_HOST initialization..." - if run_as "php /var/www/html/bin/wait-for-connection $MYSQL_HOST ${MYSQL_PORT:-3306}" 300; then + if run_as "php /var/www/html/bin/wait-for-connection $MYSQL_HOST ${MYSQL_PORT:-3306} 300"; then echo "Starting Friendica installation ..." run_as "php /var/www/html/bin/console.php autoinstall $install_options" diff --git a/2019.12/fpm-alpine/cron.sh b/2019.12/fpm-alpine/cron.sh index b57adab..78d6feb 100755 --- a/2019.12/fpm-alpine/cron.sh +++ b/2019.12/fpm-alpine/cron.sh @@ -6,7 +6,7 @@ while [ ! -f /var/www/html/bin/daemon.php ]; do done echo "Waiting for MySQL $MYSQL_HOST initialization..." -if run_as "php /var/www/html/bin/wait-for-connection $MYSQL_HOST ${MYSQL_PORT:-3306}" 300; then +if run_as "php /var/www/html/bin/wait-for-connection $MYSQL_HOST ${MYSQL_PORT:-3306} 300"; then exec php /var/www/html/bin/daemon.php -f start else echo "[ERROR] Waited 300 seconds, no response" >&2 diff --git a/2019.12/fpm-alpine/entrypoint.sh b/2019.12/fpm-alpine/entrypoint.sh index 2b72298..99b5f4a 100755 --- a/2019.12/fpm-alpine/entrypoint.sh +++ b/2019.12/fpm-alpine/entrypoint.sh @@ -118,7 +118,7 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ]; then if [ "$install" = true ]; then echo "Waiting for MySQL $MYSQL_HOST initialization..." - if run_as "php /var/www/html/bin/wait-for-connection $MYSQL_HOST ${MYSQL_PORT:-3306}" 300; then + if run_as "php /var/www/html/bin/wait-for-connection $MYSQL_HOST ${MYSQL_PORT:-3306} 300"; then echo "Starting Friendica installation ..." run_as "php /var/www/html/bin/console.php autoinstall $install_options" diff --git a/2019.12/fpm/cron.sh b/2019.12/fpm/cron.sh index b57adab..78d6feb 100755 --- a/2019.12/fpm/cron.sh +++ b/2019.12/fpm/cron.sh @@ -6,7 +6,7 @@ while [ ! -f /var/www/html/bin/daemon.php ]; do done echo "Waiting for MySQL $MYSQL_HOST initialization..." -if run_as "php /var/www/html/bin/wait-for-connection $MYSQL_HOST ${MYSQL_PORT:-3306}" 300; then +if run_as "php /var/www/html/bin/wait-for-connection $MYSQL_HOST ${MYSQL_PORT:-3306} 300"; then exec php /var/www/html/bin/daemon.php -f start else echo "[ERROR] Waited 300 seconds, no response" >&2 diff --git a/2019.12/fpm/entrypoint.sh b/2019.12/fpm/entrypoint.sh index 2b72298..99b5f4a 100755 --- a/2019.12/fpm/entrypoint.sh +++ b/2019.12/fpm/entrypoint.sh @@ -118,7 +118,7 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ]; then if [ "$install" = true ]; then echo "Waiting for MySQL $MYSQL_HOST initialization..." - if run_as "php /var/www/html/bin/wait-for-connection $MYSQL_HOST ${MYSQL_PORT:-3306}" 300; then + if run_as "php /var/www/html/bin/wait-for-connection $MYSQL_HOST ${MYSQL_PORT:-3306} 300"; then echo "Starting Friendica installation ..." run_as "php /var/www/html/bin/console.php autoinstall $install_options" diff --git a/2020.03-dev/apache/cron.sh b/2020.03-dev/apache/cron.sh index b57adab..78d6feb 100755 --- a/2020.03-dev/apache/cron.sh +++ b/2020.03-dev/apache/cron.sh @@ -6,7 +6,7 @@ while [ ! -f /var/www/html/bin/daemon.php ]; do done echo "Waiting for MySQL $MYSQL_HOST initialization..." -if run_as "php /var/www/html/bin/wait-for-connection $MYSQL_HOST ${MYSQL_PORT:-3306}" 300; then +if run_as "php /var/www/html/bin/wait-for-connection $MYSQL_HOST ${MYSQL_PORT:-3306} 300"; then exec php /var/www/html/bin/daemon.php -f start else echo "[ERROR] Waited 300 seconds, no response" >&2 diff --git a/2020.03-dev/apache/entrypoint.sh b/2020.03-dev/apache/entrypoint.sh index 2b72298..99b5f4a 100755 --- a/2020.03-dev/apache/entrypoint.sh +++ b/2020.03-dev/apache/entrypoint.sh @@ -118,7 +118,7 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ]; then if [ "$install" = true ]; then echo "Waiting for MySQL $MYSQL_HOST initialization..." - if run_as "php /var/www/html/bin/wait-for-connection $MYSQL_HOST ${MYSQL_PORT:-3306}" 300; then + if run_as "php /var/www/html/bin/wait-for-connection $MYSQL_HOST ${MYSQL_PORT:-3306} 300"; then echo "Starting Friendica installation ..." run_as "php /var/www/html/bin/console.php autoinstall $install_options" diff --git a/2020.03-dev/fpm-alpine/cron.sh b/2020.03-dev/fpm-alpine/cron.sh index b57adab..78d6feb 100755 --- a/2020.03-dev/fpm-alpine/cron.sh +++ b/2020.03-dev/fpm-alpine/cron.sh @@ -6,7 +6,7 @@ while [ ! -f /var/www/html/bin/daemon.php ]; do done echo "Waiting for MySQL $MYSQL_HOST initialization..." -if run_as "php /var/www/html/bin/wait-for-connection $MYSQL_HOST ${MYSQL_PORT:-3306}" 300; then +if run_as "php /var/www/html/bin/wait-for-connection $MYSQL_HOST ${MYSQL_PORT:-3306} 300"; then exec php /var/www/html/bin/daemon.php -f start else echo "[ERROR] Waited 300 seconds, no response" >&2 diff --git a/2020.03-dev/fpm-alpine/entrypoint.sh b/2020.03-dev/fpm-alpine/entrypoint.sh index 2b72298..99b5f4a 100755 --- a/2020.03-dev/fpm-alpine/entrypoint.sh +++ b/2020.03-dev/fpm-alpine/entrypoint.sh @@ -118,7 +118,7 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ]; then if [ "$install" = true ]; then echo "Waiting for MySQL $MYSQL_HOST initialization..." - if run_as "php /var/www/html/bin/wait-for-connection $MYSQL_HOST ${MYSQL_PORT:-3306}" 300; then + if run_as "php /var/www/html/bin/wait-for-connection $MYSQL_HOST ${MYSQL_PORT:-3306} 300"; then echo "Starting Friendica installation ..." run_as "php /var/www/html/bin/console.php autoinstall $install_options" diff --git a/2020.03-dev/fpm/cron.sh b/2020.03-dev/fpm/cron.sh index b57adab..78d6feb 100755 --- a/2020.03-dev/fpm/cron.sh +++ b/2020.03-dev/fpm/cron.sh @@ -6,7 +6,7 @@ while [ ! -f /var/www/html/bin/daemon.php ]; do done echo "Waiting for MySQL $MYSQL_HOST initialization..." -if run_as "php /var/www/html/bin/wait-for-connection $MYSQL_HOST ${MYSQL_PORT:-3306}" 300; then +if run_as "php /var/www/html/bin/wait-for-connection $MYSQL_HOST ${MYSQL_PORT:-3306} 300"; then exec php /var/www/html/bin/daemon.php -f start else echo "[ERROR] Waited 300 seconds, no response" >&2 diff --git a/2020.03-dev/fpm/entrypoint.sh b/2020.03-dev/fpm/entrypoint.sh index 2b72298..99b5f4a 100755 --- a/2020.03-dev/fpm/entrypoint.sh +++ b/2020.03-dev/fpm/entrypoint.sh @@ -118,7 +118,7 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ]; then if [ "$install" = true ]; then echo "Waiting for MySQL $MYSQL_HOST initialization..." - if run_as "php /var/www/html/bin/wait-for-connection $MYSQL_HOST ${MYSQL_PORT:-3306}" 300; then + if run_as "php /var/www/html/bin/wait-for-connection $MYSQL_HOST ${MYSQL_PORT:-3306} 300"; then echo "Starting Friendica installation ..." run_as "php /var/www/html/bin/console.php autoinstall $install_options" diff --git a/docker-cron.sh b/docker-cron.sh index b57adab..78d6feb 100755 --- a/docker-cron.sh +++ b/docker-cron.sh @@ -6,7 +6,7 @@ while [ ! -f /var/www/html/bin/daemon.php ]; do done echo "Waiting for MySQL $MYSQL_HOST initialization..." -if run_as "php /var/www/html/bin/wait-for-connection $MYSQL_HOST ${MYSQL_PORT:-3306}" 300; then +if run_as "php /var/www/html/bin/wait-for-connection $MYSQL_HOST ${MYSQL_PORT:-3306} 300"; then exec php /var/www/html/bin/daemon.php -f start else echo "[ERROR] Waited 300 seconds, no response" >&2 diff --git a/docker-entrypoint.sh b/docker-entrypoint.sh index 2b72298..99b5f4a 100755 --- a/docker-entrypoint.sh +++ b/docker-entrypoint.sh @@ -118,7 +118,7 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ]; then if [ "$install" = true ]; then echo "Waiting for MySQL $MYSQL_HOST initialization..." - if run_as "php /var/www/html/bin/wait-for-connection $MYSQL_HOST ${MYSQL_PORT:-3306}" 300; then + if run_as "php /var/www/html/bin/wait-for-connection $MYSQL_HOST ${MYSQL_PORT:-3306} 300"; then echo "Starting Friendica installation ..." run_as "php /var/www/html/bin/console.php autoinstall $install_options"