Maj docker-compose

1 year ago · e63a0e78b3
24 changed files with 177 additions and 156 deletions
--- a/bin/dns.sh
+++ b/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=""
--- a/bin/upgradeDockerCompose.sh
+++ b/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
--- a/config/orgaTmpl/docker-compose.yml
+++ b/config/orgaTmpl/docker-compose.yml
@ -175,78 +175,78 @@ volumes:
 #}}
 #{{db
  orgaDB:
-    external:
-      name: orga_${orga}orgaDB
+    external: true
+    name: orga_${orga}orgaDB
 #}}
 #{{agora
  matterConfig:
-    external:
-      name: orga_${orga}matterConfig
+    external: true
+    name: orga_${orga}matterConfig
  matterData:
-    external:
-      name: orga_${orga}matterData
+    external: true
+    name: orga_${orga}matterData
  matterLogs:
-    external:
-      name: orga_${orga}matterLogs
+    external: true
+    name: orga_${orga}matterLogs
  matterPlugins:
-    external:
-      name: orga_${orga}matterPlugins
+    external: true
+    name: orga_${orga}matterPlugins
  matterClientPlugins:
-    external:
-      name: orga_${orga}matterClientPlugins
+    external: true
+    name: orga_${orga}matterClientPlugins
  matterIcons:
-    external:
-      name: matterIcons
+    external: true
+    name: matterIcons
 #{{cloud
  cloudMain:
-    external:
-      name: orga_${orga}cloudMain
+    external: true
+    name: orga_${orga}cloudMain
  cloudData:
-    external:
-      name: orga_${orga}cloudData
+    external: true
+    name: orga_${orga}cloudData
  cloudConfig:
-    external:
-      name: orga_${orga}cloudConfig
+    external: true
+    name: orga_${orga}cloudConfig
  cloudApps:
-    external:
-      name: orga_${orga}cloudApps
+    external: true
+    name: orga_${orga}cloudApps
  cloudCustomApps:
-    external:
-      name: orga_${orga}cloudCustomApps
+    external: true
+    name: orga_${orga}cloudCustomApps
  cloudThemes:
-    external:
-      name: orga_${orga}cloudThemes
+    external: true
+    name: orga_${orga}cloudThemes
  cloudPhp:
-    external:
-      name: orga_${orga}cloudPhp
+    external: true
+    name: orga_${orga}cloudPhp
 #}}
 #{{wiki
  wikiData:
-    external:
-      name: orga_${orga}wikiData
+    external: true
+    name: orga_${orga}wikiData
  wikiConf:
-    external:
-      name: orga_${orga}wikiConf
+    external: true
+    name: orga_${orga}wikiConf
  wikiPlugins:
-    external:
-      name: orga_${orga}wikiPlugins
+    external: true
+    name: orga_${orga}wikiPlugins
  wikiLibtpl:
-    external:
-      name: orga_${orga}wikiLibtpl
+    external: true
+    name: orga_${orga}wikiLibtpl
  wikiLogs:
-    external:
-      name: orga_${orga}wikiLogs
+    external: true
+    name: orga_${orga}wikiLogs
 #}}
 #{{wp
  wordpress:
-    external:
-      name: orga_${orga}wordpress
+    external: true
+    name: orga_${orga}wordpress
 #}}

 networks:
  orgaNet:
-    external:
-      name: ${orga}orgaNet
+    external: true
+    name: ${orga}orgaNet
  # postfixNet:
  #   external:
  #     name: postfixNet
--- a/dockers/cachet/docker-compose.yml
+++ b/dockers/cachet/docker-compose.yml
@ -43,5 +43,5 @@ volumes:

 networks:
  cachetNet:
-    external:
-      name: cachetNet
+    external: true
+    name: cachetNet
--- a/dockers/cloud/docker-compose.yml
+++ b/dockers/cloud/docker-compose.yml
@ -62,8 +62,8 @@ volumes:

 networks:
  cloudNet:
-    external:
-      name: cloudNet
+    external: true
+    name: cloudNet
  postfixNet:
-    external:
-      name: postfixNet
+    external: true
+    name: postfixNet
--- a/dockers/collabora/docker-compose.yml
+++ b/dockers/collabora/docker-compose.yml
@ -30,5 +30,5 @@ services:

 networks:
  collaboraNet:
