From: Giorgio Ravera <giorgio.ravera@gmail.com>
Date: Wed, 14 Apr 2021 19:39:05 +0000 (+0200)
Subject: removed watchtower startup message and minor fixes
X-Git-Url: http://git.giorgioravera.it/?a=commitdiff_plain;h=535de6c2b6ec963e0b1bca9fcd55810604fdeea3;p=docker.git

removed watchtower startup message and minor fixes
---

diff --git a/portainer/docker-compose.yaml b/portainer/docker-compose.yaml
index 1950f98..2d89a88 100644
--- a/portainer/docker-compose.yaml
+++ b/portainer/docker-compose.yaml
@@ -24,9 +24,8 @@ services:
       - "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.middlewares.portainer-https-redirect.redirectscheme.scheme=https"
+      - "traefik.http.middlewares.portainer-https-redirect.redirectscheme.scheme=https"
       - "traefik.http.services.portainer.loadbalancer.server.port=9000"
 
 networks:
diff --git a/traefik/docker-compose.yaml b/traefik/docker-compose.yaml
index bbb1a4e..247e2e5 100644
--- a/traefik/docker-compose.yaml
+++ b/traefik/docker-compose.yaml
@@ -39,9 +39,8 @@ services:
       - "traefik.http.routers.traefik-secure.entrypoints=https"
       - "traefik.http.routers.traefik-secure.rule=Host(`traefik.giorgioravera.it`)"
       - "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.routers.traefik-secure.middlewares=traefik-auth"
-      #- "traefik.http.middlewares.traefik-https-redirect.redirectscheme.scheme=https"
+      - "traefik.http.middlewares.traefik-https-redirect.redirectscheme.scheme=https"
       - "traefik.http.middlewares.traefik-auth.basicauth.usersfile=/passwd"
       - "traefik.http.services.workaround.loadbalancer.server.port=9999"
diff --git a/watchtower/docker-compose.yaml b/watchtower/docker-compose.yaml
index 706faf3..6b6bd44 100644
--- a/watchtower/docker-compose.yaml
+++ b/watchtower/docker-compose.yaml
@@ -11,6 +11,7 @@ services:
       - WATCHTOWER_POLL_INTERVAL=21600
       - WATCHTOWER_LABEL_ENABLE=false
       - WATCHTOWER_MONITOR_ONLY=false
+      - WATCHTOWER_NO_STARTUP_MESSAGE=true
       - WATCHTOWER_NOTIFICATIONS_LEVEL=info
       - WATCHTOWER_NOTIFICATIONS=email
       - WATCHTOWER_NOTIFICATION_EMAIL_FROM=docker@giorgioravera.it
diff --git a/xen-orchestra-ce/docker-compose.yaml b/xen-orchestra-ce/docker-compose.yaml
index c1e43e8..ff5b78c 100644
--- a/xen-orchestra-ce/docker-compose.yaml
+++ b/xen-orchestra-ce/docker-compose.yaml
@@ -4,7 +4,6 @@ services:
   orchestra:
     container_name: XO_server
     image: ezka77/xen-orchestra-ce:latest
-    #image: ezka77/xen-orchestra-ce:5.58
     restart: unless-stopped
     #ports:
     #  - "8000:8000"
@@ -37,9 +36,8 @@ services:
       - "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=xoa"
-      #- "traefik.http.middlewares.xoa-https-redirect.redirectscheme.scheme=https"
+      - "traefik.http.middlewares.xoa-https-redirect.redirectscheme.scheme=https"
       - "traefik.http.services.xoa.loadbalancer.server.port=8000"
 
   redis: