Maj docker-compose

bin/dns.sh

@@ -16,7 +16,7 @@ export ETC_HOSTS="/etc/hosts"
 export $(set | grep "domain=")
 
 declare -a forbidenName
-forbidenName=(${calcHost} calc ${cloudHost} bureau ${dateHost} date ${dokuwikiHost} dokuwiki ${fileHost} file ${ldapHost} ${garHost} ${gitHost} ${gravHost} ${matterHost} ${officeHost} collabra ${padHost} ${sympaHost} listes ${webmailHost} ${wordpressHost} www ${vigiloHost} form)
+forbidenName=(${calcHost} calc ${cloudHost} bureau ${dateHost} date ${dokuwikiHost} dokuwiki ${fileHost} file ${ldapHost} ${garHost} ${gitHost} ${gravHost} ${matterHost} ${officeHost} collabora ${padHost} ${sympaHost} listes ${webmailHost} ${wordpressHost} www ${vigiloHost} form)
 
 export FORCE="NO"
 export CMD=""

bin/upgradeDockerCompose.sh

@@ -0,0 +1,8 @@
+#!/bin/bash
+
+DOCKERCOMPOSE_VERSION="v2.17.3"
+
+mv /usr/bin/docker-compose /usr/bin/docker-compose.old
+curl -SL https://github.com/docker/compose/releases/download/$DOCKERCOMPOSE_VERSION/docker-compose-linux-x86_64 -o /usr/local/bin/docker-compose
+sudo ln -s /usr/local/bin/docker-compose /usr/bin/docker-compose
+chmod +x /usr/bin/docker-compose

config/orgaTmpl/docker-compose.yml

@@ -175,78 +175,78 @@ volumes:
 #}}
 #{{db
   orgaDB:
-    external:
+    external: true
-      name: orga_${orga}orgaDB
+    name: orga_${orga}orgaDB
 #}}
 #{{agora
   matterConfig:
-    external:
+    external: true
-      name: orga_${orga}matterConfig
+    name: orga_${orga}matterConfig
   matterData:
-    external:
+    external: true
-      name: orga_${orga}matterData
+    name: orga_${orga}matterData
   matterLogs:
-    external:
+    external: true
-      name: orga_${orga}matterLogs
+    name: orga_${orga}matterLogs
   matterPlugins:
-    external:
+    external: true
-      name: orga_${orga}matterPlugins
+    name: orga_${orga}matterPlugins
   matterClientPlugins:
-    external:
+    external: true
-      name: orga_${orga}matterClientPlugins
+    name: orga_${orga}matterClientPlugins
   matterIcons:
-    external:
+    external: true
-      name: matterIcons
+    name: matterIcons
 #{{cloud
   cloudMain:
-    external:
+    external: true
-      name: orga_${orga}cloudMain
+    name: orga_${orga}cloudMain
   cloudData:
-    external:
+    external: true
-      name: orga_${orga}cloudData
+    name: orga_${orga}cloudData
   cloudConfig:
-    external:
+    external: true
-      name: orga_${orga}cloudConfig
+    name: orga_${orga}cloudConfig
   cloudApps:
-    external:
+    external: true
-      name: orga_${orga}cloudApps
+    name: orga_${orga}cloudApps
   cloudCustomApps:
-    external:
+    external: true
-      name: orga_${orga}cloudCustomApps
+    name: orga_${orga}cloudCustomApps
   cloudThemes:
-    external:
+    external: true
-      name: orga_${orga}cloudThemes
+    name: orga_${orga}cloudThemes
   cloudPhp:
-    external:
+    external: true
-      name: orga_${orga}cloudPhp
+    name: orga_${orga}cloudPhp
 #}}
 #{{wiki
   wikiData:
-    external:
+    external: true
-      name: orga_${orga}wikiData
+    name: orga_${orga}wikiData
   wikiConf:
