imapsync : pb de dockerfile + pas de traquage par bootstrap

dockers/imapsync/docker-compose.yml

@@ -14,19 +14,16 @@ services:
     expose:
       - 80
     volumes:
-<<<<<<< HEAD
       - ./imapsync_form_extra.html:/var/tmp/imapsync_form_extra.html
-=======
-      - config:/var/tmp/
+      - ./imapsync_form.css:/var/tmp/imapsync_form.css
 #on autorise 40% du cpu : si la machine s' emballe, les ressources seront atteintes et imapsync régulera
     cpus: 0.4
 
->>>>>>> a5ebf7d1e65b1e0118b9a9435e1acc243832b318
-#    labels:
-#      - "traefik.enable=true"
-#      - "traefik.http.routers.${imapsyncServName}.rule=Host(`${imapsyncHost}.${domain}`)"
-#      - "traefik.http.services.${imapsyncServName}.loadbalancer.server.port=${imapsyncPort}"
-#      - "traefik.docker.network=imapsyncNet"
+    labels:
+      - "traefik.enable=true"
+      - "traefik.http.routers.${imapsyncServName}.rule=Host(`${imapsyncHost}.${domain}`)"
+      - "traefik.http.services.${imapsyncServName}.loadbalancer.server.port=${imapsyncPort}"
+      - "traefik.docker.network=imapsyncNet"
 
 networks:
   imapsyncNet:

dockers/imapsync/imapsync_form_extra.html

@@ -17,12 +17,14 @@
         <meta charset="utf-8">
         <meta name="viewport" content="width=device-width, initial-scale=1">
 
+<!--    
         <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/css/bootstrap.min.css" 
 	integrity="sha384-BVYiiSIFeK1dGmJRAkycuHAHRg32OmUcww7on3RYdg4Va+PmSTsz/K68vbdEjh4u" crossorigin="anonymous">
 	
 	<link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/css/bootstrap-theme.min.css" 
 	integrity="sha384-rHyoN1iRsVXV4nD0JutlnGaslCJuC7uwjduW9SVrLvRYooPp2bWYgmgJQIXwl/Sp" crossorigin="anonymous">
-        
+-->
+
         <link rel="stylesheet" href="imapsync_form.css">
         <link rel="stylesheet" href="../S/style.css" type="text/css"   />