wip #5851 @0.5

diff --git a/.docker/dev/docker-compose.yml b/.docker/dev/docker-compose.yml
index 42d624c9158a483d199a65cab67da9ef0af2a23d..349e1fd2a1066bcd700a51e772421c876dccd095 100644 (file)
--- a/.docker/dev/docker-compose.yml
+++ b/.docker/dev/docker-compose.yml
@@ -1,15 +1,21 @@
 version: '3.1'
 services:
-  webserver:
-    container_name: fluidbook-toolbox-dev-httpd
-    build: /home/toolbox/dev/.docker/images/httpd
+  php-fpm:
+    container_name: fluidbook-toolbox-dev
+    build: /home/toolbox/dev/.docker/images/php-dev
     working_dir: /application
+    hostname: fluidbook-toolbox-dev
+    environment:
+      TZ: Europe/Paris
+      HOME: /application
+      NODE_PATH: /usr/lib/node_modules
     volumes:
-      # Config
-      - '/home/toolbox/dev/.docker/config/httpd/httpd-dev.conf:/usr/local/apache2/conf/httpd.conf'
       # Files
-      - '/home/extranet/share:/application/share'
-      - '/home/toolbox/dev:/application'
+      - '/home/toolbox/www/:/application/'
+      - '/home/extranet/:/home/extranet/'
+      - '/data/extranet/:/data/extranet/'
+      - '/mnt/:/mnt/'
+      - '/home/extranet/share/:/application/share/'
       - '/data/toolbox/dev/storage/app/public/:/application/public/storage/'
       - '/data/toolbox/dev/storage/:/application/storage/'
       - '/data/extranet/ftp/:/application/ftp/'
@@ -18,28 +24,8 @@ services:
       - '/data/extranet/www/fluidbook/books/links/:/application/protected/fluidbookpublication/links/'
       - '/home/extranet/www/fluidbook/cache/unzip/:/application/storage/fluidbook/cache/unzip/'
       - '/data/toolbox/protected/fluidbookpublication/cache/:/application/protected/fluidbookpublication/cache/'
-      - '/home/extranet:/home/extranet'
-      - '/data/extranet:/data/extranet'
-      - '/mnt:/mnt'
-    ports:
-      - '37127:80'
-    environment:
-      VIRTUAL_HOST: dev.toolbox.fluidbook.com
-      LETSENCRYPT_HOST: dev.toolbox.fluidbook.com
-    networks:
-      - fluidbook-toolbox-dev
-    restart: unless-stopped
-
-  php-fpm:
-    container_name: fluidbook-toolbox-dev
-    build: /home/toolbox/dev/.docker/images/php-dev
-    working_dir: /application
-    hostname: fluidbook-toolbox-dev
-    environment:
-      TZ: Europe/Paris
-      HOME: /application
-      NODE_PATH: /usr/lib/node_modules
-    volumes:
+      # Startup
+      - '/home/toolbox/dev/bin/startup:/usr/bin/startup'
       # SSH
       - '/home/toolbox/dev/.docker/config/ssh/root/:/root/.ssh/'
       - '/home/toolbox/dev/.docker/config/ssh/user/:/application/.ssh/'
@@ -73,12 +59,29 @@ services:
       # Rclone
       - '/home/toolbox/dev/.docker/config/rclone.conf:/application/.config/rclone/rclone.conf'
       # PHP
-      - '/home/toolbox/dev/.docker/config/php.ini:/etc/php/8.2/fpm/conf.d/99-overrides.ini'
+      - '/home/toolbox/dev/.docker/config/php/php.ini:/etc/php/8.2/fpm/conf.d/99-overrides.ini'
+      - '/home/toolbox/dev/.docker/config/php/fpm.conf:/etc/php/8.2/fpm/pool.d/z-overrides.conf'
       # ENV
       - '/home/toolbox/dev/.env.dev:/application/.env'
+    ports:
+      - '58746:8123'
+      - '58747:22'
+    networks:
+      - fluidbook-toolbox-dev
+      - fluidbook-processfarm
+    restart: unless-stopped
+
+  webserver:
+    container_name: fluidbook-toolbox-dev-httpd
+    build: /home/toolbox/dev/.docker/images/httpd
+    working_dir: /application
+    volumes:
       # Files
-      - '/home/extranet/share:/application/share'
-      - '/home/toolbox/dev:/application'
+      - '/home/toolbox/www/:/application/'
+      - '/home/extranet/:/home/extranet/'
+      - '/data/extranet/:/data/extranet/'
+      - '/mnt/:/mnt/'
+      - '/home/extranet/share/:/application/share/'
       - '/data/toolbox/dev/storage/app/public/:/application/public/storage/'
       - '/data/toolbox/dev/storage/:/application/storage/'
       - '/data/extranet/ftp/:/application/ftp/'
@@ -87,16 +90,17 @@ services:
       - '/data/extranet/www/fluidbook/books/links/:/application/protected/fluidbookpublication/links/'
       - '/home/extranet/www/fluidbook/cache/unzip/:/application/storage/fluidbook/cache/unzip/'
       - '/data/toolbox/protected/fluidbookpublication/cache/:/application/protected/fluidbookpublication/cache/'
-      - '/home/extranet:/home/extranet'
-      - '/data/extranet:/data/extranet'
-      - '/mnt:/mnt'
+      # Config
+      - '/home/toolbox/dev/.docker/config/httpd/httpd-dev.conf:/usr/local/apache2/conf/httpd.conf'
     ports:
