Merge remote-tracking branch 'origin/3.0' into 3.1

.env

@@ -67,6 +67,9 @@ DATABASE_HOST=db
 DATABASE_PORT=3306
 DATABASE_PLATFORM=mysql
 DATABASE_DRIVER=pdo_mysql
+# Needed by Doctrine Bundle / ORM to avoid it opening connection during situations where there is no service yet.
+# See: https://symfony.com/doc/current/reference/configuration/doctrine.html#doctrine-dbal-configuration
+DATABASE_VERSION=mariadb-10.3.0
 
 # Doctrine DBAL Schema
 DATABASE_CHARSET=utf8mb4
@@ -86,8 +89,9 @@ APP_SECRET=ff6dc61a329dc96652bb092ec58981f7
 ###> doctrine/doctrine-bundle ###
 # Format described at http://docs.doctrine-project.org/projects/doctrine-dbal/en/latest/reference/configuration.html#connecting-using-a-url
 # For an SQLite database, use: "sqlite:///%kernel.project_dir%/var/data.db"
-# Configure your db driver and server_version in config/packages/doctrine.yaml
-DATABASE_URL=${DATABASE_PLATFORM}://${DATABASE_USER}:${DATABASE_PASSWORD}@${DATABASE_HOST}:${DATABASE_PORT}/${DATABASE_NAME}
+# For a PostgreSQL database, use:\"postgresql://db_user:[email protected]:5432/db_name?serverVersion=11&charset=utf8"
+# IMPORTANT: You MUST configure your server version, either here or in config/packages/doctrine.yaml
+DATABASE_URL=${DATABASE_PLATFORM}://${DATABASE_USER}:${DATABASE_PASSWORD}@${DATABASE_HOST}:${DATABASE_PORT}/${DATABASE_NAME}?serverVersion=${DATABASE_VERSION}
 ###< doctrine/doctrine-bundle ###
 
 ###> symfony/swiftmailer-bundle ###

doc/docker/base-dev.yml

@@ -21,6 +21,7 @@ services:
      - DATABASE_PASSWORD
      - DATABASE_NAME
      - DATABASE_HOST=db
+     - DATABASE_VERSION
      - RECOMMENDATIONS_CUSTOMER_ID
      - RECOMMENDATIONS_LICENSE_KEY
      - PUBLIC_SERVER_URI

doc/docker/base-prod.yml

@@ -22,6 +22,7 @@ services:
      - DATABASE_PASSWORD
      - DATABASE_NAME
      - DATABASE_HOST=db
+     - DATABASE_VERSION
      - RECOMMENDATIONS_CUSTOMER_ID
      - RECOMMENDATIONS_LICENSE_KEY
      - PUBLIC_SERVER_URI

doc/docker/install_script.sh

@@ -13,7 +13,7 @@ fi
 mkdir -p public/var
 
 if [ "${INSTALL_DATABASE}" == "1" ]; then 
-    export DATABASE_URL=${DATABASE_PLATFORM}://${DATABASE_USER}:${DATABASE_PASSWORD}@${DATABASE_HOST}:${DATABASE_PORT}/${DATABASE_NAME}
+    export DATABASE_URL=${DATABASE_PLATFORM}://${DATABASE_USER}:${DATABASE_PASSWORD}@${DATABASE_HOST}:${DATABASE_PORT}/${DATABASE_NAME}?serverVersion=${DATABASE_VERSION}
 
     php /scripts/wait_for_db.php
     composer ezplatform-install