update

Traefik/docker-compose.yml

@@ -1,3 +1,4 @@
+
 #### NETWORKS
 networks:
   back_network:
@@ -26,24 +27,12 @@ services:
       - "./configs/dynamic:/etc/traefik/dynamic"
       - "./certificates/acme.json:/etc/traefik/acme/acme.json"
       - "./certificates:/etc/traefik/ssl"
-<<<<<<< HEAD
-<<<<<<< HEAD
       - "./log:/var/log"
-=======
-      - "./traefik/log:/var/log"
->>>>>>> 8e9a2c2beb8c28880271da161158adf0cb6617e0
-=======
-      - "./log:/var/log"
->>>>>>> 788e10b187487aabd04ab6b559995c1fa0994cb3
     networks:
       - back_network
       - front_network
 
-<<<<<<< HEAD
 ### Certificats
-=======
-# Certificats
->>>>>>> 8e9a2c2beb8c28880271da161158adf0cb6617e0
   reverse-proxy-https-helper:
     container_name: traefik-certificat
     image: alpine
@@ -53,41 +42,19 @@ services:
     volumes:
       - "./certificates:/etc/traefik/ssl"
     networks:
-<<<<<<< HEAD
-#      - back-network
       - front_network
 
 ### whoami
-=======
-      - front_network
-
-# whoami
->>>>>>> 8e9a2c2beb8c28880271da161158adf0cb6617e0
   whoami:
     container_name: whoami
     hostname: whoami
     image: traefik/whoami
-<<<<<<< HEAD
-    restart: always
-=======
     restart: unless-stopped
->>>>>>> 8e9a2c2beb8c28880271da161158adf0cb6617e0
     networks:
       - front_network
     labels:
       - "traefik.enable=true"
       - "traefik.docker.network=front_network"
-<<<<<<< HEAD
-## HTTP
-      - "traefik.http.routers.whoami-http.rule=Host(`whoami.10.0.4.29.traefik.me`)"
-      - "traefik.http.routers.whoami-http.entrypoints=http"
-## HTTPS
-      - "traefik.http.routers.whoami-https.rule=Host(`whoami.10.0.4.29.traefik.me`)"
-      - "traefik.http.routers.whoami-https.entrypoints=https"
-      - "traefik.http.routers.whoami-https.tls=true"
-## Middleware
-## Service
-=======
 # HTTP
       - "traefik.http.routers.whoami-http.rule=Host(`whoami.10.0.4.29.traefik.me`)"
       - "traefik.http.routers.whoami-http.entrypoints=http"
@@ -97,4 +64,3 @@ services:
       - "traefik.http.routers.whoami-https.tls=true"
 # Middleware
 # Service
->>>>>>> 8e9a2c2beb8c28880271da161158adf0cb6617e0