wip #6542 @0.25

diff --git a/.docker/dev/docker-compose.yml b/.docker/dev/docker-compose.yml
index a2f4c5692b1f7efd54a95274773fe41cbd831feb..3249002077a7d43f83aa196cae70038698d07e44 100644 (file)
--- a/.docker/dev/docker-compose.yml
+++ b/.docker/dev/docker-compose.yml
@@ -95,7 +95,7 @@ services:
       - '/data/toolbox/protected/fluidbookpublication/pdf/:/application/protected/fluidbookpublication/pdf/'
       # Config
       - '/home/toolbox/dev/.docker/config/httpd/httpd-dev.conf:/usr/local/apache2/conf/httpd.conf'
-      - # External volume
+      # External volume
       - 'sshfsusstorage:/application/usstorage:ro'
     ports:
       - '37127:80'
@@ -112,6 +112,9 @@ services:
     restart: unless-stopped
     ports:
       - 52109:8080
+    volumes:
+      - '/home/toolbox/dev/.docker/config/adminer/php.ini:/etc/php/7.4/fpm/conf.d/settings.ini'
+      - '/home/toolbox/dev/.docker/config/adminer/php.ini:/etc/php/7.4/cli/conf.d/settings.ini'
     environment:
       ADMINER_DEFAULT_SERVER: fluidbook-toolbox-dev-mariadb
       VIRTUAL_HOST: adminer.dev.toolbox.fluidbook.com
@@ -120,22 +123,22 @@ services:
       - fluidbook-toolbox-dev
 
   mariadb:
-      container_name: fluidbook-toolbox-dev-mariadb
-      image: 'mariadb'
-      restart: unless-stopped
-      ports:
-        - 12331:3306
-      environment:
-        MARIADB_ROOT_PASSWORD: 9xHw8nyRuphyTvqC
-        MARIADB_DATABASE: fluidbook-toolbox
-        MARIADB_AUTO_UPGRADE: 1
-      volumes:
-        - "./database/plugin:/usr/lib/mysql/plugin/"
-        - "./database/data:/var/lib/mysql"
-        - "./database/dump.sql:/docker-entrypoint-initdb.d/dump.sql"
-        - "/home/toolbox/dev/.docker/config/mariadb:/etc/mysql/conf.d:z"
-      networks:
-        - fluidbook-toolbox-dev
+    container_name: fluidbook-toolbox-dev-mariadb
+    image: 'mariadb'
+    restart: unless-stopped
+    ports:
+      - 12331:3306
+    environment:
+      MARIADB_ROOT_PASSWORD: 9xHw8nyRuphyTvqC
+      MARIADB_DATABASE: fluidbook-toolbox
+      MARIADB_AUTO_UPGRADE: 1
+    volumes:
+      - "./database/plugin:/usr/lib/mysql/plugin/"
+      - "./database/data:/var/lib/mysql"
+      - "./database/dump.sql:/docker-entrypoint-initdb.d/dump.sql"
+      - "/home/toolbox/dev/.docker/config/mariadb:/etc/mysql/conf.d:z"
+    networks:
+      - fluidbook-toolbox-dev
 
   redis:
     container_name: fluidbook-toolbox-dev-redis

diff --git a/.docker/docker-compose.yml b/.docker/docker-compose.yml
index 2d3e59a8d8858ecd031183eeaf47a6881ce7b815..f61fd33bcb33a74c86bd3f17be5cb92824a3c420 100644 (file)
--- a/.docker/docker-compose.yml
+++ b/.docker/docker-compose.yml
@@ -111,7 +111,8 @@ services:
     ports:
       - 52108:8080
     volumes:
-      - /home/toolbox/www/.docker/adminer/php.ini:/usr/local/etc/php/conf.d/settings.ini
+      - '/home/toolbox/www/.docker/config/adminer/php.ini:/etc/php/7.4/fpm/conf.d/settings.ini'
+      - '/home/toolbox/www/.docker/config/adminer/php.ini:/etc/php/7.4/cli/conf.d/settings.ini'
     environment:
       ADMINER_DEFAULT_SERVER: fluidbook-toolbox-mariadb
       VIRTUAL_HOST: adminer.toolbox.fluidbook.com