Merge branch '341-docker-ajout-data-minimum-dev' into '1.2.0'

Resolve "docker : ajout data minimum dev"

See merge request web-DPO/web-DPO!304

.env

@@ -4,4 +4,6 @@ DB_PASSWORD=webdpo
 DB_APP_NAME=webdpo
 DB_TEST_NAME=webdpo_test
 
+ADD_DATA_DEV=1
+
 TZ=Europe/Paris

.env-dev

+DB_HOST=web-dpo-db
+DB_USERNAME=webdpo
+DB_PASSWORD=webdpo
+DB_APP_NAME=webdpo
+DB_TEST_NAME=webdpo_test
+
+ADD_DATA_DEV=1
+
+TZ=Europe/Paris

.env-dist

+DB_HOST=web-dpo-db
+DB_USERNAME=webdpo
+DB_PASSWORD=webdpo
+DB_APP_NAME=webdpo
+DB_TEST_NAME=webdpo_test
+
+ADD_DATA_DEV=0
+
+TZ=Europe/Paris

.gitignore

@@ -42,6 +42,7 @@
 /sonar-project.properties
 /sonar-scanner-3.3.0.1492-linux
 /.scannerwork/
+/.env
 
 # OS generated files #
 ######################

composer.json

@@ -70,7 +70,7 @@
         "cakephp/cakephp": "2.10.*",
         "cakephp/cakeflow": "5.1.0",
         "cakephp/database": "1.1.1",
-        "cakephp/postgres": "1.0.2",
+        "cakephp/postgres": "1.0.5",
         "cakephp/authmanager": "2.1.0",
         "cakephp/ldapmanager": "1.0.3",
         "cakephp/fusionconv": "2.0.1",

docker-compose.yml

@@ -14,6 +14,7 @@ services:
             - web-dpo-golem
             - web-dpo-mailcatcher
         environment:
+            - ADD_DATA_DEV=${ADD_DATA_DEV}
             - DATA_HOST=${DB_HOST}
             - DATA_USER=${DB_USERNAME}
             - DATA_PASSWORD=${DB_PASSWORD}

docker/app/usr/bin/docker-entrypoint.sh

@@ -192,6 +192,10 @@ init_data_db()
         ${__APP_DIR__}/app/Config/Schema/CreationBase/patchs/1.1.0_to_1.2.0.sql
     )
 
+    if [ "${ADD_DATA_DEV}" = "1" ] ; then
+        files+=(${__APP_DIR__}/app/Config/Schema/CreationBase/data-dev/1.2.0.sql)
+    fi
+
     for file in ${files[*]}; do
         echo "Installation de ${file}"
         psql postgres://${DATA_USER}:${DATA_PASSWORD}@${DATA_HOST}/${DATA_DB} -v "ON_ERROR_STOP=1" -f "${file}"