diff --git a/alpine/5/rootfs/usr/local/bin/docker-entrypoint b/alpine/5/rootfs/usr/local/bin/docker-entrypoint index 4cf0b71..70eda26 100755 --- a/alpine/5/rootfs/usr/local/bin/docker-entrypoint +++ b/alpine/5/rootfs/usr/local/bin/docker-entrypoint @@ -109,10 +109,10 @@ file_env 'MAILGUN_SECRET' file_env 'S3_KEY' file_env 'S3_SECRET' -# Run Laravel stuff +# Run IN/Laravel stuff if [[ "$1" == "supervisord" ]] || [[ "$1" == "php-fpm" ]]; then - echo "Initialising Laravel..." - . laravel-init.sh + in_log INFO "Initialising Invoice Ninja..." + . invoiceninja-init.sh fi exec docker-php-entrypoint "$@" diff --git a/alpine/5/rootfs/usr/local/bin/laravel-init.sh b/alpine/5/rootfs/usr/local/bin/invoiceninja-init.sh similarity index 86% rename from alpine/5/rootfs/usr/local/bin/laravel-init.sh rename to alpine/5/rootfs/usr/local/bin/invoiceninja-init.sh index eb9a2c5..cb5e7f5 100755 --- a/alpine/5/rootfs/usr/local/bin/laravel-init.sh +++ b/alpine/5/rootfs/usr/local/bin/invoiceninja-init.sh @@ -12,14 +12,14 @@ docker_process_init_files() { # https://github.com/docker-library/postgres/issues/450#issuecomment-393167936 # https://github.com/docker-library/postgres/pull/452 if [ -x "$f" ]; then - in_log "$0: running $f" + in_log INFO "$0: running $f" "$f" else - in_log "$0: sourcing $f" + in_log INFO "$0: sourcing $f" . "$f" fi ;; - *) in_log "$0: ignoring $f" ;; + *) in_log INFO "$0: ignoring $f" ;; esac echo done @@ -31,9 +31,8 @@ php artisan optimize # Check if DB works, if not crash the app. DB_READY=$(php artisan tinker --execute='echo app()->call("App\Utils\SystemHealth@dbCheck")["success"];') if [ "$DB_READY" != "1" ]; then - echo "Error connecting to DB" php artisan migrate:status # Print verbose error - exit 1 + in_error "Error connecting to DB" fi php artisan migrate --force