-    external:
+    external: true
-      name: orga_${orga}wikiConf
+    name: orga_${orga}wikiConf
   wikiPlugins:
-    external:
+    external: true
-      name: orga_${orga}wikiPlugins
+    name: orga_${orga}wikiPlugins
   wikiLibtpl:
-    external:
+    external: true
-      name: orga_${orga}wikiLibtpl
+    name: orga_${orga}wikiLibtpl
   wikiLogs:
-    external:
+    external: true
-      name: orga_${orga}wikiLogs
+    name: orga_${orga}wikiLogs
 #}}
 #{{wp
   wordpress:
-    external:
+    external: true
-      name: orga_${orga}wordpress
+    name: orga_${orga}wordpress
 #}}
 
 networks:
   orgaNet:
-    external:
+    external: true
-      name: ${orga}orgaNet
+    name: ${orga}orgaNet
   # postfixNet:
   #   external:
   #     name: postfixNet

dockers/cachet/docker-compose.yml

@@ -43,5 +43,5 @@ volumes:
 
 networks:
   cachetNet:
-    external:
+    external: true
-      name: cachetNet
+    name: cachetNet

dockers/cloud/docker-compose.yml

@@ -62,8 +62,8 @@ volumes:
 
 networks:
   cloudNet:
-    external:
+    external: true
-      name: cloudNet
+    name: cloudNet
   postfixNet:
-    external:
+    external: true
-      name: postfixNet
+    name: postfixNet

dockers/collabora/docker-compose.yml

@@ -30,5 +30,5 @@ services:
 
 networks:
   collaboraNet:
-    external:
+    external: true
-      name: collaboraNet
+    name: collaboraNet

dockers/dokuwiki/docker-compose.yml

@@ -29,8 +29,8 @@ volumes:
 
 networks:
   dokuwikiNet:
-    external:
+    external: true
-      name: dokuwikiNet
+    name: dokuwikiNet
   postfixNet:
-    external:
+    external: true
-      name: postfixNet
+    name: postfixNet

dockers/ethercalc/docker-compose.yml

@@ -30,5 +30,5 @@ volumes:
 
 networks:
   ethercalcNet:
-    external:
+    external: true
-      name: ethercalcNet
+    name: ethercalcNet

dockers/etherpad/docker-compose.yml

@@ -40,8 +40,8 @@ volumes:
   
 networks:
   etherpadNet:
-    external:
+    external: true
-      name: etherpadNet
+    name: etherpadNet
   postfixNet:
-    external:
+    external: true
-      name: postfixNet
+    name: postfixNet

dockers/framadate/docker-compose.yml

@@ -45,8 +45,8 @@ volumes:
 
 networks:
    framadateNet:
-     external:
+    external: true
-       name: framadateNet
+    name: framadateNet
    postfixNet:
-     external:
+    external: true
-       name: postfixNet
+    name: postfixNet

dockers/garradin/docker-compose.yml

@@ -27,9 +27,9 @@ volumes:
   assoUsers:
 
 networks:
-    garradinNet:
+  garradinNet:
-      external:
+    external: true
-        name: garradinNet
+    name: garradinNet
-    postfixNet:
+  postfixNet:
-      external:
+    external: true
-        name: postfixNet
+    name: postfixNet

dockers/gitea/docker-compose.yml

@@ -40,8 +40,8 @@ volumes:
                           
 networks:
   giteaNet:
-    external:
+    external: true
-      name: giteaNet
+    name: giteaNet
   postfixNet:
-    external:
+    external: true
-      name: postfixNet
+    name: postfixNet

dockers/jirafeau/docker-compose.yml

@@ -31,8 +31,8 @@ volumes:
 
 networks:
   jirafeauNet:
-    external:
+    external: true
-      name: jirafeauNet
+    name: jirafeauNet
   postfixNet:
-    external:
+    external: true
-      name: postfixNet
+    name: postfixNet

