From 5bc1a1c688a921328ae8c9933ad5ed58342d4bbc Mon Sep 17 00:00:00 2001
From: root <root@wks1.office.barbu-it.net>
Date: Sat, 29 Oct 2022 05:52:35 +0000
Subject: [PATCH] Fix: apps to latest paasify version

---
 consul/docker-compose.yml     | 64 +++++++----------------------------
 minio/docker-compose.ldap.yml |  1 +
 minio/docker-compose.yml      | 10 ++++--
 minio/vars.yml                |  2 ++
 openldap/docker-compose.yml   | 17 +++++-----
 traefik/docker-compose.yml    | 10 ++++--
 traefik/vars.yml              |  3 ++
 7 files changed, 41 insertions(+), 66 deletions(-)

diff --git a/consul/docker-compose.yml b/consul/docker-compose.yml
index 7fa5972..62f4a9f 100644
--- a/consul/docker-compose.yml
+++ b/consul/docker-compose.yml
@@ -1,62 +1,22 @@
 ---
-version: '3'
-
-# Default consul image
-x-consul: &consul
-  #image: consul:latest
-  image: consul:1.10
-  restart: unless-stopped
-  networks:
-    - default
-  environment:
-    CONSUL_BIND_INTERFACE: eth0
-
-# Roles configuration
-x-consul-agent: &consul_agent
-  <<: *consul
-  command: "agent -retry-join consul -client 0.0.0.0"
-
-x-consul-server: &consul_server
-  <<: *consul
-  command: "agent -server -retry-join consul -client 0.0.0.0"
-
-x-consul-bootstrap: &consul_server_bootstrap
-  <<: *consul_server
-  command: "agent -server -bootstrap-expect 3 -ui -client 0.0.0.0"
-    #ports:
-    #  - "8400:8400"
-    #  - "8500:8500"
-    #  - "8600:8600"
-    #  - "8600:8600/udp"
+# version: '3'
 
 networks:
-  default:
+  consul:
+    name: ${net_consul:-consul}
 
 services:
 
   consul:
-    <<: *consul_server_bootstrap
+    image: consul:1.10
     hostname: consul
+    command: "agent -server -bootstrap-expect 1 -ui -client 0.0.0.0"
+    environment:
+      CONSUL_BIND_INTERFACE: eth0
+    networks:
+      consul:
+        aliases:
+          - consul
     volumes:
-      - $app_data_dir/server1:/consul/data
-
-  consul-server-1:
-    <<: *consul_server
-    hostname: consul-server-1
-
-  consul-server-2:
-    <<: *consul_server
-    hostname: consul-server-2
-
-  consul-agent:
-    <<: *consul_agent
-    hostname: consul-agent-0
-
-#  consul-agent-1:
-#    <<: *consul_agent
-#    hostname: consul-agent-1
-#
-#  consul-agent-2:
-#    <<: *consul_agent
-#    hostname: consul-agent-2
+      - $app_dir_data/server1:/consul/data
 
diff --git a/minio/docker-compose.ldap.yml b/minio/docker-compose.ldap.yml
index 6aacda2..bb896ea 100644
--- a/minio/docker-compose.ldap.yml
+++ b/minio/docker-compose.ldap.yml
@@ -1,6 +1,7 @@
 
 networks:
   ldap:
+    external: true
     name: ${net_ldap:-ldap}
 
 services:
diff --git a/minio/docker-compose.yml b/minio/docker-compose.yml
index 3afaa76..921d663 100644
--- a/minio/docker-compose.yml
+++ b/minio/docker-compose.yml
@@ -15,14 +15,18 @@ version: "3.9"
 # MINIO_SECRET_KEY
 
 networks:
-  default:
-    name: ${net_ostorage:-s3}
-
+  s3:
+    name: ${app_network_name:-s3}
 
 services:
   minio:
     image: ${app_image}:${app_image_version}
     command: server --console-address ":9001" /data
+    networks:
+      s3:
+        aliases:
+          - minio
+          - s3
     volumes:
       - ./data:/data
       - ./config:/root/.minio
diff --git a/minio/vars.yml b/minio/vars.yml
index ac60143..da573f8 100644
--- a/minio/vars.yml
+++ b/minio/vars.yml
@@ -1,2 +1,4 @@
 app_image: quay.io/minio/minio
 app_image_version: RELEASE.2022-10-20T00-55-09Z
+
+app_network_name: $net_ostorage
diff --git a/openldap/docker-compose.yml b/openldap/docker-compose.yml
index e2fc415..a24eb4b 100644
--- a/openldap/docker-compose.yml
+++ b/openldap/docker-compose.yml
@@ -1,19 +1,18 @@
 version: "3.9"
 
-#networks:
-#  default:
-#    name: ${app_network_name}
-
+networks:
+  ldap:
+    name: ${app_network_name:-ldap}
 
 services:
   openldap:
     image: osixia/openldap:latest
     restart: always
-      #networks:
-      #  default:
-      #    aliases:
-      #      - ldap
-      #      - $ldap_uri_server
+    networks:
+      ldap:
+        aliases:
+          - openldap
+          - $ldap_host
     environment:
       - "LDAP_ORGANISATION=${ldap_org:-$app_fqdn}"
       - "LDAP_DOMAIN=${ldap_domain:-$app_fqdn}"
diff --git a/traefik/docker-compose.yml b/traefik/docker-compose.yml
index 59f1a23..7b8426a 100644
--- a/traefik/docker-compose.yml
+++ b/traefik/docker-compose.yml
@@ -21,12 +21,18 @@ version: "3.7"
   #     traefik_svc_tls: false
   #     traefik_svc_entrypoints: default-http
 
+networks:
+  traefik:
+    #external: true
+    name: ${net_proxy_web}
+
+
 services:
   traefik:
     image: ${app_image}:${app_image_version}
     restart: always
-    #networks:
-    #  default:
+    networks:
+      traefik:
     environment:
 
       #command:
diff --git a/traefik/vars.yml b/traefik/vars.yml
index 7e49f5c..9aeb95b 100644
--- a/traefik/vars.yml
+++ b/traefik/vars.yml
@@ -1,6 +1,9 @@
 app_image: traefik
 app_image_version: v2.9
 
+# Take over network_proxy !
+app_network_name: ${net_proxy}
+
 # Let's encrypt support
 traefik_svc_certresolver: default
 traefik_svc_certresolver_provider: null