From ddc85c26ace48ccda491037211cea87a653b3353 Mon Sep 17 00:00:00 2001
From: afornerot <afornerot@cadoles.com>
Date: Fri, 3 Nov 2023 16:48:10 +0100
Subject: [PATCH] svg mode docker

---
 README.txt                        | 22 ++++++++++++----------
 src/envole-1.0/docker-compose.yml | 11 +++++++++--
 2 files changed, 21 insertions(+), 12 deletions(-)

diff --git a/README.txt b/README.txt
index b0c9fdc..763923e 100644
--- a/README.txt
+++ b/README.txt
@@ -13,19 +13,21 @@ Reconfigure
 
 ## Installation git / make / docker / docker-compose
 ```
-sudo apt install git make eole-web apt-transport-https ca-certificates curl gnupg-agent software-properties-common
-sudo mkdir -p /etc/apt/keyrings
-curl -fsSL https://download.docker.com/linux/ubuntu/gpg | sudo gpg --dearmor -o /etc/apt/keyrings/docker.gpg
-echo \
-"deb [arch=$(dpkg --print-architecture) signed-by=/etc/apt/keyrings/docker.gpg] https://download.docker.com/linux/ubuntu \
-$(lsb_release -cs) stable" | sudo tee /etc/apt/sources.list.d/docker.list > /dev/null
-sudo apt update
-apt-get install docker-ce docker-ce-cli containerd.io docker-compose-plugin docker-compose
+ubuntu_version='22.04'
+key_url="https://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/unstable/xUbuntu_${ubuntu_version}/Release.key"
+sources_url="https://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/unstable/xUbuntu_${ubuntu_version}"
+
+echo "deb $sources_url/ /" | tee /etc/apt/sources.list.d/devel:kubic:libcontainers:unstable.list
+curl -fsSL $key_url | gpg --dearmor | tee /etc/apt/trusted.gpg.d/devel_kubic_libcontainers_unstable.gpg > /dev/null
+apt update
+apt install podman podman-docker podman-plugins containernetworking-plugin
+
+apt install python3-pip
+pip3 install podman-compose==1.0.2
 ```
 
 
-sudo apt install python3-pip -y
-pip3 install podman-compose
+
 ## Installation envole
 ```
 cd /root
diff --git a/src/envole-1.0/docker-compose.yml b/src/envole-1.0/docker-compose.yml
index e7a1550..3b23766 100644
--- a/src/envole-1.0/docker-compose.yml
+++ b/src/envole-1.0/docker-compose.yml
@@ -4,6 +4,7 @@ services:
   mariadb:
     image: docker.io/library/mariadb
     container_name: envole-mariadb
+    hostname: mariadb
     restart: always
     healthcheck:
       test: /envole/check.sh    
@@ -17,8 +18,9 @@ services:
       - ./volume/mariadb/envole:/envole
 
   openldap:
-    image: docker.io/library/bitnami/openldap:2
+    image: docker.io/bitnami/openldap:2
     container_name: envole-openldap
+    hostname: openldap
     restart: always
     healthcheck:
       test: /envole/check.sh    
@@ -35,8 +37,9 @@ services:
       - './volume/openldap/envole:/envole'
 
   keycloak:
-    image: docker.io/library/jboss/keycloak
+    image: docker.io/jboss/keycloak
     container_name: envole-keycloak
+    hostname: keycloak
     restart: always    
     healthcheck:
       test: curl --fail http://127.0.0.1:9990 || exit 1
@@ -52,6 +55,7 @@ services:
   ninegate:
     image: reg.cadoles.com/envole/ninegate
     container_name: envole-ninegate
+    hostname: ninegate
     restart: always
     healthcheck:
       test: curl --fail http://localhost || exit 1
@@ -67,6 +71,7 @@ services:
   nextcloud:
     image: docker.io/library/nextcloud
     container_name: envole-nextcloud
+    hostname: nextcloud
     restart: always
     healthcheck:
       test: curl --fail http://localhost || exit 1    
@@ -85,6 +90,7 @@ services:
   adminer:
     image: adminer
     container_name: envole-adminer
+    hostname: adminer
     restart: always
     ports:
       - 9100:8080       
@@ -92,6 +98,7 @@ services:
   phpldapadmin:
     image: osixia/phpldapadmin:latest
     container_name: envole-phpldapadmin
+    hostname: phpldapadmin
     restart: always      
     env_file: ./.env.local
     ports: