From 7cc1722858ca8b8eeb425820e1f56d9d8d665913 Mon Sep 17 00:00:00 2001
From: Alejandro Celaya <alejandrocelaya@gmail.com>
Date: Wed, 5 Jul 2023 09:58:51 +0200
Subject: [PATCH] Improve verbosity hint when an error occurs during docker
 init

---
 composer.json               | 6 +++---
 docker/docker-entrypoint.sh | 8 ++++----
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/composer.json b/composer.json
index 0bb4ab93..ba72eed1 100644
--- a/composer.json
+++ b/composer.json
@@ -30,7 +30,7 @@
         "laminas/laminas-config-aggregator": "^1.13",
         "laminas/laminas-diactoros": "^2.24",
         "laminas/laminas-inputfilter": "^2.24",
-        "laminas/laminas-servicemanager": "^3.20",
+        "laminas/laminas-servicemanager": "^3.21",
         "laminas/laminas-stdlib": "^3.16",
         "league/uri": "^6.8",
         "lstrojny/functional-php": "^1.17",
@@ -46,10 +46,10 @@
         "pugx/shortid-php": "^1.1",
         "ramsey/uuid": "^4.7",
         "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-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-json": "^1.0",
         "spiral/roadrunner": "^2023.1",
diff --git a/docker/docker-entrypoint.sh b/docker/docker-entrypoint.sh
index 8f673442..09bf2ef2 100644
--- a/docker/docker-entrypoint.sh
+++ b/docker/docker-entrypoint.sh
@@ -3,10 +3,10 @@ set -e
 
 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
-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"
 fi
 
@@ -20,11 +20,11 @@ if [ "${ENABLE_PERIODIC_VISIT_LOCATE}" = "true" ] && [ "${SHLINK_USER_ID}" = "ro
   /usr/sbin/crond &
 fi
 
-if [ "$SHLINK_RUNTIME" == 'openswoole' ]; then
+if [ "$SHLINK_RUNTIME" = 'openswoole' ]; then
   # Openswoole is deprecated. Remove in Shlink 4.0.0
   # 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
   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
 fi