-    external:
-      name: collaboraNet
+    external: true
+    name: collaboraNet
--- a/dockers/dokuwiki/docker-compose.yml
+++ b/dockers/dokuwiki/docker-compose.yml
@ -29,8 +29,8 @@ volumes:

 networks:
  dokuwikiNet:
-    external:
-      name: dokuwikiNet
+    external: true
+    name: dokuwikiNet
  postfixNet:
-    external:
-      name: postfixNet
+    external: true
+    name: postfixNet
--- a/dockers/ethercalc/docker-compose.yml
+++ b/dockers/ethercalc/docker-compose.yml
@ -30,5 +30,5 @@ volumes:

 networks:
  ethercalcNet:
-    external:
-      name: ethercalcNet
+    external: true
+    name: ethercalcNet
--- a/dockers/etherpad/docker-compose.yml
+++ b/dockers/etherpad/docker-compose.yml
@ -40,8 +40,8 @@ volumes:
  
 networks:
  etherpadNet:
-    external:
-      name: etherpadNet
+    external: true
+    name: etherpadNet
  postfixNet:
-    external:
-      name: postfixNet
+    external: true
+    name: postfixNet
--- a/dockers/framadate/docker-compose.yml
+++ b/dockers/framadate/docker-compose.yml
@ -45,8 +45,8 @@ volumes:

 networks:
   framadateNet:
-     external:
-       name: framadateNet
+    external: true
+    name: framadateNet
   postfixNet:
-     external:
-       name: postfixNet
+    external: true
+    name: postfixNet
--- a/dockers/garradin/docker-compose.yml
+++ b/dockers/garradin/docker-compose.yml
@ -27,9 +27,9 @@ volumes:
  assoUsers:

 networks:
-    garradinNet:
-      external:
-        name: garradinNet
-    postfixNet:
-      external:
-        name: postfixNet
+  garradinNet:
+    external: true
+    name: garradinNet
+  postfixNet:
+    external: true
+    name: postfixNet
--- a/dockers/gitea/docker-compose.yml
+++ b/dockers/gitea/docker-compose.yml
@ -40,8 +40,8 @@ volumes:
                          
 networks:
  giteaNet:
-    external:
-      name: giteaNet
+    external: true
+    name: giteaNet
  postfixNet:
-    external:
-      name: postfixNet
+    external: true
+    name: postfixNet
--- a/dockers/jirafeau/docker-compose.yml
+++ b/dockers/jirafeau/docker-compose.yml
@ -31,8 +31,8 @@ volumes:

 networks:
  jirafeauNet:
-    external:
-      name: jirafeauNet
+    external: true
+    name: jirafeauNet
  postfixNet:
-    external:
-      name: postfixNet
+    external: true
+    name: postfixNet
--- a/dockers/ldap/docker-compose.yml
+++ b/dockers/ldap/docker-compose.yml
@ -64,8 +64,8 @@ volumes:

 networks:
  ldapNet:
-    external:
-      name: ldapNet
+    external: true
+    name: ldapNet
  postfixNet:
-    external:
-      name: postfixNet
+    external: true
+    name: postfixNet
--- a/dockers/mattermost/docker-compose.yml
+++ b/dockers/mattermost/docker-compose.yml
@ -64,10 +64,10 @@ volumes:
 #  matterIcons:

 networks:
-   mattermostNet:
-     external:
-       name: mattermostNet
-   postfixNet:
-     external:
-       name: postfixNet
+  mattermostNet:
+    external: true
+    name: mattermostNet
+  postfixNet:
+    external: true
+    name: postfixNet

--- a/dockers/mobilizon/docker-compose.yml
+++ b/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:
-      name: mobilizonNet
+    external: true
+    name: mobilizonNet
  postfixNet:
-    external:
-      name: postfixNet
+    external: true
+    name: postfixNet
  ldapNet:
-    external:
-      name: ldapNet
+    external: true
+    name: ldapNet
--- a/dockers/postfix/docker-compose.yml
+++ b/dockers/postfix/docker-compose.yml
@ -44,8 +44,8 @@ volumes:

 networks:
  postfixNet:
-    external:
-      name: postfixNet
+    external: true
+    name: postfixNet
  jirafeauNet:
