mirror of
https://github.com/shlinkio/shlink.git
synced 2024-10-22 20:25:35 +03:00
Merge pull request #1840 from acelaya-forks/feature/docker-no-interactive-init
Improve verbosity hint when an error occurs during docker init
This commit is contained in:
commit
57a36204db
2 changed files with 7 additions and 7 deletions
|
@ -30,7 +30,7 @@
|
||||||
"laminas/laminas-config-aggregator": "^1.13",
|
"laminas/laminas-config-aggregator": "^1.13",
|
||||||
"laminas/laminas-diactoros": "^2.24",
|
"laminas/laminas-diactoros": "^2.24",
|
||||||
"laminas/laminas-inputfilter": "^2.24",
|
"laminas/laminas-inputfilter": "^2.24",
|
||||||
"laminas/laminas-servicemanager": "^3.20",
|
"laminas/laminas-servicemanager": "^3.21",
|
||||||
"laminas/laminas-stdlib": "^3.16",
|
"laminas/laminas-stdlib": "^3.16",
|
||||||
"league/uri": "^6.8",
|
"league/uri": "^6.8",
|
||||||
"lstrojny/functional-php": "^1.17",
|
"lstrojny/functional-php": "^1.17",
|
||||||
|
@ -46,10 +46,10 @@
|
||||||
"pugx/shortid-php": "^1.1",
|
"pugx/shortid-php": "^1.1",
|
||||||
"ramsey/uuid": "^4.7",
|
"ramsey/uuid": "^4.7",
|
||||||
"shlinkio/shlink-common": "dev-main#b38c1ad as 5.6",
|
"shlinkio/shlink-common": "dev-main#b38c1ad as 5.6",
|
||||||
"shlinkio/shlink-config": "dev-main#245bbdd as 2.5",
|
"shlinkio/shlink-config": "dev-main#c0aa01f as 2.5",
|
||||||
"shlinkio/shlink-event-dispatcher": "dev-main#bd3a62b as 3.1",
|
"shlinkio/shlink-event-dispatcher": "dev-main#bd3a62b as 3.1",
|
||||||
"shlinkio/shlink-importer": "^5.1",
|
"shlinkio/shlink-importer": "^5.1",
|
||||||
"shlinkio/shlink-installer": "^8.4.2",
|
"shlinkio/shlink-installer": "dev-develop#b393e6b as 8.5",
|
||||||
"shlinkio/shlink-ip-geolocation": "^3.2",
|
"shlinkio/shlink-ip-geolocation": "^3.2",
|
||||||
"shlinkio/shlink-json": "^1.0",
|
"shlinkio/shlink-json": "^1.0",
|
||||||
"spiral/roadrunner": "^2023.1",
|
"spiral/roadrunner": "^2023.1",
|
||||||
|
|
|
@ -3,10 +3,10 @@ set -e
|
||||||
|
|
||||||
cd /etc/shlink
|
cd /etc/shlink
|
||||||
|
|
||||||
flags="--clear-db-cache"
|
flags="--no-interaction --clear-db-cache"
|
||||||
|
|
||||||
# Skip downloading GeoLite2 db file if the license key env var was not defined or skipping was explicitly set
|
# Skip downloading GeoLite2 db file if the license key env var was not defined or skipping was explicitly set
|
||||||
if [ -z "${GEOLITE_LICENSE_KEY}" ] || [ "${SKIP_INITIAL_GEOLITE_DOWNLOAD}" == "true" ]; then
|
if [ -z "${GEOLITE_LICENSE_KEY}" ] || [ "${SKIP_INITIAL_GEOLITE_DOWNLOAD}" = "true" ]; then
|
||||||
flags="${flags} --skip-download-geolite"
|
flags="${flags} --skip-download-geolite"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
@ -20,11 +20,11 @@ if [ "${ENABLE_PERIODIC_VISIT_LOCATE}" = "true" ] && [ "${SHLINK_USER_ID}" = "ro
|
||||||
/usr/sbin/crond &
|
/usr/sbin/crond &
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if [ "$SHLINK_RUNTIME" == 'openswoole' ]; then
|
if [ "$SHLINK_RUNTIME" = 'openswoole' ]; then
|
||||||
# Openswoole is deprecated. Remove in Shlink 4.0.0
|
# Openswoole is deprecated. Remove in Shlink 4.0.0
|
||||||
# When restarting the container, openswoole might think it is already in execution
|
# When restarting the container, openswoole might think it is already in execution
|
||||||
# This forces the app to be started every second until the exit code is 0
|
# This forces the app to be started every second until the exit code is 0
|
||||||
until php vendor/bin/laminas mezzio:swoole:start; do sleep 1 ; done
|
until php vendor/bin/laminas mezzio:swoole:start; do sleep 1 ; done
|
||||||
elif [ "$SHLINK_RUNTIME" == 'rr' ]; then
|
elif [ "$SHLINK_RUNTIME" = 'rr' ]; then
|
||||||
./bin/rr serve -c config/roadrunner/.rr.yml
|
./bin/rr serve -c config/roadrunner/.rr.yml
|
||||||
fi
|
fi
|
||||||
|
|
Loading…
Reference in a new issue