-      - '58746:8123'
-      - '58747:22'
+      - '37127:80'
+    environment:
+      VIRTUAL_HOST: dev.toolbox.fluidbook.com
+      LETSENCRYPT_HOST: dev.toolbox.fluidbook.com
     networks:
       - fluidbook-toolbox-dev
-      - fluidbook-processfarm
     restart: unless-stopped
+
   adminer:
     image: adminer:latest
     container_name: fluidbook-toolbox-dev-adminer
@@ -109,6 +113,7 @@ services:
       LETSENCRYPT_HOST: adminer.dev.toolbox.fluidbook.com
     networks:
       - fluidbook-toolbox-dev
+
   mariadb:
       container_name: fluidbook-toolbox-dev-mariadb
       image: 'mariadb'
@@ -126,6 +131,7 @@ services:
         - "/home/toolbox/dev/.docker/config/mariadb:/etc/mysql/conf.d:z"
       networks:
         - fluidbook-toolbox-dev
+
   redis:
     container_name: fluidbook-toolbox-dev-redis
     image: redis
@@ -140,6 +146,7 @@ services:
     container_name: fluidbook-toolbox-dev-automysqlbackup
     volumes:
       - "./database/backup:/backup"
+    restart: unless-stopped
     environment:
       USERNAME: root
       PASSWORD: 9xHw8nyRuphyTvqC

diff --git a/.docker/dev/update b/.docker/dev/update
index cff06a56bae11d6292f9be4670a2232f3f76ae9f..00f61fc9efa276e75f27c0336e9a25b891cde913 100644 (file)
--- a/.docker/dev/update
+++ b/.docker/dev/update
@@ -1,8 +1,10 @@
 #!/bin/sh
 cd /docker/fluidbook-toolbox-dev
+/home/toolbox/dev/scripts/fixrights
 chown root:root /home/toolbox/dev/.docker/config/cron/host;ln -sf /home/toolbox/dev/.docker/config/cron/host /etc/cron.d/toolbox
 docker network create fluidbook-toolbox-dev
 docker compose down
 docker compose up -d
-docker exec -it fluidbook-toolbox /application/scripts/update
 /home/toolbox/dev/scripts/fixrights
+docker exec -it fluidbook-toolbox /application/scripts/update
+

diff --git a/.docker/docker-compose.yml b/.docker/docker-compose.yml
index fdaca9db69ca076220b0a092b45f3a63594096bf..2bc802d7a87bf07310c701a565a21d117599f93b 100644 (file)
--- a/.docker/docker-compose.yml
+++ b/.docker/docker-compose.yml
@@ -12,6 +12,9 @@ services:
     volumes:
       # Files
       - '/home/toolbox/www/:/application/'
+      - '/home/extranet/:/home/extranet/'
+      - '/data/extranet/:/data/extranet/'
+      - '/mnt/:/mnt/'
       - '/home/extranet/share/:/application/share/'
       - '/data/toolbox/storage/app/public/:/application/public/storage/'
       - '/data/toolbox/storage/:/application/storage/'
@@ -21,9 +24,6 @@ services:
       - '/data/extranet/www/fluidbook/books/links/:/application/protected/fluidbookpublication/links/'
       - '/home/extranet/www/fluidbook/cache/unzip/:/application/storage/fluidbook/cache/unzip/'
       - '/data/toolbox/protected/fluidbookpublication/cache/:/application/protected/fluidbookpublication/cache/'
-      - '/home/extranet/:/home/extranet/'
-      - '/data/extranet/:/data/extranet/'
-      - '/mnt/:/mnt/'
       # Startup
       - '/home/toolbox/www/bin/startup:/usr/bin/startup'
       # SSH
@@ -71,7 +71,6 @@ services:
       - fluidbook-processfarm
     restart: unless-stopped
 
-
   webserver:
     container_name: fluidbook-toolbox-httpd
     build: /home/toolbox/www/.docker/images/httpd
@@ -102,7 +101,6 @@ services:
       - fluidbook-toolbox
     restart: unless-stopped
 
-
   adminer:
     image: adminer:latest
     container_name: fluidbook-toolbox-adminer
@@ -115,6 +113,7 @@ services:
       LETSENCRYPT_HOST: adminer.toolbox.fluidbook.com
     networks:
       - fluidbook-toolbox
+
   #    mariadb:
   #        container_name: fluidbook-toolbox-mariadb
   #        image: 'mariadb'
@@ -132,6 +131,7 @@ services:
   #          - "/home/toolbox/www/.docker/config/mariadb:/etc/mysql/conf.d:z"
   #        networks:
   #          - fluidbook-toolbox
+
   redis:
     container_name: fluidbook-toolbox-redis
     image: redis
@@ -146,6 +146,7 @@ services:
     container_name: fluidbook-toolbox-automysqlbackup
     volumes:
       - "./database/backup:/backup"
+    restart: unless-stopped
     environment:
       USERNAME: root
       PASSWORD: 9xHw8nyRuphyTvqC

diff --git a/.docker/update b/.docker/update
index 8edf7021fc90b3df6c70cda18ec1df23798f4e87..b55e015836be85e787f10ab4c0db58a048641cb7 100644 (file)
--- a/.docker/update
+++ b/.docker/update
@@ -4,6 +4,6 @@ cd /docker/fluidbook-toolbox
 chown root:root /home/toolbox/www/.docker/config/cron/host;ln -sf /home/toolbox/www/.docker/config/cron/host /etc/cron.d/toolbox
 docker network create fluidbook-toolbox
 docker compose down
-docker -D -l debug compose  up -d
+docker compose  up -d
 /home/toolbox/www/scripts/fixrights
 docker exec -it fluidbook-toolbox /application/scripts/update