From 4d18fbfd4ce90367d1eb64c7bda3271ccb7ca91f Mon Sep 17 00:00:00 2001 From: aptalca Date: Sat, 18 Apr 2020 12:04:25 -0400 Subject: [PATCH] prevent exit 1 shutting down container --- README.md | 1 + readme-vars.yml | 1 + root/etc/cont-init.d/40-config | 5 ++++- 3 files changed, 6 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index b51e734..d87792c 100644 --- a/README.md +++ b/README.md @@ -215,6 +215,7 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64 ## Versions +* **18.04.20:** - Fix unwanted shutdown of the container. * **11.03.20:** - Add php7-sodium. * **18.02.20:** - Add geoip2, suppress lua warning. * **19.12.19:** - Rebasing to alpine 3.11. diff --git a/readme-vars.yml b/readme-vars.yml index 504cd17..8241e2a 100644 --- a/readme-vars.yml +++ b/readme-vars.yml @@ -40,6 +40,7 @@ app_setup_block: | # changelog changelogs: + - { date: "18.04.20:", desc: "Fix unwanted shutdown of the container." } - { date: "11.03.20:", desc: "Add php7-sodium." } - { date: "18.02.20:", desc: "Add geoip2, suppress lua warning." } - { date: "19.12.19:", desc: "Rebasing to alpine 3.11." } diff --git a/root/etc/cont-init.d/40-config b/root/etc/cont-init.d/40-config index add48f0..1d1473e 100644 --- a/root/etc/cont-init.d/40-config +++ b/root/etc/cont-init.d/40-config @@ -10,5 +10,8 @@ mkdir -p \ [[ ! -d /var/lib/libmaxminddb ]] && \ ln -s /config/geoip2db /var/lib/libmaxminddb # check GeoIP2 database -[[ ! -f /var/lib/libmaxminddb/GeoLite2-City.mmdb ]] && \ +if [ -f /var/lib/libmaxminddb/GeoLite2-City.mmdb ]; then + echo "GeoIP2 database found" +else echo "Starting 2019/12/30, GeoIP2 databases require personal license key to download. Please manually download/update the GeoIP2 db and save as /config/geoip2db/GeoLite2-City.mmdb" +fi \ No newline at end of file