OilfieldToolsNet/shlink
4
0
Fork 0
mirror of https://github.com/shlinkio/shlink.git synced 2024-12-22 23:23:42 -06:00
Code Issues Packages Projects Releases Wiki Activity

Updated docker entry point so that it tries to download the GeoLite2 db file when the license key was provided

Browse Source
This commit is contained in:
Alejandro Celaya 2021-04-08 14:32:19 +02:00
parent 7b4456e73f
commit 104b7390da
3 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.dockerignore
View File

@ -5,7 +5,7 @@ data/log/*
data/locks/* data/locks/*
data/proxies/* data/proxies/*
data/migrations_template.txt data/migrations_template.txt
data/GeoLite2-City.* data/GeoLite2-City*
data/database.sqlite data/database.sqlite
data/shlink-tests.db data/shlink-tests.db
CHANGELOG.md CHANGELOG.md

2
docker/config/shlink_in_docker.local.php
View File

@ -170,7 +170,7 @@ return [
], ],
'geolite2' => [ 'geolite2' => [
'license_key' => env('GEOLITE_LICENSE_KEY', 'G4Lm0C60yJsnkdPi'), 'license_key' => env('GEOLITE_LICENSE_KEY', 'G4Lm0C60yJsnkdPi'), // Deprecated. Remove the default value
], ],
'mercure' => $helper->getMercureConfig(), 'mercure' => $helper->getMercureConfig(),

6
docker/docker-entrypoint.sh
View File

@ -15,6 +15,12 @@ php vendor/doctrine/orm/bin/doctrine.php orm:generate-proxies -n -q
echo "Clearing entities cache..." echo "Clearing entities cache..."
php vendor/doctrine/orm/bin/doctrine.php orm:clear-cache:metadata -n -q php vendor/doctrine/orm/bin/doctrine.php orm:clear-cache:metadata -n -q
# Try to download GeoLite2 db file only if the license key env var was defined
if [ ! -z "${GEOLITE_LICENSE_KEY}" ]; then
echo "Downloading GeoLite2 db file..."
php bin/cli visit:download-db -n -q
fi
# When restarting the container, swoole might think it is already in execution # When restarting the container, swoole 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