diff --git a/Dockerfile b/Dockerfile index 4bd7663..1e3aeac 100644 --- a/Dockerfile +++ b/Dockerfile @@ -34,6 +34,7 @@ RUN curl -o invoiceninja.tar.gz -SL https://github.com/hillelcoren/invoice-ninja && chown -R www-data:www-data /var/www/app \ && composer install --working-dir /var/www/app -o --no-dev --no-interaction --no-progress \ && chown -R www-data:www-data /var/www/app/bootstrap/cache \ + # && echo ${INVOICENINJA_VERSION} > /var/www/app/storage/version.txt \ && mv /var/www/app/storage /var/www/app/docker-backup-storage \ && mv /var/www/app/public/logo /var/www/app/docker-backup-public-logo diff --git a/app-entrypoint.sh b/app-entrypoint.sh index a29e471..4ad65ad 100644 --- a/app-entrypoint.sh +++ b/app-entrypoint.sh @@ -35,8 +35,31 @@ else fi chown www-data:www-data /var/www/app/.env -# php artisan optimize --force -# php artisan migrate --force -# php artisan db:seed --class=UpdateSeeder +# widely inspired from https://github.com/docker-library/wordpress/blob/c674e9ceedf582705e0ad8487c16b42b37a5e9da/fpm/docker-entrypoint.sh#L128 +TERM=dumb php -- "$DB_HOST" "$DB_USERNAME" "$DB_PASSWORD" "$DB_DATABASE" <<'EOPHP' +getMessage(). "\n"); + if (--$maxTries <= 0) { + exit(1); + } + sleep(3); + } +} while (true); +EOPHP + +php artisan optimize --force +php artisan migrate --force +php artisan db:seed --force + +echo 'start' exec "$@" diff --git a/docker-compose.yml b/docker-compose.yml index 9cbfe46..57c2f1d 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -30,7 +30,7 @@ cron: entrypoint: | bash -c 'bash -s <