From 4626df312b3384638f1f8106e92ddea3801ffea2 Mon Sep 17 00:00:00 2001
From: hcornet <hcornet@tips-of-mine.fr>
Date: Mon, 1 Apr 2024 10:35:59 +0200
Subject: [PATCH] update

---
 Install/README.md          | 24 ++++++++++++++++++++++++
 Traefik/docker-compose.yml | 16 ----------------
 2 files changed, 24 insertions(+), 16 deletions(-)
 create mode 100644 Install/README.md

diff --git a/Install/README.md b/Install/README.md
new file mode 100644
index 00000000..03937fa5
--- /dev/null
+++ b/Install/README.md
@@ -0,0 +1,24 @@
+# Installation Docker et Docker Compose
+
+
+apt update
+
+apt -y install apt-transport-https ca-certificates curl gnupg2 software-properties-common
+
+curl -fsSL https://download.docker.com/linux/debian/gpg | gpg --dearmor -o /etc/apt/trusted.gpg.d/docker-archive-keyring.gpg
+
+add-apt-repository \
+   "deb [arch=amd64] https://download.docker.com/linux/debian \
+   $(lsb_release -cs) \
+   stable"
+
+apt update
+
+apt install docker-ce docker-ce-cli containerd.io docker-compose-plugin -y
+
+systemctl enable --now docker
+
+usermod -aG docker $USER
+
+newgrp docker
+
diff --git a/Traefik/docker-compose.yml b/Traefik/docker-compose.yml
index 1f7a3d51..11e2b9f4 100644
--- a/Traefik/docker-compose.yml
+++ b/Traefik/docker-compose.yml
@@ -1,7 +1,3 @@
----
-<<<<<<< HEAD
-version: '3.7'
-
 #### NETWORKS
 networks:
   back_network:
@@ -12,18 +8,6 @@ networks:
     attachable: true
 
 #### SERVICES
-=======
-### networks
-networks:
-  back_network:
-    driver: bridge
-    attachable: true
-  front_network:
-    driver: bridge
-    attachable: true
-
-### services
->>>>>>> 8e9a2c2beb8c28880271da161158adf0cb6617e0
 services:
 
 ### traefik