-    external:
-      name: jirafeauNet
+    external: true
+    name: jirafeauNet
--- a/dockers/proxy/config/nginx.tmpl.conf
+++ b/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;
--- a/dockers/proxy/docker-compose.tmpl.yml.dist
+++ b/dockers/proxy/docker-compose.tmpl.yml.dist
@ -135,87 +135,87 @@ services:

 networks:
  proxyNet:
-     external:
-       name: proxyNet
+    external: true
+    name: proxyNet
 {{web
  webNet:
-    external:
-      name: webNet
+    external: true
+    name: webNet
 }}
 {{jirafeau
  jirafeauNet:
-    external:
-      name: jirafeauNet
+    external: true
+    name: jirafeauNet
 }}
 {{ethercalc
  ethercalcNet:
-    external:
-      name: ethercalcNet
+    external: true
+    name: ethercalcNet
 }}
 {{etherpad
  etherpadNet:
-    external:
-      name: etherpadNet
+    external: true
+    name: etherpadNet
 }}
 {{framadate
  framadateNet:
-    external:
-      name: framadateNet
+    external: true
+    name: framadateNet
 }}
 {{ldap
  ldapNet:
-    external:
-      name: ldapNet
+    external: true
+    name: ldapNet
 }}
 {{mobilizon
  mobilizonNet:
-    external:
-      name: mobilizonNet
+    external: true
+    name: mobilizonNet
 }}
 {{cloud
  cloudNet:
-   external:
-     name: cloudNet
+    external: true
+    name: cloudNet
 }}
 {{collabora
  collaboraNet:
-   external:
-     name: collaboraNet
+    external: true
+    name: collaboraNet
 }}
 {{garradin
  garradinNet:
-    external:
-      name: garradinNet
+    external: true
+    name: garradinNet
 }}
 {{mattermost
  mattermostNet:
-   external:
-     name: mattermostNet
+    external: true
+    name: mattermostNet
 }}
 {{roundcube
  roundcubeNet:
-    external:
-      name: roundcubeNet
+    external: true
+    name: roundcubeNet
 }}
 {{gitea
  giteaNet:
-    external:
-      name: giteaNet
+    external: true
+    name: giteaNet
 }}
 {{dokuwiki
  dokuwikiNet:
-    external:
-      name: dokuwikiNet
+    external: true
+    name: dokuwikiNet
 }}
 {{postfix
  postfixNet:
-    external:
-      name: postfixNet
+    external: true
+    name: postfixNet
 }}
 {{vaultwarden
  vaultwardenNet:
-    external:
-      name: vaultwardenNet
+    external: true
+    name: vaultwardenNet
 }}
 #### BEGIN ORGA DEF_NET
 #### END ORGA DEF_NET
--- a/dockers/quotas/docker-compose.yml
+++ b/dockers/quotas/docker-compose.yml
@ -37,5 +37,5 @@ volumes:

 networks:
  quotasNet:
-    external:
-      name: quotasNet
+    external: true
+    name: quotasNet
--- a/dockers/roundcube/docker-compose.yml
+++ b/dockers/roundcube/docker-compose.yml
@ -43,8 +43,8 @@ volumes:

 networks:
  roundcubeNet:
-    external:
-      name: roundcubeNet
+    external: true
+    name: roundcubeNet
  postfixNet:
-    external:
-      name: postfixNet
+    external: true
+    name: postfixNet
--- a/dockers/sympa/docker-compose.yml
+++ b/dockers/sympa/docker-compose.yml
@ -63,8 +63,8 @@ volumes:

 networks:
  sympaNet:
-    external:
-      name: sympaNet
+    external: true
+    name: sympaNet
  jirafeauNet:
-    external:
-      name: jirafeauNet
+    external: true
+    name: jirafeauNet
--- a/dockers/vaultwarden/docker-compose.yml
+++ b/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:
-      name: vaultwardenNet
+    external: true
+    name: vaultwardenNet
  postfixNet:
-    external:
-      name: postfixNet
+    external: true
+    name: postfixNet
--- a/dockers/web/docker-compose.yml
+++ b/dockers/web/docker-compose.yml
@ -20,5 +20,5 @@ volumes:
  
 networks:
  webNet:
-    external:
-      name: webNet
+    external: true
+    name: webNet