From: Giorgio Ravera <giorgio.ravera@gmail.com>
Date: Sun, 15 Mar 2020 18:09:55 +0000 (+0100)
Subject: Trafik with fix IP and other minor changes
X-Git-Url: http://git.giorgioravera.it/?a=commitdiff_plain;h=7825bffaf9ac1be8a64ce425092ee2e9990d0937;p=docker.git

Trafik with fix IP and other minor changes
---

diff --git a/env b/env
index 6b9952f..6eae9be 100644
--- a/env
+++ b/env
@@ -1,2 +1,2 @@
-DOCKER_CFG_DIR=/srv/docker
-DOCKER_TZ="Europe/Rome"
+export DOCKER_CFG_DIR=/srv/docker
+export DOCKER_TZ="Europe/Rome"
diff --git a/mosquitto/docker-compose.yaml b/mosquitto/docker-compose.yaml
index dff9c12..ed0e143 100644
--- a/mosquitto/docker-compose.yaml
+++ b/mosquitto/docker-compose.yaml
@@ -3,7 +3,7 @@ version: '3'
 services:
   mosquitto:
     container_name: mosquitto
-    image: eclipse-mosquitto
+    image: eclipse-mosquitto:latest
     restart: always
     #ports:
     #  - 1883:1883
diff --git a/traefik/docker-compose.yaml.net b/traefik/docker-compose.yaml.net
index 0e080ee..0eead84 100644
--- a/traefik/docker-compose.yaml.net
+++ b/traefik/docker-compose.yaml.net
@@ -3,7 +3,8 @@ version: '3'
 services:
   traefik:
     container_name: traefik
-    image: traefik:v2.0
+    image: traefik:latest
+    #image: traefik:v2.0
 #    command:
 #      - --api
 #      - --api.dashboard
@@ -28,7 +29,8 @@ services:
       - /etc/letsencrypt/live/server.giorgioravera.it/privkey.pem:/certs/privkey.pem
       - /var/run/docker.sock:/var/run/docker.sock
     networks:
-      - proxy
+      proxy:
+        ipv4_address: 172.18.0.2
     labels:
       - "traefik.enable=true"
       - "traefik.http.routers.traefik.entrypoints=http"
diff --git a/watchtower/docker-compose.yaml b/watchtower/docker-compose.yaml
index bd62fa5..470a650 100644
--- a/watchtower/docker-compose.yaml
+++ b/watchtower/docker-compose.yaml
@@ -3,7 +3,7 @@ version: '3'
 services:
   watchtower:
     container_name: watchtower
-    image: containrrr/watchtower
+    image: containrrr/watchtower:latest
     restart: unless-stopped
     environment:
       - TZ=${DOCKER_TZ}
diff --git a/xen-orchestra-ce/docker-compose.yaml b/xen-orchestra-ce/docker-compose.yaml
index 5e2ac98..0c74666 100644
--- a/xen-orchestra-ce/docker-compose.yaml
+++ b/xen-orchestra-ce/docker-compose.yaml
@@ -3,7 +3,7 @@ version: '3'
 services:
   orchestra:
     container_name: XO_server
-    image: ezka77/xen-orchestra-ce
+    image: ezka77/xen-orchestra-ce:latest
     restart: unless-stopped
     #ports:
     #  - 8080:8000