Merge branch 'improvement/better-default-domain-with-docker' into 'develop'

Improvement/better default domain with docker

See merge request framasoft/framadate/framadate!371

app/classes/Framadate/Utils.php

@@ -34,14 +34,14 @@ class Utils {
             (isset($_SERVER['HTTP_X_FORWARDED_PROTO']) && $_SERVER['HTTP_X_FORWARDED_PROTO'] === 'https')
         ) ? 'https' : 'http';
 
+        $domain = defined('APP_URL') ? APP_URL : $serverName;
         $port = in_array($serverPort, ['80', '443'], true) ? '' : ':' . $serverPort;
         $dirname = dirname($_SERVER['SCRIPT_NAME']);
         $dirname = $dirname === '\\' ? '/' : $dirname . '/';
         $dirname = str_replace('/admin', '', $dirname);
         $dirname = str_replace('/action', '', $dirname);
-        $server_name = (defined('APP_URL') ? APP_URL : $serverName) . $port . $dirname;
 
-        return $scheme . '://' . preg_replace('#//+#', '/', $server_name);
+        return $scheme . '://' . preg_replace('#//+#', '/', $domain . $port . $dirname);
     }
 
     /**

docker-compose.yml

@@ -23,7 +23,6 @@ services:
             - 80:80
         environment:
             - ENV=dev
-            - DOMAIN=localhost
             - APP_NAME=Framadate
             - ADMIN_MAIL=mon@email.fr
             - MYSQL_USER=framadate

docker/stretch/entrypoint.sh

@@ -19,9 +19,7 @@ if [ ! -f $FRAMADATE_CONFIG ]; then
   echo "There is no configuration file. Create one with environment variables"
   cp /var/www/framadate/tpl/admin/config.tpl $FRAMADATE_CONFIG
   # Set values on configuration file
-  if [ ! -z "$DOMAIN" ]; then
-    sed -i -E "s/^(\/\/ )?const APP_URL( )?=.*;/const APP_URL = '$DOMAIN';/g" $FRAMADATE_CONFIG
-  fi
+  sed -i -E "s/^(\/\/ )?const APP_URL( )?=.*;/const APP_URL = '$DOMAIN';/g" $FRAMADATE_CONFIG
   if [ "$FORCE_HTTPS" = true ]; then
     sed -i -E "s/^(\/\/ )?const FORCE_HTTPS\\s*=.*;/const FORCE_HTTPS = true;/" $FRAMADATE_CONFIG
   fi