From e63a0e78b34b0977b33657a5c4e50d9418932a70 Mon Sep 17 00:00:00 2001 From: gael Date: Thu, 27 Apr 2023 14:57:15 +0200 Subject: [PATCH] Maj docker-compose --- bin/dns.sh | 2 +- bin/upgradeDockerCompose.sh | 8 +++ config/orgaTmpl/docker-compose.yml | 84 +++++++++++----------- dockers/cachet/docker-compose.yml | 4 +- dockers/cloud/docker-compose.yml | 8 +-- dockers/collabora/docker-compose.yml | 4 +- dockers/dokuwiki/docker-compose.yml | 8 +-- dockers/ethercalc/docker-compose.yml | 4 +- dockers/etherpad/docker-compose.yml | 8 +-- dockers/framadate/docker-compose.yml | 8 +-- dockers/garradin/docker-compose.yml | 12 ++-- dockers/gitea/docker-compose.yml | 8 +-- dockers/jirafeau/docker-compose.yml | 8 +-- dockers/ldap/docker-compose.yml | 8 +-- dockers/mattermost/docker-compose.yml | 12 ++-- dockers/mobilizon/docker-compose.yml | 25 ++++--- dockers/postfix/docker-compose.yml | 8 +-- dockers/proxy/config/nginx.tmpl.conf | 4 +- dockers/proxy/docker-compose.tmpl.yml.dist | 68 +++++++++--------- dockers/quotas/docker-compose.yml | 4 +- dockers/roundcube/docker-compose.yml | 8 +-- dockers/sympa/docker-compose.yml | 8 +-- dockers/vaultwarden/docker-compose.yml | 18 +++-- dockers/web/docker-compose.yml | 4 +- 24 files changed, 177 insertions(+), 156 deletions(-) create mode 100644 bin/upgradeDockerCompose.sh diff --git a/bin/dns.sh b/bin/dns.sh index e96fd87..a7edcab 100755 --- 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="" diff --git a/bin/upgradeDockerCompose.sh b/bin/upgradeDockerCompose.sh new file mode 100644 index 0000000..f7ab21b --- /dev/null +++ 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 diff --git a/config/orgaTmpl/docker-compose.yml b/config/orgaTmpl/docker-compose.yml index 02b4b75..7d9ec3e 100644 --- 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 diff --git a/dockers/cachet/docker-compose.yml b/dockers/cachet/docker-compose.yml index 011d758..4a7213d 100644 --- 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 diff --git a/dockers/cloud/docker-compose.yml b/dockers/cloud/docker-compose.yml index 5eb6e6b..5b624aa 100644 --- 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 diff --git a/dockers/collabora/docker-compose.yml b/dockers/collabora/docker-compose.yml index b36e270..bfab722 100644 --- 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 diff --git a/dockers/dokuwiki/docker-compose.yml b/dockers/dokuwiki/docker-compose.yml index b9a7f55..9e94e6f 100644 --- 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 diff --git a/dockers/ethercalc/docker-compose.yml b/dockers/ethercalc/docker-compose.yml index 96da244..0db2563 100644 --- 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 diff --git a/dockers/etherpad/docker-compose.yml b/dockers/etherpad/docker-compose.yml index 7abf9cc..ddf004f 100644 --- 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 diff --git a/dockers/framadate/docker-compose.yml b/dockers/framadate/docker-compose.yml index 3bacbc4..eaab81f 100644 --- 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 diff --git a/dockers/garradin/docker-compose.yml b/dockers/garradin/docker-compose.yml index cff18ca..6052ac6 100644 --- 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 diff --git a/dockers/gitea/docker-compose.yml b/dockers/gitea/docker-compose.yml index 423b875..07e0bad 100644 --- 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 diff --git a/dockers/jirafeau/docker-compose.yml b/dockers/jirafeau/docker-compose.yml index 77e3197..868cbcd 100644 --- 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 diff --git a/dockers/ldap/docker-compose.yml b/dockers/ldap/docker-compose.yml index cf55f89..a628951 100644 --- 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 diff --git a/dockers/mattermost/docker-compose.yml b/dockers/mattermost/docker-compose.yml index 6045bd5..ba21fcf 100644 --- 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 diff --git a/dockers/mobilizon/docker-compose.yml b/dockers/mobilizon/docker-compose.yml index 932b1ee..946b1df 100644 --- 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 diff --git a/dockers/postfix/docker-compose.yml b/dockers/postfix/docker-compose.yml index 3d794e8..2fe836c 100644 --- 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 diff --git a/dockers/proxy/config/nginx.tmpl.conf b/dockers/proxy/config/nginx.tmpl.conf index 410e74f..b20e50a 100644 --- 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; diff --git a/dockers/proxy/docker-compose.tmpl.yml.dist b/dockers/proxy/docker-compose.tmpl.yml.dist index 72eefad..7415dd6 100644 --- 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 diff --git a/dockers/quotas/docker-compose.yml b/dockers/quotas/docker-compose.yml index 9c4cd76..069a268 100644 --- 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 diff --git a/dockers/roundcube/docker-compose.yml b/dockers/roundcube/docker-compose.yml index 66dd203..3502bc7 100644 --- 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 diff --git a/dockers/sympa/docker-compose.yml b/dockers/sympa/docker-compose.yml index a501835..6fe5d22 100644 --- 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 diff --git a/dockers/vaultwarden/docker-compose.yml b/dockers/vaultwarden/docker-compose.yml index 2dc593a..a1f5b6e 100644 --- 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 diff --git a/dockers/web/docker-compose.yml b/dockers/web/docker-compose.yml index 35e8b7e..cfb56e3 100644 --- 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