wip #5851 @0.5

diff --git a/.docker/dev/docker-compose.yml b/.docker/dev/docker-compose.yml
index e6c267dcddfa72de3522aadffd8bc1059e708b23..103f77132ccf17648432fc6d12b43788384ca681 100644 (file)
--- a/.docker/dev/docker-compose.yml
+++ b/.docker/dev/docker-compose.yml
@@ -133,6 +133,22 @@ services:
     networks:
       - fluidbook-toolbox-dev
     restart: unless-stopped
+
+  mysqlbackup:
+    image: selim13/automysqlbackup
+    container_name: fluidbook-toolbox-dev-automysqlbackup
+    volumes:
+      - "./database/backup:/backup"
+    environment:
+      USERNAME: root
+      PASSWORD: 9xHw8nyRuphyTvqC
+      DBHOST: fluidbook-toolbox-dev-mariadb
+      DBEXCLUDE: "performance_schema information_schema"
+      CRON_SCHEDULE: "0 0 * * *"
+      EXTRA_OPTS: "--single-transaction"
+    networks:
+      - fluidbook-toolbox-dev
+
 networks:
   fluidbook-toolbox-dev:
     external:

diff --git a/.docker/docker-compose.yml b/.docker/docker-compose.yml
index 69fcdd8eaff03ca154566373b841392bc379e83d..0f7f3f45c2866627ad4088c61cfe6e370479c321 100644 (file)
--- a/.docker/docker-compose.yml
+++ b/.docker/docker-compose.yml
@@ -73,7 +73,7 @@ services:
       # Rclone
       - '/home/toolbox/www/.docker/config/rclone.conf:/application/.config/rclone/rclone.conf'
       # PHP
-      - '/home/toolbox/www/.docker/config/php.ini:/etc/php/8.1/fpm/conf.d/99-overrides.ini'
+      - '/home/toolbox/www/.docker/config/php.ini:/etc/php/8.2/fpm/conf.d/99-overrides.ini'
       # ENV
       - '/home/toolbox/www/.env.prod:/application/.env'
       # Files
@@ -134,6 +134,22 @@ services:
     networks:
       - fluidbook-toolbox
     restart: unless-stopped
+
+  mysqlbackup:
+    image: selim13/automysqlbackup
+    container_name: fluidbook-toolbox-automysqlbackup
+    volumes:
+      - "./database/backup:/backup"
+    environment:
+      USERNAME: root
+      PASSWORD: 9xHw8nyRuphyTvqC
+      DBHOST: fluidbook-toolbox-mariadb
+      DBEXCLUDE: "performance_schema information_schema"
+      CRON_SCHEDULE: "0 0 * * *"
+      EXTRA_OPTS: "--single-transaction"
+    networks:
+      - fluidbook-toolbox
+
 networks:
   fluidbook-toolbox:
     external:
@@ -141,15 +157,3 @@ networks:
   fluidbook-processfarm:
     external:
       name: fluidbook-processfarm
-
-#volumes:
-#  # sshcmd=vince@paris.cubedesigners.com\:/C:/Sign -o port=22422 -o uid=1001 -o gid=33 -o allow_other -o reconnect,ServerAliveInterval=15,ServerAliveCountMax=3 codesign
-#  codesign:
-#    driver: vieux/sshfs:latest
-#    driver_opts:
-#      sshcmd: "vince@paris.cubedesigners.com:/C:/Sign"
-#      allow_other: ""
-#      uid: "1001"
-#      gid: "33"
-#      reconnect: ""
-#      identityfile: "/root/.ssh/id_rsa"

diff --git a/.docker/images/php-dev/Dockerfile b/.docker/images/php-dev/Dockerfile
index 83e1bcac492bce5fb1fcea6f8cf18b80758e30b5..7207fb15cc95cf106cbe46ced033dfdd8da3cbfd 100644 (file)
--- a/.docker/images/php-dev/Dockerfile
+++ b/.docker/images/php-dev/Dockerfile
@@ -1,3 +1,7 @@
+############################################
+# PHPDocker.io PHP 8.1 / CLI and FPM image #
+############################################
+
 FROM ubuntu:jammy AS cli
 
 WORKDIR "/application"
@@ -93,7 +97,6 @@ RUN groupadd sudo;useradd -d /application -g 33 -G sudo -s /bin/bash -u 1001 too
 # PHP-FPM packages need a nudge to make them docker-friendly
 COPY overrides.conf /etc/php/8.2/fpm/pool.d/z-overrides.conf
 