dockers/ldap/docker-compose.yml

@@ -64,8 +64,8 @@ volumes:
 
 networks:
   ldapNet:
-    external:
+    external: true
-      name: ldapNet
+    name: ldapNet
   postfixNet:
-    external:
+    external: true
-      name: postfixNet
+    name: postfixNet

dockers/mattermost/docker-compose.yml

@@ -64,10 +64,10 @@ volumes:
 #  matterIcons:
 
 networks:
-   mattermostNet:
+  mattermostNet:
-     external:
+    external: true
-       name: mattermostNet
+    name: mattermostNet
-   postfixNet:
+  postfixNet:
-     external:
+    external: true
-       name: postfixNet
+    name: postfixNet
 

dockers/mobilizon/docker-compose.yml

@@ -1,12 +1,13 @@
-version: "3"
+version: "3.9"
 
 services:
   mobilizon:
-    image: framasoft/mobilizon
+    image: framasoft/mobilizon:latest
     container_name: ${mobilizonServName}
     restart: ${restartPolicy}
     depends_on:
-      - db
+      db:  
+        condition: service_healthy
     env_file:
       - ../../secret/env-${mobilizonServName}
     environment:
@@ -35,6 +36,12 @@ services:
       - mobilizonDB:/var/lib/postgresql/data
     networks:
       - mobilizonNet
+    healthcheck:
+      test: ["CMD-SHELL", "pg_isready"]
+      interval: 30s
+      timeout: 5s
+      retries: 5
+
 
 volumes:
   mobilizonDB:
@@ -42,11 +49,11 @@ volumes:
 
 networks:
   mobilizonNet:
-    external:
+    external: true
-      name: mobilizonNet
+    name: mobilizonNet
   postfixNet:
-    external:
+    external: true
-      name: postfixNet
+    name: postfixNet
   ldapNet:
-    external:
+    external: true
-      name: ldapNet
+    name: ldapNet

dockers/postfix/docker-compose.yml

@@ -44,8 +44,8 @@ volumes:
 
 networks:
   postfixNet:
-    external:
+    external: true
-      name: postfixNet
+    name: postfixNet
   jirafeauNet:
-    external:
+    external: true
-      name: jirafeauNet
+    name: jirafeauNet

dockers/proxy/config/nginx.tmpl.conf

