diff --git a/2018.09/apache/entrypoint.sh b/2018.09/apache/entrypoint.sh index ab38907..75a5213 100644 --- a/2018.09/apache/entrypoint.sh +++ b/2018.09/apache/entrypoint.sh @@ -145,7 +145,7 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ]; then echo "Starting Friendica installation ..." # TODO Let the database time to warm up - not winning a beauty contest sleep 10s - run_as "/var/www/html/bin/console autoinstall $install_options" + run_as "cd /var/www/html; php /var/www/html/bin/console.php autoinstall $install_options" # TODO Workaround because of a strange permission issue rm -fr /var/www/html/view/smarty3/compiled @@ -162,7 +162,7 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ]; then # upgrade else echo "Upgrading Friendica ..." - run_as '/var/www/html/bin/console dbstructure update' + run_as 'cd /var/www/html; php /var/www/html/bin/console.php dbstructure update' echo "Upgrading finished" fi fi diff --git a/2018.09/fpm-alpine/entrypoint.sh b/2018.09/fpm-alpine/entrypoint.sh index ab38907..75a5213 100644 --- a/2018.09/fpm-alpine/entrypoint.sh +++ b/2018.09/fpm-alpine/entrypoint.sh @@ -145,7 +145,7 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ]; then echo "Starting Friendica installation ..." # TODO Let the database time to warm up - not winning a beauty contest sleep 10s - run_as "/var/www/html/bin/console autoinstall $install_options" + run_as "cd /var/www/html; php /var/www/html/bin/console.php autoinstall $install_options" # TODO Workaround because of a strange permission issue rm -fr /var/www/html/view/smarty3/compiled @@ -162,7 +162,7 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ]; then # upgrade else echo "Upgrading Friendica ..." - run_as '/var/www/html/bin/console dbstructure update' + run_as 'cd /var/www/html; php /var/www/html/bin/console.php dbstructure update' echo "Upgrading finished" fi fi diff --git a/2018.09/fpm/entrypoint.sh b/2018.09/fpm/entrypoint.sh index ab38907..75a5213 100644 --- a/2018.09/fpm/entrypoint.sh +++ b/2018.09/fpm/entrypoint.sh @@ -145,7 +145,7 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ]; then echo "Starting Friendica installation ..." # TODO Let the database time to warm up - not winning a beauty contest sleep 10s - run_as "/var/www/html/bin/console autoinstall $install_options" + run_as "cd /var/www/html; php /var/www/html/bin/console.php autoinstall $install_options" # TODO Workaround because of a strange permission issue rm -fr /var/www/html/view/smarty3/compiled @@ -162,7 +162,7 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ]; then # upgrade else echo "Upgrading Friendica ..." - run_as '/var/www/html/bin/console dbstructure update' + run_as 'cd /var/www/html; php /var/www/html/bin/console.php dbstructure update' echo "Upgrading finished" fi fi diff --git a/2018.12-dev/apache/entrypoint.sh b/2018.12-dev/apache/entrypoint.sh index ab38907..75a5213 100644 --- a/2018.12-dev/apache/entrypoint.sh +++ b/2018.12-dev/apache/entrypoint.sh @@ -145,7 +145,7 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ]; then echo "Starting Friendica installation ..." # TODO Let the database time to warm up - not winning a beauty contest sleep 10s - run_as "/var/www/html/bin/console autoinstall $install_options" + run_as "cd /var/www/html; php /var/www/html/bin/console.php autoinstall $install_options" # TODO Workaround because of a strange permission issue rm -fr /var/www/html/view/smarty3/compiled @@ -162,7 +162,7 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ]; then # upgrade else echo "Upgrading Friendica ..." - run_as '/var/www/html/bin/console dbstructure update' + run_as 'cd /var/www/html; php /var/www/html/bin/console.php dbstructure update' echo "Upgrading finished" fi fi diff --git a/2018.12-dev/fpm-alpine/entrypoint.sh b/2018.12-dev/fpm-alpine/entrypoint.sh index ab38907..75a5213 100644 --- a/2018.12-dev/fpm-alpine/entrypoint.sh +++ b/2018.12-dev/fpm-alpine/entrypoint.sh @@ -145,7 +145,7 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ]; then echo "Starting Friendica installation ..." # TODO Let the database time to warm up - not winning a beauty contest sleep 10s - run_as "/var/www/html/bin/console autoinstall $install_options" + run_as "cd /var/www/html; php /var/www/html/bin/console.php autoinstall $install_options" # TODO Workaround because of a strange permission issue rm -fr /var/www/html/view/smarty3/compiled @@ -162,7 +162,7 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ]; then # upgrade else echo "Upgrading Friendica ..." - run_as '/var/www/html/bin/console dbstructure update' + run_as 'cd /var/www/html; php /var/www/html/bin/console.php dbstructure update' echo "Upgrading finished" fi fi diff --git a/2018.12-dev/fpm/entrypoint.sh b/2018.12-dev/fpm/entrypoint.sh index ab38907..75a5213 100644 --- a/2018.12-dev/fpm/entrypoint.sh +++ b/2018.12-dev/fpm/entrypoint.sh @@ -145,7 +145,7 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ]; then echo "Starting Friendica installation ..." # TODO Let the database time to warm up - not winning a beauty contest sleep 10s - run_as "/var/www/html/bin/console autoinstall $install_options" + run_as "cd /var/www/html; php /var/www/html/bin/console.php autoinstall $install_options" # TODO Workaround because of a strange permission issue rm -fr /var/www/html/view/smarty3/compiled @@ -162,7 +162,7 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ]; then # upgrade else echo "Upgrading Friendica ..." - run_as '/var/www/html/bin/console dbstructure update' + run_as 'cd /var/www/html; php /var/www/html/bin/console.php dbstructure update' echo "Upgrading finished" fi fi diff --git a/docker-entrypoint.sh b/docker-entrypoint.sh index ab38907..75a5213 100644 --- a/docker-entrypoint.sh +++ b/docker-entrypoint.sh @@ -145,7 +145,7 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ]; then echo "Starting Friendica installation ..." # TODO Let the database time to warm up - not winning a beauty contest sleep 10s - run_as "/var/www/html/bin/console autoinstall $install_options" + run_as "cd /var/www/html; php /var/www/html/bin/console.php autoinstall $install_options" # TODO Workaround because of a strange permission issue rm -fr /var/www/html/view/smarty3/compiled @@ -162,7 +162,7 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ]; then # upgrade else echo "Upgrading Friendica ..." - run_as '/var/www/html/bin/console dbstructure update' + run_as 'cd /var/www/html; php /var/www/html/bin/console.php dbstructure update' echo "Upgrading finished" fi fi