-#CMD ["/usr/sbin/php-fpm8.1", "-O" ]
 COPY startup /usr/bin/startup
 CMD exec /usr/bin/startup
 

diff --git a/.docker/images/php/Dockerfile b/.docker/images/php/Dockerfile
index 0550f4caa569eefd62e8b83a8830abd8a6635345..7207fb15cc95cf106cbe46ced033dfdd8da3cbfd 100644 (file)
--- a/.docker/images/php/Dockerfile
+++ b/.docker/images/php/Dockerfile
@@ -25,30 +25,31 @@ RUN echo "deb http://ppa.launchpad.net/ondrej/php/ubuntu jammy main" > /etc/apt/
 
 RUN apt update && apt -y --no-install-recommends install \
         git git-restore-mtime \
-        php8.1-fpm \
-        php8.1-apcu \
-        php8.1-cli \
-        php8.1-curl \
-        php8.1-mbstring \
-        php8.1-opcache \
-        php8.1-readline \
-        php8.1-xml \
-        php8.1-zip \
-        php8.1-bz2 \
-        php8.1-gd \
-        php8.1-igbinary \
-        php8.1-imap \
-        php8.1-imagick \
-        php8.1-intl \
-        php8.1-memcached \
-        php8.1-mysql \
-        php8.1-redis \
-        php8.1-soap \
-        php8.1-ssh2 \
-        php8.1-tidy \
-        php8.1-xsl \
-        php8.1-curl \
-        php8.1-mcrypt \
+        php8.2-fpm \
+        php8.2-apcu \
+        php8.2-cli \
+        php8.2-curl \
+        php8.2-mbstring \
+        php8.2-opcache \
+        php8.2-readline \
+        php8.2-xml \
+        php8.2-zip \
+        php8.2-bz2 \
+        php8.2-gd \
+        php8.2-igbinary \
+        php8.2-imap \
+        php8.2-imagick \
+        php8.2-intl \
+        php8.2-memcached \
+        php8.2-mysql \
+        php8.2-redis \
+        php8.2-soap \
+        php8.2-ssh2 \
+        php8.2-tidy \
+        php8.2-xsl \
+        php8.2-curl \
+        php8.2-mcrypt \
+        php8.2-bcmath \
         less nano wget bash lynx
 
 COPY --from=composer:2 /usr/bin/composer /usr/bin/composer
@@ -94,7 +95,7 @@ RUN pip3 install font-line
 RUN groupadd sudo;useradd -d /application -g 33 -G sudo -s /bin/bash -u 1001 toolbox
 
 # PHP-FPM packages need a nudge to make them docker-friendly
-COPY overrides.conf /etc/php/8.1/fpm/pool.d/z-overrides.conf
+COPY overrides.conf /etc/php/8.2/fpm/pool.d/z-overrides.conf
 
 COPY startup /usr/bin/startup
 CMD exec /usr/bin/startup

diff --git a/.docker/images/php/startup b/.docker/images/php/startup
index 494a93bd6c88f1809955c89396bb4a3f948ccc68..3dc58488c8eaa449cf0efb9b56c9ab25b3ae922b 100644 (file)
--- a/.docker/images/php/startup
+++ b/.docker/images/php/startup
@@ -36,4 +36,4 @@ chmod -R 700 /etc/monit;chown -R root:root /etc/monit;/usr/bin/monit
 chown -R root:root /etc/monit && /usr/bin/monit
 
 # Launch PHP
-/usr/sbin/php-fpm8.1 -O
+/usr/sbin/php-fpm8.2 -O

diff --git a/resources/tools/dockerwebcontainer/mysql b/resources/tools/dockerwebcontainer/mysql
index 12156207c250b6d773cfdbc2fe1e0142876f2ffe..7d1003ecaf53a1ea9a2071079f0868ccb0e18aae 100644 (file)
--- a/resources/tools/dockerwebcontainer/mysql
+++ b/resources/tools/dockerwebcontainer/mysql
@@ -31,3 +31,18 @@
             max-size: 10M
             max-file: 10
 
+    mysqlbackup:
+      image: selim13/automysqlbackup
+      container_name: $name-automysqlbackup
+      volumes:
+        - "./database/backup:/backup"
+      environment:
+        USERNAME: root
+        PASSWORD: 9xHw8nyRuphyTvqC
+        DBHOST: $name-mariadb
+        DBEXCLUDE: "performance_schema information_schema"
+        CRON_SCHEDULE: "0 0 * * *"
+        EXTRA_OPTS: "--single-transaction"
+      networks:
+        - $name
+