Fixed for traefik

diff --git a/portainer/docker-compose.yaml b/portainer/docker-compose.yaml
index db0dc9d629e1b2e612e675040820af115a693368..3fd399e49dbbb46c79a7e9dc3bb6a6d907e68316 100644 (file)
--- a/portainer/docker-compose.yaml
+++ b/portainer/docker-compose.yaml
@@ -6,12 +6,30 @@ services:
     image: portainer/portainer
     command: -H unix:///var/run/docker.sock
     restart: always
-    ports:
-      - 9000:9000
-      - 8000:8000
+    #ports:
+    #  - 9000:9000
+    #  - 8000:8000
     environment:
-      TZ: ${DOCKER_TZ} 
+      - TZ=${DOCKER_TZ} 
     volumes:
       - ${DOCKER_CFG_DIR}/portainer:/data
       - /var/run/docker.sock:/var/run/docker.sock
-    network_mode: host
+    networks:
+      - proxy
+    labels:
+      - "traefik.enable=true"
+      - "traefik.http.routers.portainer.entrypoints=http"
+      - "traefik.http.routers.portainer.rule=Host(`docker.giorgioravera.it`)"
+      #- "traefik.http.middlewares.portainer-https-redirect.redirectscheme.scheme=https"
+      #- "traefik.http.routers.portainer.middlewares=portainer-https-redirect"
+      - "traefik.http.routers.portainer-secure.entrypoints=https"
+      - "traefik.http.routers.portainer-secure.rule=Host(`docker.giorgioravera.it`)"
+      - "traefik.http.routers.portainer-secure.tls=true"
+      #- "traefik.http.routers.portainer-secure.tls.certresolver=http"
+      - "traefik.http.routers.portainer-secure.service=portainer"
+      - "traefik.http.services.portainer.loadbalancer.server.port=9000"
+      - "traefik.docker.network=proxy"
+
+networks:
+  proxy:
+    external: true

diff --git a/traefik/docker-compose.yml b/traefik/docker-compose.yml
new file mode 100644 (file)
index 0000000..4e31084
--- /dev/null
+++ b/traefik/docker-compose.yml
@@ -0,0 +1,40 @@
+version: '3'
+
+services:
+  traefik:
+    container_name: traefik
+    image: traefik:v2.0
+    restart: unless-stopped
+    ports:
+      - 80:80
+      - 443:443
+    environment:
+      - TZ=${DOCKER_TZ}
+    volumes:
+      - ${DOCKER_CFG_DIR}/traefik/traefik.yml:/traefik.yml:ro
+      - ${DOCKER_CFG_DIR}/traefik/acme.json:/acme.json
+      - ${DOCKER_CFG_DIR}/traefik/passwd:/passwd
+      - /var/run/docker.sock:/var/run/docker.sock
+    networks:
+      - proxy
+    labels:
+      - "traefik.enable=true"
+      - "traefik.http.routers.traefik.entrypoints=http"
+      - "traefik.http.routers.traefik.rule=Host(`traefik.giorgioravera.it`)"
+      - "traefik.http.routers.traefik.service=api@internal"
+      - "traefik.http.routers.traefik.middlewares=traefik-auth"
+      #- "traefik.http.routers.traefik.middlewares=traefik-https-redirect"
+      #- "traefik.http.middlewares.traefik-https-redirect.redirectscheme.scheme=https"
+      - "traefik.http.routers.traefik-secure.entrypoints=https"
+      - "traefik.http.routers.traefik-secure.rule=Host(`traefik.giorgioravera.it`)"
+      - "traefik.http.routers.traefik-secure.middlewares=traefik-auth"
+      - "traefik.http.routers.traefik-secure.tls=true"
+      #- "traefik.http.routers.traefik-secure.tls.certresolver=http"
+      - "traefik.http.routers.traefik-secure.service=api@internal"
+      - "traefik.http.middlewares.traefik-auth.basicauth.usersfile=/passwd"
+
+networks:
+  proxy:
+    external: true
+#  external:
+#    external: true

diff --git a/xen-orchestra-ce/docker-compose.yml b/xen-orchestra-ce/docker-compose.yml
index 2cf7c858dc4fd5388d2124f429aa43f98cb99d14..6795e0312a1ef6ea11ee10af549733e3d618d166 100644 (file)
--- a/xen-orchestra-ce/docker-compose.yml
+++ b/xen-orchestra-ce/docker-compose.yml
@@ -6,7 +6,7 @@ services:
     image: ezka77/xen-orchestra-ce
     restart: unless-stopped
     ports:
-      - "8081:8000"
+      - "8080:8000"
     depends_on:
       - redis
     environment:
@@ -18,16 +18,30 @@ services:
       # and enable the privileged capabilities for this container (access
       # host devices, ...) NB: it's a security issue, so be warned !
       #- USER=root
+      - TZ=${DOCKER_TZ}
     #privileged: true
     volumes:
-      #- xoa_data:/storage
       - ${DOCKER_CFG_DIR}/xoa_data:/storage
-#    network_mode: bridge
+    networks:
+      - proxy
     logging: &logging
       driver: "json-file"
       options:
          max-size: "1M"
          max-file: "2"
+    labels:
+      - "traefik.enable=true"
+      - "traefik.http.routers.xoa.entrypoints=http"
+      - "traefik.http.routers.xoa.rule=Host(`xoa.giorgioravera.it`)"
+      #- "traefik.http.middlewares.xoa-https-redirect.redirectscheme.scheme=https"
+      #- "traefik.http.routers.xoa.middlewares=portainer-https-redirect"
+      - "traefik.http.routers.xoa-secure.entrypoints=https"
+      - "traefik.http.routers.xoa-secure.rule=Host(`xoa.giorgioravera.it`)"
+      - "traefik.http.routers.xoa-secure.tls=true"
+      #- "traefik.http.routers.xoa-secure.tls.certresolver=http"
+      - "traefik.http.routers.xoa-secure.service=portainer"
+      - "traefik.http.services.xoa.loadbalancer.server.port=8000"
+      - "traefik.docker.network=proxy"
 
   redis:
     container_name: XO_redis
@@ -37,6 +51,11 @@ services:
     volumes:
       #- xoa_data:/data
       - ${DOCKER_CFG_DIR}/xoa_data:/data
-#    network_mode: bridge
+    networks:
+      - proxy
     logging:
       <<: *logging
+
+networks:
+  proxy:
+    external: true

diff --git a/zigbee2mqtt/docker-compose.yaml b/zigbee2mqtt/docker-compose.yaml
index 321a7dba14fac645722b5f973810e39e03db11fe..9776e4495df911351fe2d44bc857eabfdede2c5d 100644 (file)
--- a/zigbee2mqtt/docker-compose.yaml
+++ b/zigbee2mqtt/docker-compose.yaml
@@ -14,3 +14,5 @@ services:
     devices:
       - /dev/ttyACM0:/dev/ttyACM0
     network_mode: host
+    labels:
+    - traefik.enable=false