updated watchtower to new api

diff --git a/watchtower/docker-compose.yaml b/watchtower/docker-compose.yaml
index a65afab0432d9c14deb3b0c12ff9fd379acbefe8..c2b24254da43dfd529aefc8814d172d0fe9a7c28 100644 (file)
--- a/watchtower/docker-compose.yaml
+++ b/watchtower/docker-compose.yaml
@@ -13,12 +13,9 @@ services:
       #- WATCHTOWER_MONITOR_ONLY=false
       - WATCHTOWER_NO_STARTUP_MESSAGE=true
       - WATCHTOWER_NOTIFICATIONS_LEVEL=info
       #- WATCHTOWER_MONITOR_ONLY=false
       - WATCHTOWER_NO_STARTUP_MESSAGE=true
       - WATCHTOWER_NOTIFICATIONS_LEVEL=info

-      - WATCHTOWER_NOTIFICATIONS=email
-      - WATCHTOWER_NOTIFICATION_EMAIL_FROM=docker@giorgioravera.it
-      - WATCHTOWER_NOTIFICATION_EMAIL_TO=giorgio.ravera@gmail.com
-      - WATCHTOWER_NOTIFICATION_EMAIL_SERVER=mail.giorgioravera.it
-      #- WATCHTOWER_NOTIFICATION_EMAIL_SERVER_PORT=25
-      #- WATCHTOWER_NOTIFICATION_EMAIL_SUBJECTTAG=Docker WatchTower
+      - WATCHTOWER_NOTIFICATION_URL=smtp://mail.giorgioravera.it:465/?fromaddress=docker@giorgioravera.it&toaddresses=giorgio.ravera@gmail.com
+      #- WATCHTOWER_NOTIFICATION_URL=smtp://mail.giorgioravera.it:25/?fromaddress=docker@giorgioravera.it&toaddresses=giorgio.ravera@gmail.com&encryption=None&usestarttls=no&timeout=30s
+      #- WATCHTOWER_NOTIFICATION_TITLE_TAG=Docker WatchTower

     volumes:
       - /var/run/docker.sock:/var/run/docker.sock
     networks:
     volumes:
       - /var/run/docker.sock:/var/run/docker.sock
     networks:

diff --git a/watchtower/force.sh b/watchtower/force.sh
index 6ef2898cf6717194ccf9d8f3834e0d036bd7ce4c..04238283f86f3bb17a88a83929b89f2e385f4c4e 100755 (executable)
--- a/watchtower/force.sh
+++ b/watchtower/force.sh
@@ -51,27 +51,26 @@ function parse_options ()
 run_without_notifications()
 {
        docker run --rm \
 run_without_notifications()
 {
        docker run --rm \

-                       -v /var/run/docker.sock:/var/run/docker.sock \
-                       nickfedor/watchtower \
-                               --cleanup \
-                               --revive-stopped \
-                               --run-once \
-                               --no-startup-message
+               -v /var/run/docker.sock:/var/run/docker.sock \
+               nickfedor/watchtower \
+                       --cleanup \
+                       --revive-stopped \
+                       --run-once \
+                       --no-startup-message

 }
 
 run_with_notifications()
 {
 }
 
 run_with_notifications()
 {

-       docker run --rm \
-                       -v /var/run/docker.sock:/var/run/docker.sock \
-                       nickfedor/watchtower \
-                               --cleanup \
-                               --revive-stopped \
-                               --run-once \
-                               --no-startup-message \
-                               --notifications=email \
-                               --notification-email-from=docker@giorgioravera.it \
-                               --notification-email-to=giorgio.ravera@gmail.com \
-                               --notification-email-server=mail.giorgioravera.it
+    docker run --rm \
+               -v /var/run/docker.sock:/var/run/docker.sock \
+               nickfedor/watchtower \
+               --cleanup \
+               --revive-stopped \
+               --run-once \
+               --no-startup-message \
+               --notifications-level info \
+               --notification-url "smtp://mail.giorgioravera.it:465/?fromaddress=docker@giorgioravera.it&toaddresses=giorgio.ravera@gmail.com"
+               #--notification-url "smtp://mail.giorgioravera.it:25/?fromaddress=docker@giorgioravera.it&toaddresses=giorgio.ravera@gmail.com&encryption=None&usestarttls=no&timeout=30s"

 }
 
 parse_options $@
 }
 
 parse_options $@