@@ -307,7 +307,7 @@ server {
 
 # test    add_header X-Early-Data $tls1_3_early_data;
     location ~ /api/v[0-9]+/(users/)?websocket$ {
-       proxy_pass http://__MATTER_HOST__.__DOMAIN__:8000;
+       proxy_pass http://__MATTER_HOST__.__DOMAIN__:8065;
 # test       proxy_http_version 1.1;
        proxy_set_header Upgrade $http_upgrade;
        proxy_set_header Connection "upgrade";
@@ -325,7 +325,7 @@ server {
    }
 
     location / {
-      proxy_pass http://__MATTER_HOST__.__DOMAIN__:8000;
+      proxy_pass http://__MATTER_HOST__.__DOMAIN__:8065;
       proxy_http_version 1.1;
       proxy_set_header Connection "";
       proxy_read_timeout 600s;

dockers/proxy/docker-compose.tmpl.yml.dist

@@ -135,87 +135,87 @@ services:
 
 networks:
   proxyNet:
-     external:
+    external: true
-       name: proxyNet
+    name: proxyNet
 {{web
   webNet:
-    external:
+    external: true
-      name: webNet
+    name: webNet
 }}
 {{jirafeau
   jirafeauNet:
-    external:
+    external: true
-      name: jirafeauNet
+    name: jirafeauNet
 }}
 {{ethercalc
   ethercalcNet:
-    external:
+    external: true
-      name: ethercalcNet
+    name: ethercalcNet
 }}
 {{etherpad
   etherpadNet:
-    external:
+    external: true
-      name: etherpadNet
+    name: etherpadNet
 }}
 {{framadate
   framadateNet:
-    external:
+    external: true
-      name: framadateNet
+    name: framadateNet
 }}
 {{ldap
   ldapNet:
-    external:
+    external: true
-      name: ldapNet
+    name: ldapNet
 }}
 {{mobilizon
   mobilizonNet:
-    external:
+    external: true
-      name: mobilizonNet
+    name: mobilizonNet
 }}
 {{cloud
   cloudNet:
-   external:
+    external: true
-     name: cloudNet
+    name: cloudNet
 }}
 {{collabora
   collaboraNet:
-   external:
+    external: true
-     name: collaboraNet
+    name: collaboraNet
 }}
 {{garradin
   garradinNet:
-    external:
+    external: true
-      name: garradinNet
+    name: garradinNet
 }}
 {{mattermost
   mattermostNet:
-   external:
+    external: true
-     name: mattermostNet
+    name: mattermostNet
 }}
 {{roundcube
   roundcubeNet:
-    external:
+    external: true
-      name: roundcubeNet
+    name: roundcubeNet
 }}
 {{gitea
   giteaNet:
-    external:
+    external: true
-      name: giteaNet
+    name: giteaNet
 }}
 {{dokuwiki
   dokuwikiNet:
-    external:
+    external: true
-      name: dokuwikiNet
+    name: dokuwikiNet
 }}
 {{postfix
   postfixNet:
-    external:
+    external: true
-      name: postfixNet
+    name: postfixNet
 }}
 {{vaultwarden
   vaultwardenNet:
-    external:
+    external: true
-      name: vaultwardenNet
+    name: vaultwardenNet
 }}
 #### BEGIN ORGA DEF_NET
 #### END ORGA DEF_NET

dockers/quotas/docker-compose.yml

@@ -37,5 +37,5 @@ volumes:
 
 networks:
   quotasNet:
-    external:
+    external: true
-      name: quotasNet
+    name: quotasNet

dockers/roundcube/docker-compose.yml

@@ -43,8 +43,8 @@ volumes:
 
 networks:
   roundcubeNet:
-    external:
+    external: true
-      name: roundcubeNet
+    name: roundcubeNet
   postfixNet:
-    external:
+    external: true
-      name: postfixNet
+    name: postfixNet

dockers/sympa/docker-compose.yml

@@ -63,8 +63,8 @@ volumes:
 
 networks:
   sympaNet:
-    external:
+    external: true
-      name: sympaNet
+    name: sympaNet
   jirafeauNet:
-    external:
+    external: true
-      name: jirafeauNet
+    name: jirafeauNet

dockers/vaultwarden/docker-compose.yml

@@ -1,4 +1,4 @@
-version: '3'
+version: '3.9'
 services:
 
   vaultwarden:
@@ -6,7 +6,8 @@ services:
     container_name: ${vaultwardenServName}
     restart: ${restartPolicy}
     depends_on:
-      - db
+      db:
+        condition: service_healthy
     links:
       - db
     environment:
@@ -41,6 +42,11 @@ services:
       - /home/sauve/:/svg/
       - /etc/localtime:/etc/localtime:ro
       - /etc/timezone:/etc/timezone:ro
+    healthcheck:
+      test: ["CMD", "mysqladmin", "ping", "--silent"]
+      interval: 30s
+      timeout: 30s
+      retries: 5
 
 volumes:
   vaultwarden-data:
@@ -48,8 +54,8 @@ volumes:
 
 networks:
   vaultwardenNet:
-    external:
+    external: true
-      name: vaultwardenNet
+    name: vaultwardenNet
   postfixNet:
-    external:
+    external: true
-      name: postfixNet
+    name: postfixNet

dockers/web/docker-compose.yml

@@ -20,5 +20,5 @@ volumes:
   
 networks:
   webNet:
-    external:
+    external: true
-      name: webNet
+    name: webNet