clarifying ntfy.sh

"domain" is a bit misleading, so clarifying that https:// is needed. Might change to "NTFY_URL" in the future.

.gitignore

@@ -1,5 +1,9 @@
 # ignore users custom notify.sh
-/notify.sh
+/notify*.sh
 /urls.list
+# ignore user config
+/dockcheck.config
 # ignore the auto-installed regctl
 regctl
+# ignore snooze file
+snooze.list

README.md

@@ -1,35 +1,39 @@
 <p align="center">
-  <img src="extras/dockcheck_logo_by_booYah187.png" width="160" title="dockcheck">
+  <img src="extras/dockcheck_colour.png" width="300" title="dockcheck">
 </p>
 <p align="center">
   <img src="https://img.shields.io/badge/bash-4.3-green?style=flat-square&logo=gnubash" alt="bash">
   <a href="https://www.gnu.org/licenses/gpl-3.0.html"><img src="https://img.shields.io/badge/license-GPLv3-red?style=flat-square" alt="GPLv3"></a>
   <img src="https://img.shields.io/github/v/tag/mag37/dockcheck?style=flat-square&label=release" alt="release">
+  <br>
   <a href="https://ko-fi.com/mag37"><img src="https://img.shields.io/badge/-Ko--fi-grey?style=flat-square&logo=Ko-fi" alt="Buy me a Coffee"></a>
   <a href="https://liberapay.com/user-bin-rob/donate"><img src="https://img.shields.io/badge/-LiberaPay-grey?style=flat-square&logo=liberapay" alt="LiberaPay"></a>
   <a href="https://github.com/sponsors/mag37"><img src="https://img.shields.io/badge/-Sponsor-grey?style=flat-square&logo=github" alt="Github Sponsor"></a>
+  <a href="https://www.paypal.com/donate/?business=P2V5MCWRGCNBG&no_recurring=0&currency_code=SEK"><img src="https://img.shields.io/badge/-PayPal-grey?style=flat-square&logo=paypal" alt="PayPal donation"></a>
 </p>
 
 <h2 align="center">CLI tool to automate docker image updates or notifying when updates are available.</h2>
-<h3 align="center">Features:</h3>
+<h3 align="center">selective updates, exclude containers, custom labels, notification plugins, prune when done etc.</h3>
-<h3 align="center">selective updates, exclude containers, custom labels, notification plugins, prune when done and more.</h3>
-
-<h4 align="center">For Podman - see the fork <a href="https://github.com/sudo-kraken/podcheck">sudo-kraken/podcheck</a>!</h4>
 
 <h4 align="center">:whale: Docker Hub pull limit :chart_with_downwards_trend: not an issue for checks but for actual pulls - <a href="#whale-docker-hub-pull-limit-chart_with_downwards_trend-not-an-issue-for-checks-but-for-actual-pulls">read more</a></h4>
 
+<h5 align="center">For Podman - see the fork <a href="https://github.com/sudo-kraken/podcheck">sudo-kraken/podcheck</a>!</h4>
+
 ___
 ## :bell: Changelog
 
-- **v0.5.8.0**: Added version checks to all templates and a notification if a new template is released.
+- **v0.6.9**: #
-- **v0.5.7.0**: Rewritten templates - now with a function to notify when there's a new Dockcheck release.
+    - Bugfix: label logic didn't skip recreation (skipped pulling).
-    - Manually migrate your current `notify.sh` settings to a new template for new functionality.
+    - Added comma separated search filtering so you can selectively search exactly which containers to check/update.
-- **v0.5.6.1**: Async xargs hotfix - due to errors `failed to request manifest head ... context canceled`
+      - eg: `dockcheck.sh -yp homer,dozzle`
-    - Defaulted subprocess to 1 with `MaxAsync=1`, increase to find a stable value in your environment.
+- **v0.6.8**:
-    - Added `-x N` option to pass `MaxAsync` value at runtime.
+    - Bugfix: Unbound variable in notify_v2.sh
-    - To disable xargs `-P` flag (max processes) all together, set `MaxAsync` to 0.
+    - New option: "DisplaySourcedFiles" *config* added to list what files get sourced
-- **v0.5.6.0**: Heavily improved performance due to async checking for updates.
+- **v0.6.7**: Snooze feature, curl, and consolidation
-- **v0.5.5.0**: osx and bsd compatibility changes + rewrite of dependency installer
+    - Added snooze feature to delay notifications
+    - Added configurable default curl arguments
+    - Consolidated and standardized notify template update notifications
+    - Added curl error handling
 ___
 
 
@@ -38,25 +42,30 @@ ___
 ## :mag_right: `dockcheck.sh`
 ```
 $ ./dockcheck.sh -h
-Syntax:     dockcheck.sh [OPTION] [part of name to filter]
+Syntax:     dockcheck.sh [OPTION] [comma separated names to include]
-Example:    dockcheck.sh -y -d 10 -e nextcloud,heimdall
+Example:    dockcheck.sh -y -x 10 -d 10 -e nextcloud,heimdall
 
-Options:"
+Options:
 -a|y   Automatic updates, without interaction.
 -c D   Exports metrics as prom file for the prometheus node_exporter. Provide the collector textfile directory.
 -d N   Only update to new images that are N+ days old. Lists too recent with +prefix and age. 2xSlower.
 -e X   Exclude containers, separated by comma.
--f     Force stack restart after update. Caution: restarts once for every updated container within stack.
+-f     Force stop+start stack after update. Caution: restarts once for every updated container within stack.
+-F     Only compose up the specific container, not the whole compose stack (useful for master-compose structure).
 -h     Print this Help.
 -i     Inform - send a preconfigured notification.
+-I     Prints custom releasenote urls alongside each container with updates in CLI output (requires urls.list).
 -l     Only update if label is set. See readme.
--m     Monochrome mode, no printf color codes.
+-m     Monochrome mode, no printf colour codes and hides progress bar.
+-M     Prints custom releasenote urls as markdown (requires template support).
 -n     No updates, only checking availability.
 -p     Auto-Prune dangling images after update.
--r     Allow updating images for docker run, wont update the container.
+-r     Allow checking for updates/updating images for docker run containers. Won't update the container.
 -s     Include stopped containers in the check. (Logic: docker ps -a).
--t     Set a timeout (in seconds) per container for registry checkups, 10 is default.
+-t N   Set a timeout (in seconds) per container for registry checkups, 10 is default.
+-u     Allow automatic self updates - caution as this will pull new code and autorun it.
 -v     Prints current version.
+-x N   Set max asynchronous subprocesses, 1 default, 0 to disable, 32+ tested.
 ```
 
 ### Basic example:
@@ -107,33 +116,89 @@ wget -O ~/.local/bin/dockcheck.sh "https://raw.githubusercontent.com/mag37/dockc
 Then call the script anywhere with just `dockcheck.sh`.
 Add preferred `notify.sh`-template to the same directory - this will not be touched by the scripts self-update function.
 
+## :handbag: Configuration
+To modify settings and have them persist through updates - copy the `default.config` to `dockcheck.config` alongside the script or in `~/.config/`.  
+Alternatively create an alias where specific flags and values are set.  
+Example `alias dc=dockcheck.sh -p -x 10 -t 3`.
 
 ## :loudspeaker: Notifications
-Trigger with the `-i` flag.  
+Trigger with the `-i` flag.
-Run it scheduled with `-ni` to only get notified when there's updates available!  
+If `notify.sh` is present and configured, it will be used. Otherwise, `notify_v2.sh` will be enabled.
-Will also send a notification when `dockcheck.sh` itself has an update.
+Will send a list of containers with updates available and a notification when `dockcheck.sh` itself has an update.
+Run it scheduled with `-ni` to only get notified when there's updates available!
 
-Use a `notify_X.sh` template file from the **notify_templates** directory, copy it to `notify.sh` alongside the script, modify it to your needs! (notify.sh is added to .gitignore)  
+#### Installation and configuration:
-**Current templates:**
+Make certain your project directory is laid out as below. You only need the notify_v2.sh file and any notification templates you wish to enable, but there is no harm in having all of them present.
+```
+ .
+├── notify_templates/
+│   ├── notify_DSM.sh
+│   ├── notify_apprise.sh
+│   ├── notify_discord.sh
+│   ├── notify_generic.sh
+│   ├── notify_gotify.sh
+│   ├── notify_HA.sh
+│   ├── notify_matrix.sh
+│   ├── notify_ntfy.sh
+│   ├── notify_pushbullet.sh
+│   ├── notify_pushover.sh
+│   ├── notify_slack.sh
+│   ├── notify_smtp.sh
+│   ├── notify_telegram.sh
+│   └── notify_v2.sh
+├── dockcheck.config
+├── dockcheck.sh
+└── urls.list         # optional
+```
+Uncomment and set the NOTIFY_CHANNELS environment variable in `dockcheck.config` to a space separated string of your desired notification channels to enable.
+Uncomment and set the environment variables related to the enabled notification channels.  
+It is recommended to only edit the environmental variables in `dockcheck.config` and not make changes directly to the `notify_X.sh` template files within the `notify_templates` subdirectory.
+If you wish to customize the notify templates yourself, you may copy them to your project root directory alongside the main `dockcheck.sh` script (where they will also be ignored by git).
+Customizing `notify_v2.sh` is handled the same as customizing the templates, but it must be renamed to `notify.sh` within the `dockcheck.sh` root directory.
+
+
+#### Legacy installation and configuration:
+Use a previous version of a `notify_X.sh` template file (tag v0.6.4 or earlier) from the **notify_templates** directory,
+copy it to `notify.sh` alongside the script, modify it to your needs! (notify.sh is added to .gitignore)
+
+#### Snooze feature:
+**Use case:** You wish to be notified of available updates in a timely manner, but do not require reminders after the initial notification with the same frequency.
+e.g. *Dockcheck is scheduled to run every hour. You will receive an update notification within an hour of availability.*  
+**Snooze enabled:** you will not receive another notification about updates for this container for a configurable period of time.  
+**Snooze disabled:** you will receive additional notifications every hour.
+
+To enable snooze, uncomment the `SNOOZE_SECONDS` variable in your `dockcheck.config` file and set it to the number of seconds you wish to prevent duplicate alerts.
+The true snooze duration will be 60 seconds less than your configure value to account for minor scheduling or script run time issues.
+If an update becomes available for an item that is not snoozed, notifications will be sent and include all available updates for that item's category, even snoozed items.
+`dockcheck.sh` updates, notification template updates, and container updates are considered three separate categories.
+
+
+#### Current notify templates:
 - Synology [DSM](https://www.synology.com/en-global/dsm)
 - Email with [mSMTP](https://wiki.debian.org/msmtp) (or deprecated alternative [sSMTP](https://wiki.debian.org/sSMTP))
 - Apprise (with it's [multitude](https://github.com/caronc/apprise#supported-notifications) of notifications)
   - both native [caronc/apprise](https://github.com/caronc/apprise) and the standalone [linuxserver/docker-apprise-api](https://github.com/linuxserver/docker-apprise-api)
   - Read the [QuickStart](extras/apprise_quickstart.md)
-- [ntfy.sh](https://ntfy.sh/) - HTTP-based pub-sub notifications.
+- [ntfy](https://ntfy.sh/) - HTTP-based pub-sub notifications.
 - [Gotify](https://gotify.net/) - a simple server for sending and receiving messages.
+- [Home Assistant](https://www.home-assistant.io/integrations/notify/) - Connection to the notify [integrations](https://www.home-assistant.io/integrations/#notifications).
 - [Pushbullet](https://www.pushbullet.com/) - connecting different devices with cross-platform features.
 - [Telegram](https://telegram.org/) - Telegram chat API.
 - [Matrix-Synapse](https://github.com/element-hq/synapse) - [Matrix](https://matrix.org/), open, secure, decentralised communication.
 - [Pushover](https://pushover.net/) - Simple Notifications (to your phone, wearables, desktops)
 - [Discord](https://support.discord.com/hc/en-us/articles/228383668-Intro-to-Webhooks) - Discord webhooks.
+- [Slack](https://api.slack.com/tutorials/tracks/posting-messages-with-curl) - Slack curl api
 
-Further additions are welcome - suggestions or PR!  
+Further additions are welcome - suggestions or PRs!  
 <sub><sup>Initiated and first contributed by [yoyoma2](https://github.com/yoyoma2).</sup></sub>  
 
-### :date: Release notes addon to Notifications
+### :date: Release notes addon
 There's a function to use a lookup-file to add release note URL's to the notification message.  
-Copy the notify_templates/`urls.list` file to the script directory, it will be used automatically if it's there.   Modify it as necessary, the names of interest in the left column needs to match your container names.  
+Copy the notify_templates/`urls.list` file to the script directory, it will be used automatically if it's there.  
+Modify it as necessary, the names of interest in the left column needs to match your container names.  
+To also list the URL's in the CLI output (choose containers list) use the `-I` option or variable config.  
+For Markdown formatting also add the `-M` option. (**this requires the template to be compatible - see gotify for example**)  
+
 The output of the notification will look something like this:
 ```
 Containers on hostname with updates available:
@@ -149,26 +214,47 @@ Pass `-x N` where N is number of subprocesses allowed, experiment in your enviro
 Change the default value by editing the `MaxAsync=N` variable in `dockcheck.sh`. To disable the subprocess function set `MaxAsync=0`.
 
 
-## :chart_with_upwards_trend: Prometheus and node_exporter
+## :chart_with_upwards_trend: Extra plugins and tools:
+
+### :small_orange_diamond: Using dockcheck.sh with the Synology DSM
+If you run your container through the *Container Manager GUI* - only notifications are supported.  
+While if running manual (vanilla docker compose CLI) will allow you to use the update function too.  
+Some extra setup to tie together with Synology DSM - check out the [addons/DSM/README.md](./addons/DSM/README.md).
+
+### :small_orange_diamond: Prometheus and node_exporter
 Dockcheck can be used together with [Prometheus](https://github.com/prometheus/prometheus) and [node_exporter](https://github.com/prometheus/node_exporter) to export metrics via the file collector, scheduled with cron or likely.
 This is done with the `-c` option, like this:
 ```
 dockcheck.sh -c /path/to/exporter/directory
 ```
 
-See the [README.md](./addons/prometheus/README.md) for more detailed information on how to set it up!
+See the [README.md](./addons/prometheus/README.md) for more detailed information on how to set it up!  
-
 <sub><sup>Contributed by [tdralle](https://github.com/tdralle).</sup></sub>  
 
+### :small_orange_diamond: Zabbix config to monitor docker image updates
+If you already use Zabbix - this config will show numbers of available docker image updates on host.  
+Example: *2 Docker Image updates on host-xyz*  
+See project: [thetorminal/zabbix-docker-image-updates](https://github.com/thetorminal/zabbix-docker-image-updates)
+
+### :small_orange_diamond: Serve REST API to list all available updates
+A custom python script to serve a REST API to get pulled into other monitoring tools like [homepage](https://github.com/gethomepage/homepage).  
+See [discussion here](https://github.com/mag37/dockcheck/discussions/146).
+
+### :small_orange_diamond: Wrapper Script for Unraid's User Scripts
+A custom bash wrapper script to allow the usage of dockcheck as a Unraid User Script plugin.  
+See [discussion here](https://github.com/mag37/dockcheck/discussions/145).
+
 ## :bookmark: Labels
 Optionally add labels to compose-files. Currently these are the usable labels:
 ```
     labels:
-      mag37.dockcheck.restart-stack: true
       mag37.dockcheck.update: true
+      mag37.dockcheck.only-specific-container: true
+      mag37.dockcheck.restart-stack: true
 ```
-- `mag37.dockcheck.restart-stack: true` works instead of the `-f` option, forcing stop+restart on the whole compose-stack (Caution: Will restart on every updated container within stack).
 - `mag37.dockcheck.update: true` will when used with the `-l` option only update containers with this label and skip the rest. Will still list updates as usual.
+- `mag37.dockcheck.only-specific-container: true` works instead of the `-F` option, specifying the updated container when doing compose up, like `docker compose up -d homer`.
+- `mag37.dockcheck.restart-stack: true` works instead of the `-f` option, forcing stop+restart on the whole compose-stack (Caution: Will restart on every updated container within stack).
 
 ## :roller_coaster: Workaround for non **amd64** / **arm64**
 `regctl` provides binaries for amd64/arm64, to use on other architecture you could try this workaround.
@@ -207,17 +293,18 @@ function dchk {
 }
 ```
 
+## :warning: `-r flag` disclaimer and warning
+**Wont auto-update the containers, only their images. (compose is recommended)**  
+`docker run` dont support using new images just by restarting a container.  
+Containers need to be manually stopped, removed and created again to run on the new image.  
+Using the `-r` option together with eg. `-i` and `-n` to just check for updates and send notifications and not update is safe though!
+
 ## :hammer: Known issues
 - No detailed error feedback (just skip + list what's skipped).
 - Not respecting `--profile` options when re-creating the container.
 - Not working well with containers created by **Portainer**.
 - **Watchtower** might cause issues due to retagging images when checking for updates (and thereby pulling new images).
 
-## :warning: `-r flag` disclaimer and warning
-**Wont auto-update the containers, only their images. (compose is recommended)**  
-`docker run` dont support using new images just by restarting a container.  
-Containers need to be manually stopped, removed and created again to run on the new image.
-
 ## :wrench: Debugging
 If you hit issues, you could check the output of the `extras/errorCheck.sh` script for clues.
 Another option is to run the main script with debugging in a subshell `bash -x dockcheck.sh` - if there's a particular container/image that's causing issues you can filter for just that through `bash -x dockcheck.sh nginx`.
@@ -228,6 +315,8 @@ dockcheck is created and released under the [GNU GPL v3.0](https://www.gnu.org/l
 ## :heartpulse: Sponsorlist
 
 - [avegy](https://github.com/avegy)
+- [eichhorn](https://github.com/eichhorn)
+- [stepdg](https://github.com/stepdg)
 
 ___
 

addons/DSM/README.md

@@ -0,0 +1,35 @@
+## Using Dockcheck in DSM
+Dockcheck cannot directly update containers managed in the Container Manager GUI, but it can still be used to notify you of containers with updates available. There are two ways to be notified, each with their own caveats:
+
+1. Enabling email notifications within the Task Scheduler (_step 6i below_) will send an email that includes the entire script as run. This will not include the `urls.list` links to release notes, but it will show a full list of containers checked, up to date, and needing updates (following the args included in the scheduled task).
+2. The [DSM notification template](https://github.com/mag37/dockcheck/blob/main/notify_templates/notify_DSM.sh) will enable Dockcheck to directly send an email when using the `-i` flag. This is most useful when paired with an accurate [urls.list](https://github.com/mag37/dockcheck/blob/next063/notify_templates/urls.list) file, and results in a neat succinct email notification of only containers to be updated.
+
+This is a user preference, and both notifications are not necessary. However, regardless of the notification method, it is necessary to set up a scheduled task to run Dockcheck at a set interval (otherwise it will only run when manually triggered).
+
+
+## Automate Dockcheck with DSM Task Scheduler:
+
+1. Open Control Panel and navigate to Task Scheduler
+2. Create a Scheduled Task > User-defined script
+3. Task Name: Dockcheck
+4. User: root
+5. Schedule: _User Preference_
+6. Task Settings:
+    1. ✔  Send run details by email (include preferred email) _This is the optional step as described above)_
+    2. User-defined script: `export HOME=/root && cd /path/to/dockcheck && ./dockcheck.sh -n -i -I ` _or other custom args_
+8. Click OK, accept warning message
+
+
+## Set up the DSM Notification template
+
+Copy the [dockcheck/notify_templates/notify_DSM.sh](https://github.com/mag37/dockcheck/blob/main/notify_templates/notify_DSM.sh) to the same directory as where you keep `dockcheck.sh`.  
+Use as is (uses your default notification email setting) or edit and override manually.
+
+![](./dsm1.png)
+
+![](./dsm2.png)
+
+![](./dsm3.png)
+
+
+Made with much help and contribution from [@firmlyundecided](https://github.com/firmlyundecided) and [@yoyoma2](https://github.com/yoyoma2).

default.config

@@ -0,0 +1,89 @@
+### Custom user variables
+## Copy this file to "dockcheck.config" to make it active
+## Can be placed in ~/.config/ or alongside dockcheck.sh
+##
+## Uncomment and set your preferred configuration variables here
+## This will not be replaced on updates
+
+#Timeout=10    # Set a timeout (in seconds) per container for registry checkups.
+#MaxAsync=10    # Set max asynchronous subprocesses, 1 default, 0 to disable.
+#BarWidth=50    # The character width of the progress bar
+#AutoMode=true    # Automatic updates, without interaction.
+#DontUpdate=true    # No updates; only checking availability without interaction.
+#AutoPrune=true    # Auto-Prune dangling images after update.
+#AutoSelfUpdate=true    # Allow automatic self updates - caution as this will pull new code and autorun it.
+#Notify=true    # Inform - send a preconfigured notification.
+#Exclude="one,two"    # Exclude containers, separated by comma.
+#DaysOld="5"    # Only update to new images that are N+ days old. Lists too recent with +prefix and age. 2xSlower.
+#Stopped="-a"    # Include stopped containers in the check. (Logic: docker ps -a).
+#OnlyLabel=true    # Only update if label is set. See readme.
+#ForceRestartStacks=true    # Force stop+start stack after update. Caution: restarts once for every updated container within stack.
+#DRunUp=true    # Allow updating images for docker run, wont update the container.
+#MonoMode=true    # Monochrome mode, no printf colour codes and hides progress bar.
+#PrintReleaseURL=true   # Prints custom releasenote urls alongside each container with updates (requires urls.list)`
+#PrintMarkdownURL=true    # Prints custom releasenote urls as markdown
+#OnlySpecific=true    # Only compose up the specific container, not the whole compose. (useful for master-compose structure).
+#CurlRetryDelay=1    # Time between curl retries
+#CurlRetryCount=3    # Max number of curl retries
+#CurlConnectTimeout=5    # Time to wait for curl to establish a connection before failing
+#DisplaySourcedFiles=false    # Display what files are being sourced/used
+
+### Notify settings
+## All commented values are examples only. Modify as needed.
+##
+## Uncomment the line below and specify the notification channels you wish to enable in a space separated string
+# NOTIFY_CHANNELS="apprise discord DSM generic HA gotify matrix ntfy pushbullet pushover slack smtp telegram"
+#
+## Uncomment the line below and specify the number of seconds to delay notifications to enable snooze
+# SNOOZE_SECONDS=86400
+#
+## Uncomment to not send notifications when dockcheck itself has updates.
+# DISABLE_DOCKCHECK_NOTIFICATION=false
+## Uncomment to not send notifications when notify scripts themselves have updates.
+# DISABLE_NOTIFY_NOTIFICATION=false
+#
+## Apprise configuration variables. Set APPRISE_PAYLOAD to make a CLI call or set APPRISE_URL to make an API request instead.
+# APPRISE_PAYLOAD='mailto://myemail:mypass@gmail.com
+#                 mastodons://{token}@{host}
+#                 pbul://o.gn5kj6nfhv736I7jC3cj3QLRiyhgl98b
+#                 tgram://{bot_token}/{chat_id}/'
+# APPRISE_URL="http://apprise.mydomain.tld:1234/notify/apprise"
+#
+# DISCORD_WEBHOOK_URL="https://discord.com/api/webhooks/<token string>"
+#
+# DSM_SENDMAILTO="me@mydomain.com"
+# DSM_SUBJECTTAG="Email Subject Prefix"
+#
+# GOTIFY_DOMAIN="https://gotify.domain.tld"
+# GOTIFY_TOKEN="token-value"
+#
+# HA_ENTITY="entity"
+# HA_TOKEN="token"
+# HA_URL="https://your.homeassistant.url"
+#
+# MATRIX_ACCESS_TOKEN="token-value"
+# MATRIX_ROOM_ID="myroom"
+# MATRIX_SERVER_URL="https://matrix.yourdomain.tld"
+#
+## https://ntfy.sh or your custom domain with https:// and no trailing /
+# NTFY_DOMAIN="https://ntfy.sh"
+# NTFY_TOPIC_NAME="YourUniqueTopicName"
+#
+# PUSHBULLET_URL="https://api.pushbullet.com/v2/pushes"
+# PUSHBULLET_TOKEN="token-value"
+#
+# PUSHOVER_URL="https://api.pushover.net/1/messages.json"
+# PUSHOVER_USER_KEY="userkey"
+# PUSHOVER_TOKEN="token-value"
+#
+# SLACK_CHANNEL_ID=mychannel
+# SLACK_ACCESS_TOKEN=xoxb-token-value
+#
+# SMTP_MAIL_FROM="me@mydomain.tld"
+# SMTP_MAIL_TO="you@yourdomain.tld"
+# SMTP_SUBJECT_TAG="dockcheck"
+#
+# TELEGRAM_CHAT_ID="mychatid"
+# TELEGRAM_TOKEN="token-value"
+# TELEGRAM_TOPIC_ID="0"
+

dockcheck.sh

@@ -1,49 +1,93 @@
 #!/usr/bin/env bash
-VERSION="v0.5.8.0"
+VERSION="v0.6.9"
-### ChangeNotes: Added version checks to all templates and a notification if a new template is released.
+# ChangeNotes: bugfix label logic and added comma separated search filtering
 Github="https://github.com/mag37/dockcheck"
 RawUrl="https://raw.githubusercontent.com/mag37/dockcheck/main/dockcheck.sh"
 
+set -uo pipefail
+shopt -s nullglob
+shopt -s failglob
+
 # Variables for self updating
 ScriptArgs=( "$@" )
 ScriptPath="$(readlink -f "$0")"
 ScriptWorkDir="$(dirname "$ScriptPath")"
 
-# Check if there's a new release of the script
+# Source helper functions
-LatestRelease="$(curl -s -r 0-50 $RawUrl | sed -n "/VERSION/s/VERSION=//p" | tr -d '"')"
+source_if_exists_or_fail() {
-LatestChanges="$(curl -s -r 0-200 $RawUrl | sed -n "/ChangeNotes/s/# ChangeNotes: //p")"
+  if [[ -s "$1" ]]; then
+    source "$1"
+    [[ "${DisplaySourcedFiles:-false}" == true ]] && echo " * sourced config: ${1}"
+    return 0
+  else
+    return 1
+  fi
+}
 
 # User customizable defaults
-MaxAsync=1
+source_if_exists_or_fail "${HOME}/.config/dockcheck.config" || source_if_exists_or_fail "${ScriptWorkDir}/dockcheck.config"
-Timeout=10
 
 # Help Function
 Help() {
-  echo "Syntax:     dockcheck.sh [OPTION] [part of name to filter]"
+  echo "Syntax:     dockcheck.sh [OPTION] [comma separated names to include]"
-  echo "Example:    dockcheck.sh -y -d 10 -e nextcloud,heimdall"
+  echo "Example:    dockcheck.sh -y -x 10 -d 10 -e nextcloud,heimdall"
   echo
   echo "Options:"
   echo "-a|y   Automatic updates, without interaction."
   echo "-c     Exports metrics as prom file for the prometheus node_exporter. Provide the collector textfile directory."
   echo "-d N   Only update to new images that are N+ days old. Lists too recent with +prefix and age. 2xSlower."
   echo "-e X   Exclude containers, separated by comma."
-  echo "-f     Force stack restart after update. Caution: restarts once for every updated container within stack."
+  echo "-f     Force stop+start stack after update. Caution: restarts once for every updated container within stack."
+  echo "-F     Only compose up the specific container, not the whole compose stack (useful for master-compose structure)."
   echo "-h     Print this Help."
   echo "-i     Inform - send a preconfigured notification."
+  echo "-I     Prints custom releasenote urls alongside each container with updates in CLI output (requires urls.list)."
   echo "-l     Only update if label is set. See readme."
-  echo "-m     Monochrome mode, no printf color codes."
+  echo "-m     Monochrome mode, no printf colour codes and hides progress bar."
-  echo "-n     No updates; only checking availability."
+  echo "-M     Prints custom releasenote urls as markdown (requires template support)."
+  echo "-n     No updates; only checking availability without interaction."
   echo "-p     Auto-prune dangling images after update."
-  echo "-r     Allow updating images for docker run; won't update the container."
+  echo "-r     Allow checking for updates/updating images for docker run containers. Won't update the container."
   echo "-s     Include stopped containers in the check. (Logic: docker ps -a)."
   echo "-t     Set a timeout (in seconds) per container for registry checkups, 10 is default."
+  echo "-u     Allow automatic self updates - caution as this will pull new code and autorun it."
   echo "-v     Prints current version."
   echo "-x N   Set max asynchronous subprocesses, 1 default, 0 to disable, 32+ tested."
   echo
   echo "Project source: $Github"
 }
 
-# Colors
+# Initialise variables
+Timeout=${Timeout:-10}
+MaxAsync=${MaxAsync:-1}
+BarWidth=${BarWidth:-50}
+AutoMode=${AutoMode:-false}
+DontUpdate=${DontUpdate:-false}
+AutoPrune=${AutoPrune:-false}
+AutoSelfUpdate=${AutoSelfUpdate:-false}
+OnlyLabel=${OnlyLabel:-false}
+Notify=${Notify:-false}
+ForceRestartStacks=${ForceRestartStacks:-false}
+DRunUp=${DRunUp:-false}
+MonoMode=${MonoMode:-false}
+PrintReleaseURL=${PrintReleaseURL:-false}
+PrintMarkdownURL=${PrintMarkdownURL:-false}
+Stopped=${Stopped:-""}
+CollectorTextFileDirectory=${CollectorTextFileDirectory:-}
+Exclude=${Exclude:-}
+DaysOld=${DaysOld:-}
+OnlySpecific=${OnlySpecific:-false}
+SpecificContainer=${SpecificContainer:-""}
+Excludes=()
+GotUpdates=()
+NoUpdates=()
+GotErrors=()
+SelectedUpdates=()
+CurlArgs="--retry ${CurlRetryCount:=3} --retry-delay ${CurlRetryDelay:=1}  --connect-timeout ${CurlConnectTimeout:=5} -sf"
+regbin=""
+jqbin=""
+
+# Colours
 c_red="\033[0;31m"
 c_green="\033[0;32m"
 c_yellow="\033[0;33m"
@@ -51,94 +95,139 @@ c_blue="\033[0;34m"
 c_teal="\033[0;36m"
 c_reset="\033[0m"
 
-Stopped=""
+while getopts "ayfFhiIlmMnprsuvc:e:d:t:x:" options; do
-while getopts "aynpfrhlisvmc:e:d:t:x:" options; do
   case "${options}" in
-    a|y) AutoUp="yes" ;;
+    a|y) AutoMode=true ;;
-    c)   CollectorTextFileDirectory="${OPTARG}"
+    c)   CollectorTextFileDirectory="${OPTARG}" ;;
-         if ! [[ -d  $CollectorTextFileDirectory ]] ; then { printf "The directory (%s) does not exist.\n" "${CollectorTextFileDirectory}"  ; exit 2; } fi ;;
+    d)   DaysOld=${OPTARG} ;;
-    n)   AutoUp="no" ;;
-    r)   DRunUp="yes" ;;
-    p)   AutoPrune="yes" ;;
-    l)   OnlyLabel=true ;;
-    f)   ForceRestartStacks=true ;;
-    i)   [ -s "$ScriptWorkDir"/notify.sh ] && { source "$ScriptWorkDir"/notify.sh ; Notify="yes" ; } ;;
     e)   Exclude=${OPTARG} ;;
-    m)   declare c_{red,green,yellow,blue,teal,reset}="" ;;
+    f)   ForceRestartStacks=true ;;
+    F)   OnlySpecific=true ;;
+    i)   Notify=true ;;
+    I)   PrintReleaseURL=true ;;
+    l)   OnlyLabel=true ;;
+    m)   MonoMode=true ;;
+    M)   PrintMarkdownURL=true ;;
+    n)   DontUpdate=true; AutoMode=true;;
+    p)   AutoPrune=true ;;
+    r)   DRunUp=true ;;
     s)   Stopped="-a" ;;
     t)   Timeout="${OPTARG}" ;;
-    v)   printf "%s\n" "$VERSION" ; exit 0 ;;
+    u)   AutoSelfUpdate=true ;;
+    v)   printf "%s\n" "$VERSION"; exit 0 ;;
     x)   MaxAsync=${OPTARG} ;;
-    d)   DaysOld=${OPTARG}
+    h|*) Help; exit 2 ;;
-         if ! [[ $DaysOld =~ ^[0-9]+$ ]] ; then { printf "Days -d argument given (%s) is not a number.\n" "${DaysOld}" ; exit 2 ; } ; fi ;;
-    h|*) Help ; exit 2 ;;
   esac
 done
 shift "$((OPTIND-1))"
 
-# Self-update function
+# Set $1 to a variable for name filtering later, rewriting if multiple
+SearchName="${1:-}"
+if [[ ! -z "$SearchName" ]]; then
+  SearchName="^(${SearchName//,/|})$"
+fi
+
+# Check if there's a new release of the script
+LatestSnippet="$(curl ${CurlArgs} -r 0-200 "$RawUrl" || printf "undefined")"
+LatestRelease="$(echo "${LatestSnippet}" | sed -n "/VERSION/s/VERSION=//p" | tr -d '"')"
+LatestChanges="$(echo "${LatestSnippet}" | sed -n "/ChangeNotes/s/# ChangeNotes: //p")"
+
+# Basic notify configuration check
+if [[ "${Notify}" == true ]] && [[ ! -s "${ScriptWorkDir}/notify.sh" ]] && [[ -z "${NOTIFY_CHANNELS:-}" ]]; then
+  printf "Using v2 notifications with -i flag passed but no notify channels configured in dockcheck.config. This will result in no notifications being sent.\n"
+fi
+
+# Setting up options and sourcing functions
+if [[ "$DontUpdate" == true ]]; then AutoMode=true; fi
+if [[ "$MonoMode" == true ]]; then declare c_{red,green,yellow,blue,teal,reset}=""; fi
+if [[ "$Notify" == true ]]; then
+  source_if_exists_or_fail "${ScriptWorkDir}/notify.sh" || source_if_exists_or_fail "${ScriptWorkDir}/notify_templates/notify_v2.sh" || Notify=false
+fi
+if [[ -n "$Exclude" ]]; then
+  IFS=',' read -ra Excludes <<< "$Exclude"
+  unset IFS
+fi
+if [[ -n "$DaysOld" ]]; then
+  if ! [[ $DaysOld =~ ^[0-9]+$ ]]; then
+    printf "Days -d argument given (%s) is not a number.\n" "$DaysOld"
+    exit 2
+  fi
+fi
+if [[ -n "$CollectorTextFileDirectory" ]]; then
+  if ! [[ -d  $CollectorTextFileDirectory ]]; then
+    printf "The directory (%s) does not exist.\n" "$CollectorTextFileDirectory"
+    exit 2
+  else
+    source "${ScriptWorkDir}/addons/prometheus/prometheus_collector.sh"
+  fi
+fi
+
+exec_if_exists() {
+  if [[ $(type -t $1) == function ]]; then "$@"; fi
+}
+
+exec_if_exists_or_fail() {
+  [[ $(type -t $1) == function ]] && "$@"
+}
+
 self_update_curl() {
   cp "$ScriptPath" "$ScriptPath".bak
-  if [[ $(command -v curl) ]]; then
+  if command -v curl &>/dev/null; then
-    curl -L $RawUrl > "$ScriptPath" ; chmod +x "$ScriptPath"
+    curl ${CurlArgs} -L $RawUrl > "$ScriptPath"; chmod +x "$ScriptPath" || { printf "ERROR: Failed to curl updated Dockcheck.sh script. Skipping update.\n"; return 1; }
-    printf "\n%s\n" "--- starting over with the updated version ---"
+    printf "\n%b---%b starting over with the updated version %b---%b\n" "$c_yellow" "$c_teal" "$c_yellow" "$c_reset"
     exec "$ScriptPath" "${ScriptArgs[@]}" # run the new script with old arguments
     exit 1 # Exit the old instance
-  elif [[ $(command -v wget) ]]; then
+  elif command -v wget &>/dev/null; then
-    wget $RawUrl -O "$ScriptPath" ; chmod +x "$ScriptPath"
+    wget --waitretry=1 --timeout=15 -t 10 $RawUrl -O "$ScriptPath"; chmod +x "$ScriptPath"
-    printf "\n%s\n" "--- starting over with the updated version ---"
+    printf "\n%b---%b starting over with the updated version %b---%b\n" "$c_yellow" "$c_teal" "$c_yellow" "$c_reset"
     exec "$ScriptPath" "${ScriptArgs[@]}" # run the new script with old arguments
-    exit 1 # Exit the old instance
+    exit 0 # exit the old instance
   else
-    printf "curl/wget not available - download the update manually: %s \n" "$Github"
+    printf "\n%bcurl/wget not available %b- download the update manually: %b%s %b\n" "$c_red" "$c_reset" "$c_teal" "$Github" "$c_reset"
   fi
 }
 
 self_update() {
-  cd "$ScriptWorkDir" || { printf "Path error, skipping update.\n" ; return ; }
+  cd "$ScriptWorkDir" || { printf "%bPath error,%b skipping update.\n" "$c_red" "$c_reset"; return; }
-  if [[ $(command -v git) ]] && [[ "$(git ls-remote --get-url 2>/dev/null)" =~ .*"mag37/dockcheck".* ]] ; then
+  if command -v git &>/dev/null && [[ "$(git ls-remote --get-url 2>/dev/null)" =~ .*"mag37/dockcheck".* ]]; then
     printf "\n%s\n" "Pulling the latest version."
-    git pull --force || { printf "Git error, manually pull/clone.\n" ; return ; }
+    git pull --force || { printf "%bGit error,%b manually pull/clone.\n" "$c_red" "$c_reset"; return; }
     printf "\n%s\n" "--- starting over with the updated version ---"
-    cd - || { printf "Path error.\n" ; return ; }
+    cd - || { printf "%bPath error.%b\n" "$c_red"; return; }
     exec "$ScriptPath" "${ScriptArgs[@]}" # run the new script with old arguments
-    exit 1 # exit the old instance
+    exit 0 # exit the old instance
   else
-    cd - || { printf "Path error.\n" ; return ; }
+    cd - || { printf "%bPath error.%b\n" "$c_red"; return; }
     self_update_curl
   fi
 }
 
-# Choose from list function
 choosecontainers() {
-  while [[ -z "$ChoiceClean" ]]; do
+  while [[ -z "${ChoiceClean:-}" ]]; do
     read -r -p "Enter number(s) separated by comma, [a] for all - [q] to quit: " Choice
-    if [[ "$Choice" =~ [qQnN] ]] ; then
+    if [[ "$Choice" =~ [qQnN] ]]; then
       exit 0
-    elif [[ "$Choice" =~ [aAyY] ]] ; then
+    elif [[ "$Choice" =~ [aAyY] ]]; then
       SelectedUpdates=( "${GotUpdates[@]}" )
       ChoiceClean=${Choice//[,.:;]/ }
     else
       ChoiceClean=${Choice//[,.:;]/ }
-      for CC in $ChoiceClean ; do
+      for CC in $ChoiceClean; do
-        if [[ "$CC" -lt 1 || "$CC" -gt $UpdCount ]] ; then # Reset choice if out of bounds
+        if [[ "$CC" -lt 1 || "$CC" -gt $UpdCount ]]; then # Reset choice if out of bounds
-          echo "Number not in list: $CC" ; unset ChoiceClean ; break 1
+          echo "Number not in list: $CC"; unset ChoiceClean; break 1
         else
           SelectedUpdates+=( "${GotUpdates[$CC-1]}" )
         fi
       done
     fi
   done
-  printf "\nUpdating containers:\n"
-  printf "%s\n" "${SelectedUpdates[@]}"
-  printf "\n"
 }
 
 datecheck() {
-  ImageDate=$($regbin -v error image inspect "$RepoUrl" --format='{{.Created}}' | cut -d" " -f1 )
+  ImageDate=$("$regbin" -v error image inspect "$RepoUrl" --format='{{.Created}}' | cut -d" " -f1)
   ImageEpoch=$(date -d "$ImageDate" +%s 2>/dev/null) || ImageEpoch=$(date -f "%Y-%m-%d" -j "$ImageDate" +%s)
-  ImageAge=$(( ( $(date +%s) - $ImageEpoch )/86400 ))
+  ImageAge=$(( ( $(date +%s) - ImageEpoch )/86400 ))
-  if [ "$ImageAge" -gt "$DaysOld" ] ; then
+  if [[ "$ImageAge" -gt "$DaysOld" ]]; then
     return 0
   else
     return 1
@@ -148,42 +237,36 @@ datecheck() {
 progress_bar() {
   QueCurrent="$1"
   QueTotal="$2"
+  BarWidth=${BarWidth:-50}
   ((Percent=100*QueCurrent/QueTotal))
-  ((Complete=50*Percent/100)) # Change first number for width (50)
+  ((Complete=BarWidth*Percent/100))
-  ((Left=50-Complete)) # Change first number for width (50)
+  ((Left=BarWidth-Complete)) || true # to not throw error when result is 0
   BarComplete=$(printf "%${Complete}s" | tr " " "#")
   BarLeft=$(printf "%${Left}s" | tr " " "-")
-  [[ "$QueTotal" == "$QueCurrent" ]] || printf "\r[%s%s] %s/%s " "$BarComplete" "$BarLeft" "$QueCurrent" "$QueTotal"
+  if [[ "$QueTotal" != "$QueCurrent" ]]; then
-  [[ "$QueTotal" == "$QueCurrent" ]] && printf "\r[%b%s%b] %s/%s \n" "$c_teal" "$BarComplete" "$c_reset" "$QueCurrent" "$QueTotal"
+    printf "\r[%s%s] %s/%s " "$BarComplete" "$BarLeft" "$QueCurrent" "$QueTotal"
+  else
+    printf "\r[%b%s%b] %s/%s \n" "$c_teal" "$BarComplete" "$c_reset" "$QueCurrent" "$QueTotal"
+  fi
 }
 
 # Function to add user-provided urls to releasenotes
 releasenotes() {
-  for update in ${GotUpdates[@]}; do
+  unset Updates
+  for update in "${GotUpdates[@]}"; do
     found=false
     while read -r container url; do
-      [[ $update == $container ]] && Updates+=("$update  ->  $url") && found=true
+      if [[ "$update" == "$container" ]] && [[ "$PrintMarkdownURL" == true ]]; then Updates+=("- [$update]($url)"); found=true;
-    done < "$ScriptWorkDir"/urls.list
+      elif [[ "$update" == "$container" ]]; then Updates+=("$update  ->  $url"); found=true;
-    [[ $found == false ]] && Updates+=("$update  ->  url missing") || continue
+      fi
+    done < "${ScriptWorkDir}/urls.list"
+    if [[ "$found" == false ]] && [[ "$PrintMarkdownURL" == true ]]; then Updates+=("- $update  ->  url missing");
+    elif [[ "$found" == false ]]; then Updates+=("$update  ->  url missing");
+    else continue;
+    fi
   done
 }
 
-# Version check & initiate self update
-if [[ "$VERSION" != "$LatestRelease" ]] ; then
-  printf "New version available! %b%s%b ⇒ %b%s%b \n Change Notes: %s \n" "$c_yellow" "$VERSION" "$c_reset" "$c_green" "$LatestRelease" "$c_reset" "$LatestChanges"
-  if [[ -z "$AutoUp" ]] ; then
-    read -r -p "Would you like to update? y/[n]: " SelfUpdate
-    [[ "$SelfUpdate" =~ [yY] ]] && self_update
-  else
-    [[ -n "$Notify" ]] && { [[ $(type -t dockcheck_notification) == function ]] && dockcheck_notification "$VERSION" "$LatestRelease" "$LatestChanges" || printf "Could not source notification function.\n" ; }
-  fi
-fi
-
-# Set $1 to a variable for name filtering later
-SearchName="$1"
-# Create array of excludes
-IFS=',' read -r -a Excludes <<< "$Exclude" ; unset IFS
-
 # Static binary downloader for dependencies
 binary_downloader() {
   BinaryName="$1"
@@ -191,23 +274,31 @@ binary_downloader() {
   case "$(uname -m)" in
     x86_64|amd64) architecture="amd64" ;;
     arm64|aarch64) architecture="arm64";;
-    *) printf "\n%bArchitecture not supported, exiting.%b\n" "$c_red" "$c_reset" ; exit 1;;
+    *) printf "\n%bArchitecture not supported, exiting.%b\n" "$c_red" "$c_reset"; exit 1;;
   esac
   GetUrl="${BinaryUrl/TEMP/"$architecture"}"
-  if [[ $(command -v curl) ]]; then curl -L $GetUrl > "$ScriptWorkDir/$BinaryName" ;
+  if command -v curl &>/dev/null; then curl ${CurlArgs} -L "$GetUrl" > "$ScriptWorkDir/$BinaryName" || { printf "ERROR: Failed to curl binary dependency. Rerun the script to retry.\n"; exit 1; }
-  elif [[ $(command -v wget) ]]; then wget $GetUrl -O "$ScriptWorkDir/$BinaryName" ;
+  elif command -v wget &>/dev/null; then wget --waitretry=1 --timeout=15 -t 10 "$GetUrl" -O "$ScriptWorkDir/$BinaryName";
-  else printf "%s\n" "curl/wget not available - get $BinaryName manually from the repo link, exiting."; exit 1;
+  else printf "\n%bcurl/wget not available - get %s manually from the repo link, exiting.%b" "$c_red" "$BinaryName" "$c_reset"; exit 1;
   fi
   [[ -f "$ScriptWorkDir/$BinaryName" ]] && chmod +x "$ScriptWorkDir/$BinaryName"
 }
 
 distro_checker() {
-  if [[ -f /etc/arch-release ]] ; then PkgInstaller="pacman -S"
+  isRoot=false
-  elif [[ -f /etc/redhat-release ]] ; then PkgInstaller="sudo dnf install"
+  [[ ${EUID:-} == 0 ]] && isRoot=true
-  elif [[ -f /etc/SuSE-release ]] ; then PkgInstaller="sudo zypper install"
+  if [[ -f /etc/alpine-release ]] ; then
-  elif [[ -f /etc/debian_version ]] ; then PkgInstaller="sudo apt-get install"
+    [[ "$isRoot" == true ]] && PkgInstaller="apk add" || PkgInstaller="doas apk add"
-  elif [[ $(uname -s) == "Darwin" ]] ; then PkgInstaller="brew install"
+  elif [[ -f /etc/arch-release ]]; then
-  else PkgInstaller="ERROR" ; printf "\n%bNo distribution could be determined%b, falling back to static binary.\n" "$c_yellow" "$c_reset"
+    [[ "$isRoot" == true ]] && PkgInstaller="pacman -S" || PkgInstaller="sudo pacman -S"
+  elif [[ -f /etc/debian_version ]]; then
+    [[ "$isRoot" == true ]] && PkgInstaller="apt-get install" || PkgInstaller="sudo apt-get install"
+  elif [[ -f /etc/redhat-release ]]; then
+    [[ "$isRoot" == true ]] && PkgInstaller="dnf install" || PkgInstaller="sudo dnf install"
+  elif [[ -f /etc/SuSE-release ]]; then
+    [[ "$isRoot" == true ]] && PkgInstaller="zypper install" || PkgInstaller="sudo zypper install"
+  elif [[ $(uname -s) == "Darwin" ]]; then PkgInstaller="brew install"
+  else PkgInstaller="ERROR"; printf "\n%bNo distribution could be determined%b, falling back to static binary.\n" "$c_yellow" "$c_reset"
   fi
 }
 
@@ -216,41 +307,75 @@ dependency_check() {
   AppName="$1"
   AppVar="$2"
   AppUrl="$3"
-  if [[ $(command -v $AppName) ]]; then export $AppVar="$AppName" ;
+  if command -v "$AppName" &>/dev/null; then export "$AppVar"="$AppName";
-  elif [[ -f "$ScriptWorkDir/$AppName" ]]; then export $AppVar="$ScriptWorkDir/$AppName" ;
+  elif [[ -f "$ScriptWorkDir/$AppName" ]]; then export "$AppVar"="$ScriptWorkDir/$AppName";
   else
-    printf "%s\n" "Required dependency '$AppName' missing, do you want to install it?"
+    printf "\nRequired dependency %b'%s'%b missing, do you want to install it?\n" "$c_teal" "$AppName" "$c_reset"
     read -r -p "y: With packagemanager (sudo). / s: Download static binary. y/s/[n] " GetBin
     GetBin=${GetBin:-no} # set default to no if nothing is given
-    if [[ "$GetBin" =~ [yYsS] ]] ; then
+    if [[ "$GetBin" =~ [yYsS] ]]; then
       [[ "$GetBin" =~ [yY] ]] && distro_checker
-      if [[ -n "$PkgInstaller" && "$PkgInstaller" != "ERROR" ]] ; then
+      if [[ -n "${PkgInstaller:-}" && "${PkgInstaller:-}" != "ERROR" ]]; then
         [[ $(uname -s) == "Darwin" && "$AppName" == "regctl" ]] && AppName="regclient"
-        ($PkgInstaller $AppName) ; PkgExitcode="$?" && AppName="$1"
+        if $PkgInstaller "$AppName"; then
-        if [[ "$PkgExitcode" == 0 ]] ; then { export $AppVar="$AppName" && printf "\n%b$AppName installed.%b\n" "$c_green" "$c_reset"; }
+          AppName="$1"
-        else printf "\n%bPackagemanager install failed%b, falling back to static binary.\n" "$c_yellow" "$c_reset"
+          export "$AppVar"="$AppName"
+          printf "\n%b%b installed.%b\n" "$c_green" "$AppName" "$c_reset"
+        else
+          PkgInstaller="ERROR"
+          printf "\n%bPackagemanager install failed%b, falling back to static binary.\n" "$c_yellow" "$c_reset"
         fi
       fi
-      if [[ "$GetBin" =~ [sS] || "$PkgInstaller" == "ERROR" || "$PkgExitcode" != 0 ]] ; then
+      if [[ "$GetBin" =~ [sS] ]] || [[ "$PkgInstaller" == "ERROR" ]]; then
           binary_downloader "$AppName" "$AppUrl"
-          [[ -f "$ScriptWorkDir/$AppName" ]] && { export $AppVar="$ScriptWorkDir/$1" && printf "\n%b$AppName downloaded.%b\n" "$c_green" "$c_reset"; }
+          [[ -f "$ScriptWorkDir/$AppName" ]] && { export "$AppVar"="$ScriptWorkDir/$1" && printf "\n%b%s downloaded.%b\n" "$c_green" "$AppName" "$c_reset"; }
       fi
-    else printf "\n%bDependency missing, exiting.%b\n" "$c_red" "$c_reset" ; exit 1 ;
+    else printf "\n%bDependency missing, exiting.%b\n" "$c_red" "$c_reset"; exit 1;
     fi
   fi
   # Final check if binary is correct
   [[ "$1" == "jq" ]] && VerFlag="--version"
   [[ "$1" == "regctl" ]] && VerFlag="version"
-  ${!AppVar} $VerFlag &> /dev/null  || { printf "%s\n" "$AppName is not working - try to remove it and re-download it, exiting."; exit 1; }
+  ${!AppVar} "$VerFlag" &> /dev/null  || { printf "%s\n" "$AppName is not working - try to remove it and re-download it, exiting."; exit 1; }
 }
 
 dependency_check "regctl" "regbin" "https://github.com/regclient/regclient/releases/latest/download/regctl-linux-TEMP"
 dependency_check "jq" "jqbin" "https://github.com/jqlang/jq/releases/latest/download/jq-linux-TEMP"
 
+# Numbered List function
+# if urls.list exists add release note url per line
+list_options() {
+  num=1
+  for update in "${Updates[@]}"; do
+    echo "$num) $update"
+    ((num++))
+  done
+}
+
+# Version check & initiate self update
+if [[ "$LatestRelease" != "undefined" ]]; then
+  if [[ "$VERSION" != "$LatestRelease" ]]; then
+    printf "New version available! %b%s%b ⇒ %b%s%b \n Change Notes: %s \n" "$c_yellow" "$VERSION" "$c_reset" "$c_green" "$LatestRelease" "$c_reset" "$LatestChanges"
+    if [[ "$AutoMode" == false ]]; then
+      read -r -p "Would you like to update? y/[n]: " SelfUpdate
+      [[ "$SelfUpdate" =~ [yY] ]] && self_update
+    elif [[ "$AutoMode" == true ]] && [[ "$AutoSelfUpdate" == true ]]; then self_update;
+    else
+      [[ "$Notify" == true ]] && { exec_if_exists_or_fail dockcheck_notification "$VERSION" "$LatestRelease" "$LatestChanges" || printf "Could not source notification function.\n"; }
+    fi
+  fi
+else
+  printf "ERROR: Failed to curl latest Dockcheck.sh release version.\n"
+fi
+
+# Version check for notify templates
+[[ "$Notify" == true ]] && [[ ! -s "${ScriptWorkDir}/notify.sh" ]] && { exec_if_exists_or_fail notify_update_notification || printf "Could not source notify notification function.\n"; }
+
 # Check docker compose binary
-if docker compose version &> /dev/null ; then DockerBin="docker compose" ;
+docker info &>/dev/null || { printf "\n%bYour current user does not have permissions to the docker socket - may require root / docker group. Exiting.%b\n" "$c_red" "$c_reset"; exit 1; }
-elif docker-compose -v &> /dev/null; then DockerBin="docker-compose" ;
+if docker compose version &>/dev/null; then DockerBin="docker compose" ;
-elif docker -v &> /dev/null; then
+elif docker-compose -v &>/dev/null; then DockerBin="docker-compose" ;
+elif docker -v &>/dev/null; then
   printf "%s\n" "No docker compose binary available, using plain docker (Not recommended!)"
   printf "%s\n" "'docker run' will ONLY update images, not the container itself."
 else
@@ -258,17 +383,8 @@ else
   exit 1
 fi
 
-# Numbered List function
-options() {
-num=1
-for i in "${GotUpdates[@]}"; do
-  echo "$num) $i"
-  ((num++))
-done
-}
-
 # Listing typed exclusions
-if [[ -n ${Excludes[*]} ]] ; then
+if [[ -n ${Excludes[*]:-} ]]; then
   printf "\n%bExcluding these names:%b\n" "$c_blue" "$c_reset"
   printf "%s\n" "${Excludes[@]}"
   printf "\n"
@@ -279,9 +395,9 @@ ContCount=$(docker ps $Stopped --filter "name=$SearchName" --format '{{.Names}}'
 RegCheckQue=0
 
 # Testing and setting timeout binary
-t_out=$(command -v timeout)
+t_out=$(command -v timeout || echo "")
 if [[ $t_out ]]; then
-  t_out=$(realpath $t_out 2>/dev/null || readlink -f $t_out)
+  t_out=$(realpath "$t_out" 2>/dev/null || readlink -f "$t_out")
   if [[ $t_out =~ "busybox" ]]; then
     t_out="timeout ${Timeout}"
   else t_out="timeout --foreground ${Timeout}"
@@ -292,52 +408,60 @@ fi
 check_image() {
   i="$1"
   local Excludes=($Excludes_string)
-  for e in "${Excludes[@]}" ; do
+  for e in "${Excludes[@]}"; do
     if [[ "$i" == "$e" ]]; then
-      echo Skip $i
+      printf "%s\n" "Skip $i"
       return
     fi
   done
 
+  # Skipping non-compose containers unless option is set
+  ContLabels=$(docker inspect "$i" --format '{{json .Config.Labels}}')
+  ContPath=$($jqbin -r '."com.docker.compose.project.working_dir"' <<< "$ContLabels")
+  [[ "$ContPath" == "null" ]] && ContPath=""
+  if [[ -z "$ContPath" ]] && [[ "$DRunUp" == false ]]; then
+    printf "%s\n" "NoUpdates !$i - not checked, no compose file"
+    return
+  fi
+
   local NoUpdates GotUpdates GotErrors
   ImageId=$(docker inspect "$i" --format='{{.Image}}')
   RepoUrl=$(docker inspect "$i" --format='{{.Config.Image}}')
   LocalHash=$(docker image inspect "$ImageId" --format '{{.RepoDigests}}')
 
   # Checking for errors while setting the variable
-  if RegHash=$(${t_out} $regbin -v error image digest --list "$RepoUrl" 2>&1) ; then
+  if RegHash=$($t_out "$regbin" -v error image digest --list "$RepoUrl" 2>&1); then
-    if [[ "$LocalHash" = *"$RegHash"* ]] ; then
+    if [[ "$LocalHash" == *"$RegHash"* ]]; then
-      echo NoUpdates "$i"
+      printf "%s\n" "NoUpdates $i"
     else
-      if [[ -n "$DaysOld" ]] && ! datecheck ; then
+      if [[ -n "${DaysOld:-}" ]] && ! datecheck; then
-        echo NoUpdates "+$i ${ImageAge}d"
+        printf "%s\n" "NoUpdates +$i ${ImageAge}d"
       else
-        echo GotUpdates "$i"
+        printf "%s\n" "GotUpdates $i"
       fi
     fi
   else
-    # Here the RegHash is the result of an error code
+    printf "%s\n" "GotErrors $i - ${RegHash}"  # Reghash contains an error code here
-    echo GotErrors "$i - ${RegHash}"
   fi
 }
 
 # Make required functions and variables available to subprocesses
 export -f check_image datecheck
-export Excludes_string="${Excludes[@]}" # Can only export scalar variables
+export Excludes_string="${Excludes[*]:-}" # Can only export scalar variables
-export t_out regbin RepoUrl DaysOld
+export t_out regbin RepoUrl DaysOld DRunUp jqbin
 
 # Check for POSIX xargs with -P option, fallback without async
 if (echo "test" | xargs -P 2 >/dev/null 2>&1) && [[ "$MaxAsync" != 0 ]]; then
   XargsAsync="-P $MaxAsync"
 else
   XargsAsync=""
-  [[ "$MaxAsync" != 0 ]] && printf "%bMissing POSIX xargs, consider installing 'findutils' for asynchronous lookups.%b\n" "$c_red" "$c_reset"
+  [[ "$MaxAsync" != 0 ]] && printf "%bMissing POSIX xargs, consider installing 'findutils' for asynchronous lookups.%b\n" "$c_yellow" "$c_reset"
 fi
 
 # Asynchronously check the image-hash of every running container VS the registry
 while read -r line; do
   ((RegCheckQue+=1))
-  progress_bar "$RegCheckQue" "$ContCount"
+  if [[ "$MonoMode" == false ]]; then progress_bar "$RegCheckQue" "$ContCount"; fi
 
   Got=${line%% *}  # Extracts the first word (NoUpdates, GotUpdates, GotErrors)
   item=${line#* }
@@ -351,73 +475,70 @@ while read -r line; do
   esac
 done < <( \
   docker ps $Stopped --filter "name=$SearchName" --format '{{.Names}}' | \
-  xargs ${XargsAsync} -I {} bash -c 'check_image "{}"' \
+  xargs $XargsAsync -I {} bash -c 'check_image "{}"' \
 )
 
 # Sort arrays alphabetically
 IFS=$'\n'
-NoUpdates=($(sort <<<"${NoUpdates[*]}"))
+NoUpdates=($(sort <<<"${NoUpdates[*]:-}"))
-GotUpdates=($(sort <<<"${GotUpdates[*]}"))
+GotUpdates=($(sort <<<"${GotUpdates[*]:-}"))
 unset IFS
 
 # Run the prometheus exporter function
-if [ -n "$CollectorTextFileDirectory" ] ; then
+if [[ -n "${CollectorTextFileDirectory:-}" ]]; then
-  source "$ScriptWorkDir"/addons/prometheus/prometheus_collector.sh && prometheus_exporter ${#NoUpdates[@]} ${#GotUpdates[@]} ${#GotErrors[@]}
+  exec_if_exists_or_fail prometheus_exporter ${#NoUpdates[@]} ${#GotUpdates[@]} ${#GotErrors[@]} || printf "%s\n" "Could not source prometheus exporter function."
 fi
 
 # Define how many updates are available
 UpdCount="${#GotUpdates[@]}"
 
 # List what containers got updates or not
-if [[ -n ${NoUpdates[*]} ]] ; then
+if [[ -n ${NoUpdates[*]:-} ]]; then
   printf "\n%bContainers on latest version:%b\n" "$c_green" "$c_reset"
   printf "%s\n" "${NoUpdates[@]}"
 fi
-if [[ -n ${GotErrors[*]} ]] ; then
+if [[ -n ${GotErrors[*]:-} ]]; then
   printf "\n%bContainers with errors, won't get updated:%b\n" "$c_red" "$c_reset"
   printf "%s\n" "${GotErrors[@]}"
   printf "%binfo:%b 'unauthorized' often means not found in a public registry.\n" "$c_blue" "$c_reset"
 fi
-if [[ -n ${GotUpdates[*]} ]] ; then
+if [[ -n ${GotUpdates[*]:-} ]]; then
-   printf "\n%bContainers with updates available:%b\n" "$c_yellow" "$c_reset"
+  printf "\n%bContainers with updates available:%b\n" "$c_yellow" "$c_reset"
-   [[ -z "$AutoUp" ]] && options || printf "%s\n" "${GotUpdates[@]}"
+  if [[ -s "$ScriptWorkDir/urls.list" ]] && [[ "$PrintReleaseURL" == true ]]; then releasenotes; else Updates=("${GotUpdates[@]}"); fi
-   [[ -n "$Notify" ]] && { [[ $(type -t send_notification) == function ]] && send_notification "${GotUpdates[@]}" || printf "Could not source notification function.\n" ; }
+  [[ "$AutoMode" == false ]] && list_options || printf "%s\n" "${Updates[@]}"
+  [[ "$Notify" == true ]] && { exec_if_exists_or_fail send_notification "${GotUpdates[@]}" || printf "\nCould not source notification function.\n"; }
 fi
 
 # Optionally get updates if there's any
-if [ -n "$GotUpdates" ] ; then
+if [[ -n "${GotUpdates:-}" ]]; then
-  if [ -z "$AutoUp" ] ; then
+  if [[ "$AutoMode" == false ]]; then
     printf "\n%bChoose what containers to update.%b\n" "$c_teal" "$c_reset"
     choosecontainers
   else
     SelectedUpdates=( "${GotUpdates[@]}" )
   fi
-  if [ "$AutoUp" == "${AutoUp#[Nn]}" ] ; then
+  if [[ "$DontUpdate" == false ]]; then
+    printf "\n%bUpdating container(s):%b\n" "$c_blue" "$c_reset"
+    printf "%s\n" "${SelectedUpdates[@]}"
+
     NumberofUpdates="${#SelectedUpdates[@]}"
+
     CurrentQue=0
-    for i in "${SelectedUpdates[@]}"
+    for i in "${SelectedUpdates[@]}"; do
-    do
       ((CurrentQue+=1))
-      unset CompleteConfs
+      printf "\n%bNow updating (%s/%s): %b%s%b\n" "$c_teal" "$CurrentQue" "$NumberofUpdates" "$c_blue" "$i" "$c_reset"
-      # Extract labels and metadata
       ContLabels=$(docker inspect "$i" --format '{{json .Config.Labels}}')
       ContImage=$(docker inspect "$i" --format='{{.Config.Image}}')
       ContPath=$($jqbin -r '."com.docker.compose.project.working_dir"' <<< "$ContLabels")
-      [ "$ContPath" == "null" ] && ContPath=""
+      [[ "$ContPath" == "null" ]] && ContPath=""
-      ContConfigFile=$($jqbin -r '."com.docker.compose.project.config_files"' <<< "$ContLabels")
-      [ "$ContConfigFile" == "null" ] && ContConfigFile=""
-      ContName=$($jqbin -r '."com.docker.compose.service"' <<< "$ContLabels")
-      [ "$ContName" == "null" ] && ContName=""
-      ContEnv=$($jqbin -r '."com.docker.compose.project.environment_file"' <<< "$ContLabels")
-      [ "$ContEnv" == "null" ] && ContEnv=""
       ContUpdateLabel=$($jqbin -r '."mag37.dockcheck.update"' <<< "$ContLabels")
-      [ "$ContUpdateLabel" == "null" ] && ContUpdateLabel=""
+      [[ "$ContUpdateLabel" == "null" ]] && ContUpdateLabel=""
-      ContRestartStack=$($jqbin -r '."mag37.dockcheck.restart-stack"' <<< "$ContLabels")
+      # Checking if Label Only -option is set, and if container got the label
-      [ "$ContRestartStack" == "null" ] && ContRestartStack=""
+      [[ "$OnlyLabel" == true ]] && { [[ "$ContUpdateLabel" != true ]] && { echo "No update label, skipping."; continue; } }
 
       # Checking if compose-values are empty - hence started with docker run
-      if [ -z "$ContPath" ] ; then
+      if [[ -z "$ContPath" ]]; then
-        if [ "$DRunUp" == "yes" ] ; then
+        if [[ "$DRunUp" == true ]]; then
           docker pull "$ContImage"
           printf "%s\n" "$i got a new image downloaded, rebuild manually with preferred 'docker run'-parameters"
         else
@@ -425,30 +546,63 @@ if [ -n "$GotUpdates" ] ; then
         fi
         continue
       fi
-      # cd to the compose-file directory to account for people who use relative volumes
+
-      cd "$ContPath" || { echo "Path error - skipping $i" ; continue ; }
+      docker pull "$ContImage" || { printf "\n%bDocker error, exiting!%b\n" "$c_red" "$c_reset" ; exit 1; }
-      ## Reformatting path + multi compose
+    done
-      if [[ $ContConfigFile = '/'* ]] ; then
+    printf "\n%bDone pulling updates. %bRecreating updated containers.%b\n" "$c_green" "$c_blue" "$c_reset"
-        CompleteConfs=$(for conf in ${ContConfigFile//,/ } ; do printf -- "-f %s " "$conf"; done)
+
-      else
+    CurrentQue=0
-        CompleteConfs=$(for conf in ${ContConfigFile//,/ } ; do printf -- "-f %s/%s " "$ContPath" "$conf"; done)
+    for i in "${SelectedUpdates[@]}"; do
-      fi
+      ((CurrentQue+=1))
-      printf "\n%bNow updating (%s/%s): %b%s%b\n" "$c_teal" "$CurrentQue" "$NumberofUpdates" "$c_blue" "$i" "$c_reset"
+      unset CompleteConfs
+      # Extract labels and metadata
+      ContLabels=$(docker inspect "$i" --format '{{json .Config.Labels}}')
+      ContImage=$(docker inspect "$i" --format='{{.Config.Image}}')
+      ContPath=$($jqbin -r '."com.docker.compose.project.working_dir"' <<< "$ContLabels")
+      [[ "$ContPath" == "null" ]] && ContPath=""
+      ContConfigFile=$($jqbin -r '."com.docker.compose.project.config_files"' <<< "$ContLabels")
+      [[ "$ContConfigFile" == "null" ]] && ContConfigFile=""
+      ContName=$($jqbin -r '."com.docker.compose.service"' <<< "$ContLabels")
+      [[ "$ContName" == "null" ]] && ContName=""
+      ContEnv=$($jqbin -r '."com.docker.compose.project.environment_file"' <<< "$ContLabels")
+      [[ "$ContEnv" == "null" ]] && ContEnv=""
+      ContUpdateLabel=$($jqbin -r '."mag37.dockcheck.update"' <<< "$ContLabels")
+      [[ "$ContUpdateLabel" == "null" ]] && ContUpdateLabel=""
+      ContRestartStack=$($jqbin -r '."mag37.dockcheck.restart-stack"' <<< "$ContLabels")
+      [[ "$ContRestartStack" == "null" ]] && ContRestartStack=""
+      ContOnlySpecific=$($jqbin -r '."mag37.dockcheck.only-specific-container"' <<< "$ContLabels")
+      [[ "$ContOnlySpecific" == "null" ]] && ContRestartStack=""
+
+      printf "\n%bNow recreating (%s/%s): %b%s%b\n" "$c_teal" "$CurrentQue" "$NumberofUpdates" "$c_blue" "$i" "$c_reset"
+      # Checking if compose-values are empty - hence started with docker run
+      [[ -z "$ContPath" ]] && { echo "Not a compose container, skipping."; continue; }
       # Checking if Label Only -option is set, and if container got the label
-      [[ "$OnlyLabel" == true ]] && { [[ "$ContUpdateLabel" != true ]] && { echo "No update label, skipping." ; continue ; } }
+      [[ "$OnlyLabel" == true ]] && { [[ "$ContUpdateLabel" != true ]] && { echo "No update label, skipping."; continue; } }
-      docker pull "$ContImage"
+
-      # Check if the container got an environment file set and reformat it
+      # cd to the compose-file directory to account for people who use relative volumes
-      if [ -n "$ContEnv" ]; then ContEnvs=$(for env in ${ContEnv//,/ } ; do printf -- "--env-file %s " "$env"; done) ; fi
+      cd "$ContPath" || { printf "\n%bPath error - skipping%b %s" "$c_red" "$c_reset" "$i"; continue; }
-      # Check if the whole stack should be restarted
+      ## Reformatting path + multi compose
-      if [[ "$ContRestartStack" == true ]] || [[ "$ForceRestartStacks" == true ]] ; then
+      if [[ $ContConfigFile == '/'* ]]; then
-        $DockerBin ${CompleteConfs} stop ; $DockerBin ${CompleteConfs} ${ContEnvs} up -d
+        CompleteConfs=$(for conf in ${ContConfigFile//,/ }; do printf -- "-f %s " "$conf"; done)
       else
-        $DockerBin ${CompleteConfs} ${ContEnvs} up -d ${ContName}
+        CompleteConfs=$(for conf in ${ContConfigFile//,/ }; do printf -- "-f %s/%s " "$ContPath" "$conf"; done)
+      fi
+      # Check if the container got an environment file set and reformat it
+      ContEnvs=""
+      if [[ -n "$ContEnv" ]]; then ContEnvs=$(for env in ${ContEnv//,/ }; do printf -- "--env-file %s " "$env"; done); fi
+      # Set variable when compose up should only target the specific container, not the stack
+      if [[ $OnlySpecific == true ]] || [[ $ContOnlySpecific == true ]]; then SpecificContainer="$ContName"; fi
+
+      # Check if the whole stack should be restarted
+      if [[ "$ContRestartStack" == true ]] || [[ "$ForceRestartStacks" == true ]]; then
+        ${DockerBin} ${CompleteConfs} stop; ${DockerBin} ${CompleteConfs} ${ContEnvs} up -d || { printf "\n%bDocker error, exiting!%b\n" "$c_red" "$c_reset" ; exit 1; }
+      else
+        ${DockerBin} ${CompleteConfs} ${ContEnvs} up -d ${SpecificContainer} || { printf "\n%bDocker error, exiting!%b\n" "$c_red" "$c_reset" ; exit 1; }
       fi
     done
+    if [[ "$AutoPrune" == false ]] && [[ "$AutoMode" == false ]]; then printf "\n"; read -rep "Would you like to prune dangling images? y/[n]: " AutoPrune; fi
+    if [[ "$AutoPrune" == true ]] || [[ "$AutoPrune" =~ [yY] ]]; then printf "\n Auto pruning.."; docker image prune -f; fi
     printf "\n%bAll done!%b\n" "$c_green" "$c_reset"
-    if [[ -z "$AutoPrune" ]] && [[ -z "$AutoUp" ]]; then read -r -p "Would you like to prune dangling images? y/[n]: " AutoPrune ; fi
-    [[ "$AutoPrune" =~ [yY] ]] && docker image prune -f
   else
     printf "\nNo updates installed, exiting.\n"
   fi

notify_templates/notify_DSM.sh

@@ -1,11 +1,12 @@
 ### DISCLAIMER: This is a third party addition to dockcheck - best effort testing.
-NOTIFY_DSM_VERSION="v0.1"
+NOTIFY_DSM_VERSION="v0.3"
 # INFO: ssmtp is deprecated - consider to use msmtp instead.
 #
-# Copy/rename this file to notify.sh to enable the notification snipppet.
 # mSMTP/sSMTP has to be installed and configured manually.
 # The existing DSM Notification Email configuration will be used automatically.
-# Modify to your liking - changing SendMailTo and Subject and content.
+# Leave (or place) this file in the "notify_templates" subdirectory within the same directory as the main dockcheck.sh script.
+# If you instead wish make your own modifications, make a copy in the same directory as the main dockcheck.sh script.
+# Do not modify this file directly within the "notify_templates" subdirectory. Set DSM_SENDMAILTO and DSM_SUBJECTTAG in your dockcheck.config file.
 
 MSMTP=$(which msmtp)
 SSMTP=$(which ssmtp)
@@ -18,18 +19,17 @@ else
 	echo "No msmtp or ssmtp binary found in PATH: $PATH" ; exit 1
 fi
 
-FromHost=$(hostname)
+trigger_DSM_notification() {
-
-trigger_notification() {
 CfgFile="/usr/syno/etc/synosmtp.conf"
 
 # User variables:
 # Automatically sends to your usual destination for synology DSM notification emails.
-# You can also manually override by assigning something else to SendMailTo below.
+# You can also manually override by assigning something else to DSM_SENDMAILTO in dockcheck.config.
-SendMailTo=$(grep 'eventmail1' $CfgFile | sed -n 's/.*"\([^"]*\)".*/\1/p')
+SendMailTo=${DSM_SENDMAILTO:-$(grep 'eventmail1' $CfgFile | sed -n 's/.*"\([^"]*\)".*/\1/p')}
-#SendMailTo="me@mydomain.com"
+# e.g. DSM_SENDMAILTO="me@mydomain.com"
 
-SubjectTag=$(grep 'eventsubjectprefix' $CfgFile | sed -n 's/.*"\([^"]*\)".*/\1/p')
+SubjectTag=${DSM_SUBJECTTAG:-$(grep 'eventsubjectprefix' $CfgFile | sed -n 's/.*"\([^"]*\)".*/\1/p')}
+# e.g. DSM_SUBJECTTAG="Email Subject Prefix"
 SenderName=$(grep 'smtp_from_name' $CfgFile | sed -n 's/.*"\([^"]*\)".*/\1/p')
 SenderMail=$(grep 'smtp_from_mail' $CfgFile | sed -n 's/.*"\([^"]*\)".*/\1/p')
 SenderMail=${SenderMail:-$(grep 'eventmail1' $CfgFile | sed -n 's/.*"\([^"]*\)".*/\1/p')}
@@ -38,45 +38,18 @@ $MailPkg $SendMailTo << __EOF
 From: "$SenderName" <$SenderMail>
 date:$(date -R)
 To: <$SendMailTo>
-Subject: $SubjectTag $MessageTitle $FromHost
+Subject: $SubjectTag $MessageTitle
 Content-Type: text/plain; charset=UTF-8; format=flowed
 Content-Transfer-Encoding: 7bit
 
 $MessageBody
  From $SenderName
 __EOF
+
+if [[ $? -gt 0 ]]; then
+  NotifyError=true
+fi
+
 # This ensures DSM's container manager will also see the update
 /var/packages/ContainerManager/target/tool/image_upgradable_checker
 }
-
-send_notification() {
-		[ -s "$ScriptWorkDir"/urls.list ] && releasenotes || Updates=("$@")
-		UpdToString=$( printf '%s\\n' "${Updates[@]}" )
-
-		printf "\nSending email notification.\n"
-
-		MessageTitle="Updates available on"
-		# Setting the MessageBody variable here.
-		printf -v MessageBody "🐋 Containers on $FromHost with updates available:\n\n$UpdToString"
-
-		trigger_notification
-}
-
-### Rename (eg. disabled_dockcheck_notification), remove or comment out the following function
-### to not send notifications when dockcheck itself has updates.
-dockcheck_notification() {
-		printf "\nSending email dockcheck notification.\n"
-
-		MessageTitle="New version of dockcheck available on"
-		# Setting the MessageBody variable here.
-		printf -v MessageBody "Installed version: $1\nLatest version: $2\n\nChangenotes: $3\n"
-
-    RawNotifyUrl="https://raw.githubusercontent.com/mag37/dockcheck/main/notify_templates/notify_DSM.sh"
-    LatestNotifyRelease="$(curl -s -r 0-150 $RawNotifyUrl | sed -n "/NOTIFY_DSM_VERSION/s/NOTIFY_DSM_VERSION=//p" | tr -d '"')"
-    if [[ "$NOTIFY_DSM_VERSION" != "$LatestNotifyRelease" ]] ; then
-        printf -v NotifyUpdate "\n\nnotify_DSM.sh update avialable:\n $NOTIFY_DSM_VERSION -> $LatestNotifyRelease\n"
-        MessageBody="${MessageBody}${NotifyUpdate}"
-    fi
-
-		trigger_notification
-}

notify_templates/notify_HA.sh

@@ -0,0 +1,31 @@
+### DISCLAIMER: This is a third party addition to dockcheck - best effort testing.
+NOTIFY_HA_VERSION="v0.1"
+#
+# This is an integration that makes it possible to send notifications via Home Assistant (https://www.home-assistant.io/integrations/notify/)
+# You need to generate a long-lived access token in Home Sssistant to be used here (https://developers.home-assistant.io/docs/auth_api/#long-lived-access-token)
+# Leave (or place) this file in the "notify_templates" subdirectory within the same directory as the main dockcheck.sh script.
+# If you instead wish make your own modifications, make a copy in the same directory as the main dockcheck.sh script.
+# Do not modify this file directly within the "notify_templates" subdirectory. Set HA_ENTITY, HA_URL and HA_TOKEN in your dockcheck.config file.
+
+if [[ -z "${HA_ENTITY:-}" ]] || [[ -z "${HA_URL:-}" ]] || [[ -z "${HA_TOKEN:-}" ]]; then
+  printf "Home Assistant notification channel enabled, but required configuration variables are missing. Home assistant notifications will not be sent.\n"
+
+  remove_channel HA
+fi
+
+trigger_HA_notification() {
+  AccessToken="${HA_TOKEN}"
+  Url="${HA_URL}/api/services/notify/${HA_ENTITY}"
+  JsonData=$( "$jqbin" -n \
+              --arg body "$MessageBody" \
+              '{"title": "dockcheck update", "message": $body}' )
+
+  curl -S -o /dev/null ${CurlArgs} \
+    -H "Authorization: Bearer $AccessToken" \
+    -H "Content-Type: application/json" \
+    -d "$JsonData" -X POST $Url
+
+  if [[ $? -gt 0 ]]; then
+    NotifyError=true
+  fi
+}

notify_templates/notify_apprise.sh

@@ -1,55 +1,40 @@
 ### DISCLAIMER: This is a third party addition to dockcheck - best effort testing.
-NOTIFY_APPRISE_VERSION="v0.1"
+NOTIFY_APPRISE_VERSION="v0.3"
 #
-# Copy/rename this file to notify.sh to enable the notification snippet.
 # Required receiving services must already be set up.
-# Modify to fit your setup - if API, set AppriseURL to your Apprise ip/domain.
+# Leave (or place) this file in the "notify_templates" subdirectory within the same directory as the main dockcheck.sh script.
+# If you instead wish make your own modifications, make a copy in the same directory as the main dockcheck.sh script.
+# Do not modify this file directly within the "notify_templates" subdirectory. Set APPRISE_PAYLOAD in your dockcheck.config file.
+# If API, set APPRISE_URL instead.
 
-FromHost=$(hostname)
+if [[ -z "${APPRISE_PAYLOAD:-}" ]] && [[ -z "${APPRISE_URL:-}" ]]; then
+  printf "Apprise notification channel enabled, but required configuration variables are missing. Apprise notifications will not be sent.\n"
 
-trigger_notification() {
+  remove_channel apprise
+fi
 
-   ### Modify to fit your setup:
+trigger_apprise_notification() {
-   apprise -vv -t "$MessageTitle" -b "$MessageBody" \
-      mailto://myemail:mypass@gmail.com \
-      mastodons://{token}@{host} \
-      pbul://o.gn5kj6nfhv736I7jC3cj3QLRiyhgl98b \
-      tgram://{bot_token}/{chat_id}/
 
-   ### If you use the Apprise-API - Comment out the apprise command above.
+  if [[ -n "${APPRISE_PAYLOAD:-}" ]]; then
-   ### Uncomment the AppriseURL and the curl-line below:
+    apprise -vv -t "$MessageTitle" -b "$MessageBody" \
-   # AppriseURL="http://apprise.mydomain.tld:1234/notify/apprise"
+      ${APPRISE_PAYLOAD}
-   # curl -X POST -F "title=$MessageTitle" -F "body=$MessageBody" -F "tags=all" $AppriseURL
-}
 
-send_notification() {
+    if [[ $? -gt 0 ]]; then
-    [ -s "$ScriptWorkDir"/urls.list ] && releasenotes || Updates=("$@")
+      NotifyError=true
-    UpdToString=$( printf '%s\\n' "${Updates[@]}" )
-
-    printf "\nSending Apprise notification\n"
-
-    MessageTitle="$FromHost - updates available."
-    # Setting the MessageBody variable here.
-    printf -v MessageBody "🐋 Containers on $FromHost with updates available:\n$UpdToString"
-
-    trigger_notification
-}
-
-### Rename (eg. disabled_dockcheck_notification), remove or comment out the following function
-### to not send notifications when dockcheck itself has updates.
-dockcheck_notification() {
-    printf "\nSending Apprise dockcheck notification\n"
-
-    MessageTitle="$FromHost - New version of dockcheck available."
-    # Setting the MessageBody variable here.
-    printf -v MessageBody "Installed version: $1 \nLatest version: $2 \n\nChangenotes: $3"
-
-    RawNotifyUrl="https://raw.githubusercontent.com/mag37/dockcheck/main/notify_templates/notify_apprise.sh"
-    LatestNotifyRelease="$(curl -s -r 0-150 $RawNotifyUrl | sed -n "/NOTIFY_APPRISE_VERSION/s/NOTIFY_APPRISE_VERSION=//p" | tr -d '"')"
-    if [[ "$NOTIFY_APPRISE_VERSION" != "$LatestNotifyRelease" ]] ; then
-        printf -v NotifyUpdate "\n\nnotify_apprise.sh update avialable:\n $NOTIFY_APPRISE_VERSION -> $LatestNotifyRelease\n"
-        MessageBody="${MessageBody}${NotifyUpdate}"
     fi
+  fi
 
-    trigger_notification
+  # e.g. APPRISE_PAYLOAD='mailto://myemail:mypass@gmail.com
-}
+  #                      mastodons://{token}@{host}
+  #                      pbul://o.gn5kj6nfhv736I7jC3cj3QLRiyhgl98b
+  #                      tgram://{bot_token}/{chat_id}/'
+
+  if [[ -n "${APPRISE_URL:-}" ]]; then
+    AppriseURL="${APPRISE_URL}"
+    curl -S -o /dev/null ${CurlArgs} -X POST -F "title=$MessageTitle" -F "body=$MessageBody" -F "tags=all" $AppriseURL # e.g. APPRISE_URL=http://apprise.mydomain.tld:1234/notify/apprise
+
+    if [[ $? -gt 0 ]]; then
+      NotifyError=true
+    fi
+  fi
+}

notify_templates/notify_discord.sh

@@ -1,43 +1,28 @@
 ### DISCLAIMER: This is a third party addition to dockcheck - best effort testing.
-NOTIFY_DISCORD_VERSION="v0.1"
+NOTIFY_DISCORD_VERSION="v0.4"
 #
-# Copy/rename this file to notify.sh to enable the notification snippet.
 # Required receiving services must already be set up.
-# Modify to fit your setup - set DiscordWebhookUrl
+# Leave (or place) this file in the "notify_templates" subdirectory within the same directory as the main dockcheck.sh script.
+# If you instead wish make your own modifications, make a copy in the same directory as the main dockcheck.sh script.
+# Do not modify this file directly within the "notify_templates" subdirectory. Set DISCORD_WEBHOOK_URL in your dockcheck.config file.
 
-FromHost=$(hostname)
+if [[ -z "${DISCORD_WEBHOOK_URL:-}" ]]; then
+  printf "Discord notification channel enabled, but required configuration variables are missing. Discord notifications will not be sent.\n"
 
-trigger_notification() {
+  remove_channel discord
-    # Modify to fit your setup:
+fi
-    DiscordWebhookUrl="PasteYourFullDiscordWebhookURL"
 
-    MsgBody="{\"username\":\"$FromHost\",\"content\":\"$MessageBody\"}"
+trigger_discord_notification() {
-    curl -sS -o /dev/null --fail -X POST -H "Content-Type: application/json" -d "$MsgBody" "$DiscordWebhookUrl"
+  DiscordWebhookUrl="${DISCORD_WEBHOOK_URL}" # e.g. DISCORD_WEBHOOK_URL=https://discord.com/api/webhooks/<token string>
-}
+
-
+  JsonData=$( "$jqbin" -n \
-send_notification() {
+              --arg username "$FromHost" \
-    [ -s "$ScriptWorkDir"/urls.list ] && releasenotes || Updates=("$@")
+              --arg body "$MessageBody" \
-    UpdToString=$( printf '%s\\n' "${Updates[@]}" )
+              '{"username": $username, "content": $body}' )
-
+
-    printf "\nSending Discord notification\n"
+  curl -S -o /dev/null ${CurlArgs} -X POST -H "Content-Type: application/json" -d "$JsonData" "$DiscordWebhookUrl"
-    # Setting the MessageBody variable here.
+
-    MessageBody="🐋 Containers on $FromHost with updates available: \n$UpdToString"
+  if [[ $? -gt 0 ]]; then
-
+    NotifyError=true
-    trigger_notification
+  fi
-}
-
-### Rename (eg. disabled_dockcheck_notification), remove or comment out the following function
-### to not send notifications when dockcheck itself has updates.
-dockcheck_notification() {
-    printf "\nSending Discord dockcheck notification\n"
-    MessageBody="$FromHost - New version of dockcheck available: \n Installed version: $1 \nLatest version: $2 \n\nChangenotes: $3"
-
-    RawNotifyUrl="https://raw.githubusercontent.com/mag37/dockcheck/main/notify_templates/notify_discord.sh"
-    LatestNotifyRelease="$(curl -s -r 0-150 $RawNotifyUrl | sed -n "/NOTIFY_DISCORD_VERSION/s/NOTIFY_DISCORD_VERSION=//p" | tr -d '"')"
-    if [[ "$NOTIFY_DISCORD_VERSION" != "$LatestNotifyRelease" ]] ; then
-        printf -v NotifyUpdate "\n\nnotify_discord.sh update avialable:\n $NOTIFY_DISCORD_VERSION -> $LatestNotifyRelease\n"
-        MessageBody="${MessageBody}${NotifyUpdate}"
-    fi
-
-    trigger_notification
 }

notify_templates/notify_generic.sh

@@ -1,44 +1,9 @@
 ### DISCLAIMER: This is a third party addition to dockcheck - best effort testing.
-NOTIFY_GENERIC_VERSION="v0.1"
+NOTIFY_GENERIC_VERSION="v0.2"
 #
-# Copy/rename this file to notify.sh to enable the notification snippet.
 # generic sample, the "Hello World" of notification addons
 
-FromHost=$(hostname)
+trigger_generic_notification()  {
-
-trigger_notification()  {
-    # Modify to fit your setup:
     printf "\n$MessageTitle\n"
     printf "\n$MessageBody\n"
-}
+}
-
-send_notification() {
-    [ -s "$ScriptWorkDir"/urls.list ] && releasenotes || Updates=("$@")
-    UpdToString=$( printf '%s\\n' "${Updates[@]}" )
-
-    # platform specific notification code would go here
-    printf "\n%bGeneric notification addon:%b" "$c_green" "$c_reset"
-    MessageTitle="$FromHost - updates available."
-    printf -v MessageBody "🐋 Containers on $FromHost with updates available:\n$UpdToString"
-
-    trigger_notification
-}
-
-### Rename (eg. disabled_dockcheck_notification), remove or comment out the following function
-### to not send notifications when dockcheck itself has updates.
-dockcheck_notification() {
-    printf "\nGeneric dockcheck notification\n"
-
-    MessageTitle="$FromHost - New version of dockcheck available."
-    # Setting the MessageBody variable here.
-    printf -v MessageBody "Installed version: $1 \nLatest version: $2 \n\nChangenotes: $3"
-
-    RawNotifyUrl="https://raw.githubusercontent.com/mag37/dockcheck/main/notify_templates/notify_generic.sh"
-    LatestNotifyRelease="$(curl -s -r 0-150 $RawNotifyUrl | sed -n "/NOTIFY_GENERIC_VERSION/s/NOTIFY_GENERIC_VERSION=//p" | tr -d '"')"
-    if [[ "$NOTIFY_GENERIC_VERSION" != "$LatestNotifyRelease" ]] ; then
-        printf -v NotifyUpdate "\n\nnotify_generic.sh update avialable:\n $NOTIFY_GENERIC_VERSION -> $LatestNotifyRelease\n"
-        MessageBody="${MessageBody}${NotifyUpdate}"
-    fi
-
-    trigger_notification
-}

notify_templates/notify_gotify.sh

@@ -1,53 +1,36 @@
 ### DISCLAIMER: This is a third party addition to dockcheck - best effort testing.
-NOTIFY_GOTIFY_VERSION="v0.1"
+NOTIFY_GOTIFY_VERSION="v0.4"
 #
-# Copy/rename this file to notify.sh to enable the notification snippet.
 # Required receiving services must already be set up.
-# Modify to fit your setup - set GotifyUrl and GotifyToken.
+# Leave (or place) this file in the "notify_templates" subdirectory within the same directory as the main dockcheck.sh script.
+# If you instead wish make your own modifications, make a copy in the same directory as the main dockcheck.sh script.
+# Do not modify this file directly within the "notify_templates" subdirectory. Set GOTIFY_TOKEN and GOTIFY_DOMAIN in your dockcheck.config file.
 
-FromHost=$(hostname)
+if [[ -z "${GOTIFY_TOKEN:-}" ]] || [[ -z "${GOTIFY_DOMAIN:-}" ]]; then
+  printf "Gotify notification channel enabled, but required configuration variables are missing. Gotify notifications will not be sent.\n"
 
-trigger_notification() {
+  remove_channel gotify
-    # Modify to fit your setup:
+fi
-    GotifyToken="Your Gotify token here"
-    GotifyUrl="https://api.gotify/message?token=${GotifyToken}"
 
-    curl \
+trigger_gotify_notification() {
-        -F "title=${MessageTitle}" \
+  GotifyToken="${GOTIFY_TOKEN}" # e.g. GOTIFY_TOKEN=token-value
-        -F "message=${MessageBody}" \
+  GotifyUrl="${GOTIFY_DOMAIN}/message?token=${GotifyToken}" # e.g. GOTIFY_URL=https://gotify.domain.tld
-        -F "priority=5" \
+
-        -X POST "${GotifyUrl}" 1> /dev/null
+  if [[ "$PrintMarkdownURL" == true ]]; then
-}
+      ContentType="text/markdown"
-
+  else
-send_notification() {
+      ContentType="text/plain"
-    [ -s "$ScriptWorkDir"/urls.list ] && releasenotes || Updates=("$@")
+  fi
-    UpdToString=$( printf '%s\\n' "${Updates[@]}" )
+
-
+  JsonData=$( "$jqbin" -n \
-    # platform specific notification code would go here
+                --arg body "$MessageBody" \
-    printf "\nSending Gotify notification\n"
+                --arg title "$MessageTitle" \
-
+                --arg type "$ContentType" \
-    # Setting the MessageTitle and MessageBody variable here.
+                '{message: $body, title: $title, priority: 5, extras: {"client::display": {"contentType": $type}}}' )
-    MessageTitle="${FromHost} - updates available."
+
-    printf -v MessageBody "Containers on $FromHost with updates available:\n$UpdToString"
+  curl -S -o /dev/null ${CurlArgs} --data "${JsonData}" -H 'Content-Type: application/json' -X POST "${GotifyUrl}" 1> /dev/null
-
+
-    trigger_notification
+  if [[ $? -gt 0 ]]; then
-}
+    NotifyError=true
-
+  fi
-### Rename (eg. disabled_dockcheck_notification), remove or comment out the following function
-### to not send notifications when dockcheck itself has updates.
-dockcheck_notification() {
-    printf "\nSending Gotify dockcheck notification\n"
-
-    MessageTitle="$FromHost - New version of dockcheck available."
-    # Setting the MessageBody variable here.
-    printf -v MessageBody "Installed version: $1 \nLatest version: $2 \n\nChangenotes: $3"
-
-    RawNotifyUrl="https://raw.githubusercontent.com/mag37/dockcheck/main/notify_templates/notify_gotify.sh"
-    LatestNotifyRelease="$(curl -s -r 0-150 $RawNotifyUrl | sed -n "/NOTIFY_GOTIFY_VERSION/s/NOTIFY_GOTIFY_VERSION=//p" | tr -d '"')"
-    if [[ "$NOTIFY_GOTIFY_VERSION" != "$LatestNotifyRelease" ]] ; then
-        printf -v NotifyUpdate "\n\nnotify_gotify.sh update avialable:\n $NOTIFY_GOTIFY_VERSION -> $LatestNotifyRelease\n"
-        MessageBody="${MessageBody}${NotifyUpdate}"
-    fi
-
-    trigger_notification
 }

notify_templates/notify_matrix.sh

@@ -1,51 +1,27 @@
 ### DISCLAIMER: This is a third party addition to dockcheck - best effort testing.
-NOTIFY_MATRIX_VERSION="v0.1"
+NOTIFY_MATRIX_VERSION="v0.3"
 #
-# Copy/rename this file to notify.sh to enable the notification snippet.
 # Required receiving services must already be set up.
-# Modify to fit your setup - set MatrixServer, Room_id and AccessToken
+# Leave (or place) this file in the "notify_templates" subdirectory within the same directory as the main dockcheck.sh script.
+# If you instead wish make your own modifications, make a copy in the same directory as the main dockcheck.sh script.
+# Do not modify this file directly within the "notify_templates" subdirectory. Set MATRIX_ACCESS_TOKEN, MATRIX_ROOM_ID, and MATRIX_SERVER_URL in your dockcheck.config file.
 
-FromHost=$(hostname)
+if [[ -z "${MATRIX_ACCESS_TOKEN:-}" ]] || [[ -z "${MATRIX_ROOM_ID}:-" ]] || [[ -z "${MATRIX_SERVER_URL}:-" ]]; then
+  printf "Matrix notification channel enabled, but required configuration variables are missing. Matrix notifications will not be sent.\n"
 
-trigger_notification() {
+  remove_channel matrix
-    # Modify to fit your setup:
+fi
-    AccessToken="Your Matrix token here"
-    Room_id="Enter Room_id here"
-    MatrixServer="Enter Your HomeServer URL"
-    MsgBody="{\"msgtype\":\"m.text\",\"body\":\"$MessageBody\"}"
 
-    # URL Example:  https://matrix.org/_matrix/client/r0/rooms/!xxxxxx:example.com/send/m.room.message?access_token=xxxxxxxx
+trigger_matrix_notification() {
-    curl -sS -o /dev/null --fail -X POST "$MatrixServer/_matrix/client/r0/rooms/$Room_id/send/m.room.message?access_token=$AccessToken" -H 'Content-Type: application/json' -d "$MsgBody"
+  AccessToken="${MATRIX_ACCESS_TOKEN}" # e.g. MATRIX_ACCESS_TOKEN=token-value
-}
+  Room_id="${MATRIX_ROOM_ID}" # e.g. MATRIX_ROOM_ID=myroom
+  MatrixServer="${MATRIX_SERVER_URL}" # e.g. MATRIX_SERVER_URL=http://matrix.yourdomain.tld
+  MsgBody="{\"msgtype\":\"m.text\",\"body\":\"$MessageBody\"}"
 
-send_notification() {
+  # URL Example:  https://matrix.org/_matrix/client/r0/rooms/!xxxxxx:example.com/send/m.room.message?access_token=xxxxxxxx
-    [ -s "$ScriptWorkDir"/urls.list ] && releasenotes || Updates=("$@")
+  curl -S -o /dev/null ${CurlArgs} -X POST "$MatrixServer/_matrix/client/r0/rooms/$Room_id/send/m.room.message?access_token=$AccessToken" -H 'Content-Type: application/json' -d "$MsgBody"
-    UpdToString=$( printf '%s\\n' "${Updates[@]}" )
 
-    # platform specific notification code would go here
+  if [[ $? -gt 0 ]]; then
-    printf "\nSending Matrix notification\n"
+    NotifyError=true
-
+  fi
-    # Setting the MessageBody variable here.
+}
-    MessageBody="🐋 Containers on $FromHost with updates available: \n$UpdToString"
-
-    trigger_notification
-}
-
-### Rename (eg. disabled_dockcheck_notification), remove or comment out the following function
-### to not send notifications when dockcheck itself has updates.
-dockcheck_notification() {
-    printf "\nSending Matrix dockcheck notification\n"
-
-    MessageTitle="$FromHost - New version of dockcheck available."
-    # Setting the MessageBody variable here.
-    printf -v MessageBody "Installed version: $1 \nLatest version: $2 \n\nChangenotes: $3"
-
-    RawNotifyUrl="https://raw.githubusercontent.com/mag37/dockcheck/main/notify_templates/notify_matrix.sh"
-    LatestNotifyRelease="$(curl -s -r 0-150 $RawNotifyUrl | sed -n "/NOTIFY_MATRIX_VERSION/s/NOTIFY_MATRIX_VERSION=//p" | tr -d '"')"
-    if [[ "$NOTIFY_MATRIX_VERSION" != "$LatestNotifyRelease" ]] ; then
-        printf -v NotifyUpdate "\n\nnotify_matrix.sh update avialable:\n $NOTIFY_MATRIX_VERSION -> $LatestNotifyRelease\n"
-        MessageBody="${MessageBody}${NotifyUpdate}"
-    fi
-
-    trigger_notification
-}

notify_templates/notify_ntfy-sh.sh

@@ -1,50 +0,0 @@
-### DISCLAIMER: This is a third party addition to dockcheck - best effort testing.
-NOTIFY_NTFYSH_VERSION="v0.1"
-#
-# Copy/rename this file to notify.sh to enable the notification snippet.
-# Setup app and subscription at https://ntfy.sh
-# Use your unique Topic Name in the URL below.
-
-FromHost=$(hostname)
-
-trigger_notification() {
-    # Modify to fit your setup:
-    NtfyUrl="ntfy.sh/YourUniqueTopicName"
-
-    curl -sS -o /dev/null --show-error --fail \
-      -H "Title: $MessageTitle" \
-      -d "$MessageBody" \
-      $NtfyUrl
-}
-
-send_notification() {
-    [ -s "$ScriptWorkDir"/urls.list ] && releasenotes || Updates=("$@")
-    UpdToString=$( printf '%s\\n' "${Updates[@]}" )
-
-    printf "\nSending ntfy.sh notification\n"
-
-    MessageTitle="$FromHost - updates available."
-    # Setting the MessageBody variable here.
-    printf -v MessageBody "🐋 Containers on $FromHost with updates available:\n$UpdToString"
-
-    trigger_notification
-}
-
-### Rename (eg. disabled_dockcheck_notification), remove or comment out the following function
-### to not send notifications when dockcheck itself has updates.
-dockcheck_notification() {
-    printf "\nSending ntfy.sh dockcheck notification\n"
-
-    MessageTitle="$FromHost - New version of dockcheck available."
-    # Setting the MessageBody variable here.
-    printf -v MessageBody "Installed version: $1 \nLatest version: $2 \n\nChangenotes: $3"
-
-    RawNotifyUrl="https://raw.githubusercontent.com/mag37/dockcheck/main/notify_templates/notify_ntfy-sh.sh"
-    LatestNotifyRelease="$(curl -s -r 0-150 $RawNotifyUrl | sed -n "/NOTIFY_NTFYSH_VERSION/s/NOTIFY_NTFYSH_VERSION=//p" | tr -d '"')"
-    if [[ "$NOTIFY_NTFYSH_VERSION" != "$LatestNotifyRelease" ]] ; then
-        printf -v NotifyUpdate "\n\nnotify_ntfy-sh.sh update avialable:\n $NOTIFY_NTFYSH_VERSION -> $LatestNotifyRelease\n"
-        MessageBody="${MessageBody}${NotifyUpdate}"
-    fi
-
-    trigger_notification
-}

notify_templates/notify_ntfy.sh

@@ -0,0 +1,36 @@
+### DISCLAIMER: This is a third party addition to dockcheck - best effort testing.
+NOTIFY_NTFYSH_VERSION="v0.5"
+#
+# Setup app and subscription at https://ntfy.sh
+# Leave (or place) this file in the "notify_templates" subdirectory within the same directory as the main dockcheck.sh script.
+# If you instead wish make your own modifications, make a copy in the same directory as the main dockcheck.sh script.
+# Do not modify this file directly within the "notify_templates" subdirectory. Set NTFY_DOMAIN and NTFY_TOPIC_NAME in your dockcheck.config file.
+
+if [[ -z "${NTFY_DOMAIN:-}" ]] || [[ -z "${NTFY_TOPIC_NAME:-}" ]]; then
+  printf "Ntfy notification channel enabled, but required configuration variables are missing. Ntfy notifications will not be sent.\n"
+
+  remove_channel ntfy
+fi
+
+trigger_ntfy_notification() {
+  NtfyUrl="${NTFY_DOMAIN}/${NTFY_TOPIC_NAME}"
+  # e.g.
+  # NTFY_DOMAIN=ntfy.sh
+  # NTFY_TOPIC_NAME=YourUniqueTopicName
+
+  if [[ "$PrintMarkdownURL" == true ]]; then
+      ContentType="Markdown: yes"
+  else
+      ContentType="Markdown: no" #text/plain
+  fi
+
+  curl -S -o /dev/null ${CurlArgs} \
+    -H "Title: $MessageTitle" \
+    -H "$ContentType"      \
+    -d "$MessageBody" \
+    "$NtfyUrl"
+
+  if [[ $? -gt 0 ]]; then
+    NotifyError=true
+  fi
+}

notify_templates/notify_pushbullet.sh

@@ -1,51 +1,26 @@
 ### DISCLAIMER: This is a third party addition to dockcheck - best effort testing.
-NOTIFY_PUSHBULLET_VERSION="v0.1"
+NOTIFY_PUSHBULLET_VERSION="v0.3"
 #
-# Copy/rename this file to notify.sh to enable the notification snippet.
 # Required receiving services must already be set up.
 # Requires jq installed and in PATH.
-# Modify to fit your setup - set Url and Token.
+# Leave (or place) this file in the "notify_templates" subdirectory within the same directory as the main dockcheck.sh script.
+# If you instead wish make your own modifications, make a copy in the same directory as the main dockcheck.sh script.
+# Do not modify this file directly within the "notify_templates" subdirectory. Set PUSHBULLET_TOKEN and PUSHBULLET_URL in your dockcheck.config file.
 
-FromHost=$(hostname)
+if [[ -z "${PUSHBULLET_URL:-}" ]] || [[ -z "${PUSHBULLET_TOKEN:-}" ]]; then
+  printf "Pushbullet notification channel enabled, but required configuration variables are missing. Pushbullet notifications will not be sent.\n"
 
-trigger_notification() {
+  remove_channel pushbullet
-    # Modify to fit your setup:
+fi
-    PushUrl="https://api.pushbullet.com/v2/pushes"
-    PushToken="Your Pushbullet token here"
 
-    # Requires jq to process json data
+trigger_pushbullet_notification() {
-    jq -n --arg title "$MessageTitle" --arg body "$MessageBody" '{body: $body, title: $title, type: "note"}' | curl -sS -o /dev/null --show-error --fail -X POST -H "Access-Token: $PushToken" -H "Content-type: application/json" $PushUrl -d @-
+  PushUrl="${PUSHBULLET_URL}" # e.g. PUSHBULLET_URL=https://api.pushbullet.com/v2/pushes
-}
+  PushToken="${PUSHBULLET_TOKEN}" # e.g. PUSHBULLET_TOKEN=token-value
-
+
-send_notification() {
+  # Requires jq to process json data
-    [ -s "$ScriptWorkDir"/urls.list ] && releasenotes || Updates=("$@")
+  "$jqbin" -n --arg title "$MessageTitle" --arg body "$MessageBody" '{body: $body, title: $title, type: "note"}' | curl -S -o /dev/null ${CurlArgs} -X POST -H "Access-Token: $PushToken" -H "Content-type: application/json" $PushUrl -d @-
-    UpdToString=$( printf '%s\\n' "${Updates[@]}" )
+
-
+  if [[ $? -gt 0 ]]; then
-    # platform specific notification code would go here
+    NotifyError=true
-    printf "\nSending pushbullet notification\n"
+  fi
-
-    MessageTitle="$FromHost - updates available."
-    # Setting the MessageBody variable here.
-    printf -v MessageBody "🐋 Containers on $FromHost with updates available:\n$UpdToString"
-
-    trigger_notification
-}
-
-### Rename (eg. disabled_dockcheck_notification), remove or comment out the following function
-### to not send notifications when dockcheck itself has updates.
-dockcheck_notification() {
-    printf "\nSending pushbullet dockcheck notification\n"
-
-    MessageTitle="$FromHost - New version of dockcheck available."
-    # Setting the MessageBody variable here.
-    printf -v MessageBody "Installed version: $1 \nLatest version: $2 \n\nChangenotes: $3"
-
-    RawNotifyUrl="https://raw.githubusercontent.com/mag37/dockcheck/main/notify_templates/notify_pushbullet.sh"
-    LatestNotifyRelease="$(curl -s -r 0-150 $RawNotifyUrl | sed -n "/NOTIFY_PUSHBULLET_VERSION/s/NOTIFY_PUSHBULLET_VERSION=//p" | tr -d '"')"
-    if [[ "$NOTIFY_PUSHBULLET_VERSION" != "$LatestNotifyRelease" ]] ; then
-        printf -v NotifyUpdate "\n\nnotify_pushbullet.sh update avialable:\n $NOTIFY_PUSHBULLET_VERSION -> $LatestNotifyRelease\n"
-        MessageBody="${MessageBody}${NotifyUpdate}"
-    fi
-
-    trigger_notification
 }

notify_templates/notify_pushover.sh

@@ -1,57 +1,32 @@
 ### DISCLAIMER: This is a third party addition to dockcheck - best effort testing.
-NOTIFY_PUSHOVER_VERSION="v0.1"
+NOTIFY_PUSHOVER_VERSION="v0.3"
 #
-# Copy/rename this file to notify.sh to enable the notification snippet.
 # Required receiving services must already be set up.
 # Requires jq installed and in PATH.
-# Modify to fit your setup - set Url and Token.
+# Leave (or place) this file in the "notify_templates" subdirectory within the same directory as the main dockcheck.sh script.
+# If you instead wish make your own modifications, make a copy in the same directory as the main dockcheck.sh script.
+# Do not modify this file directly within the "notify_templates" subdirectory. Set PUSHOVER_USER_KEY, PUSHOVER_TOKEN, and PUSHOVER_URL in your dockcheck.config file.
 
-FromHost=$(hostname)
+if [[ -z "${PUSHOVER_URL:-}" ]] || [[ -z "${PUSHOVER_USER_KEY:-}" ]] || [[ -z "${PUSHOVER_TOKEN:-}" ]]; then
+  printf "Pushover notification channel enabled, but required configuration variables are missing. Pushover notifications will not be sent.\n"
 
-trigger_notification() {
+  remove_channel pushover
-    # Modify to fit your setup:
+fi
-    PushoverUrl="https://api.pushover.net/1/messages.json"
-    PushoverUserKey="Your Pushover User Key Here"
-    PushoverToken="Your Pushover API Token Here"
 
-    # Sending the notification via Pushover
+trigger_pushover_notification() {
-    curl -sS -o /dev/null --show-error --fail -X POST \
+  PushoverUrl="${PUSHOVER_URL}" # e.g. PUSHOVER_URL=https://api.pushover.net/1/messages.json
-        -F "token=$PushoverToken" \
+  PushoverUserKey="${PUSHOVER_USER_KEY}" # e.g. PUSHOVER_USER_KEY=userkey
-        -F "user=$PushoverUserKey" \
+  PushoverToken="${PUSHOVER_TOKEN}" # e.g. PUSHOVER_TOKEN=token-value
-        -F "title=$MessageTitle" \
-        -F "message=$MessageBody" \
-        $PushoverUrl
-}
 
-send_notification() {
+  # Sending the notification via Pushover
-    [ -s "$ScriptWorkDir"/urls.list ] && releasenotes || Updates=("$@")
+  curl -S -o /dev/null ${CurlArgs} -X POST \
-    UpdToString=$( printf '%s\\n' "${Updates[@]}" )
+      -F "token=$PushoverToken" \
+      -F "user=$PushoverUserKey" \
+      -F "title=$MessageTitle" \
+      -F "message=$MessageBody" \
+      $PushoverUrl
 
-    # platform specific notification code would go here
+  if [[ $? -gt 0 ]]; then
-    printf "\nSending pushover notification\n"
+    NotifyError=true
-
+  fi
-    MessageTitle="$FromHost - updates available."
+}
-    # Setting the MessageBody variable here.
-    printf -v MessageBody "🐋 Containers on $FromHost with updates available:\n$UpdToString"
-
-    trigger_notification
-}
-
-### Rename (eg. disabled_dockcheck_notification), remove or comment out the following function
-### to not send notifications when dockcheck itself has updates.
-dockcheck_notification() {
-    printf "\nSending pushover dockcheck notification\n"
-
-    MessageTitle="$FromHost - New version of dockcheck available."
-    # Setting the MessageBody variable here.
-    printf -v MessageBody "Installed version: $1 \nLatest version: $2 \n\nChangenotes: $3"
-
-    RawNotifyUrl="https://raw.githubusercontent.com/mag37/dockcheck/main/notify_templates/notify_pushover.sh"
-    LatestNotifyRelease="$(curl -s -r 0-150 $RawNotifyUrl | sed -n "/NOTIFY_PUSHOVER_VERSION/s/NOTIFY_PUSHOVER_VERSION=//p" | tr -d '"')"
-    if [[ "$NOTIFY_PUSHOVER_VERSION" != "$LatestNotifyRelease" ]] ; then
-        printf -v NotifyUpdate "\n\nnotify_pushover.sh update avialable:\n $NOTIFY_PUSHOVER_VERSION -> $LatestNotifyRelease\n"
-        MessageBody="${MessageBody}${NotifyUpdate}"
-    fi
-
-    trigger_notification
-}

notify_templates/notify_slack.sh

@@ -0,0 +1,28 @@
+### DISCLAIMER: This is a third party addition to dockcheck - best effort testing.
+NOTIFY_SLACK_VERSION="v0.3"
+#
+# Setup app and token at https://api.slack.com/tutorials/tracks/posting-messages-with-curl
+# Leave (or place) this file in the "notify_templates" subdirectory within the same directory as the main dockcheck.sh script.
+# If you instead wish make your own modifications, make a copy in the same directory as the main dockcheck.sh script.
+# Do not modify this file directly within the "notify_templates" subdirectory. Set SLACK_ACCESS_TOKEN, and SLACK_CHANNEL_ID in your dockcheck.config file.
+
+if [[ -z "${SLACK_ACCESS_TOKEN:-}" ]] || [[ -z "${SLACK_CHANNEL_ID:-}" ]]; then
+  printf "Slack notification channel enabled, but required configuration variables are missing. Slack notifications will not be sent.\n"
+
+  remove_channel slack
+fi
+
+trigger_slack_notification() {
+  AccessToken="${SLACK_ACCESS_TOKEN}" # e.g. SLACK_ACCESS_TOKEN=some-token
+  ChannelID="${SLACK_CHANNEL_ID}" # e.g. CHANNEL_ID=mychannel
+  SlackUrl="https://slack.com/api/chat.postMessage"
+
+  curl -S -o /dev/null ${CurlArgs} \
+    -d "text=$MessageBody" -d "channel=$ChannelID" \
+    -H "Authorization: Bearer $AccessToken" \
+    -X POST $SlackUrl
+
+  if [[ $? -gt 0 ]]; then
+    NotifyError=true
+  fi
+}

notify_templates/notify_smtp.sh

@@ -1,10 +1,17 @@
 ### DISCLAIMER: This is a third party addition to dockcheck - best effort testing.
-NOTIFY_SMTP_VERSION="v0.1"
+NOTIFY_SMTP_VERSION="v0.3"
 # INFO: ssmtp is depcerated - consider to use msmtp instead.
 #
-# Copy/rename this file to notify.sh to enable the notification snipppet.
 # mSMTP/sSMTP has to be installed and configured manually.
-# Modify to fit your setup - changing SendMailFrom, SendMailTo, SubjectTag
+# Leave (or place) this file in the "notify_templates" subdirectory within the same directory as the main dockcheck.sh script.
+# If you instead wish make your own modifications, make a copy in the same directory as the main dockcheck.sh script.
+# Do not modify this file directly within the "notify_templates" subdirectory. Set SMTP_MAIL_FROM, SMTP_MAIL_TO, and SMTP_SUBJECT_TAG in your dockcheck.config file.
+
+if [[ -z "${SMTP_MAIL_FROM:-}" ]] || [[ -z "${SMTP_MAIL_TO:-}" ]] || [[ -z "${SMTP_SUBJECT_TAG:-}" ]]; then
+  printf "SMTP notification channel enabled, but required configuration variables are missing. SMTP notifications will not be sent.\n"
+
+  remove_channel smtp
+fi
 
 MSMTP=$(which msmtp)
 SSMTP=$(which ssmtp)
@@ -17,13 +24,10 @@ else
 	echo "No msmtp or ssmtp binary found in PATH: $PATH" ; exit 1
 fi
 
-FromHost=$(hostname)
+trigger_smtp_notification() {
-
+SendMailFrom="${SMTP_MAIL_FROM}" # e.g. MAIL_FROM=me@mydomain.tld
-trigger_notification() {
+SendMailTo="${SMTP_MAIL_TO}" # e.g. MAIL_TO=me@mydomain.tld
-# User variables:
+SubjectTag="${SMTP_SUBJECT_TAG}" # e.g. SUBJECT_TAG=dockcheck
-SendMailFrom="me@mydomain.tld"
-SendMailTo="me@mydomain.tld"
-SubjectTag="dockcheck"
 
 $MailPkg $SendMailTo << __EOF
 From: "$FromHost" <$SendMailFrom>
@@ -36,36 +40,8 @@ Content-Transfer-Encoding: 7bit
 $MessageBody
 
 __EOF
-}
+
-
+if [[ $? -gt 0 ]]; then
-send_notification() {
+  NotifyError=true
-		[ -s "$ScriptWorkDir"/urls.list ] && releasenotes || Updates=("$@")
+fi
-		UpdToString=$( printf '%s\\n' "${Updates[@]}" )
-
-		printf "\nSending email notification.\n"
-
-		MessageTitle="Updates available on"
-		# Setting the MessageBody variable here.
-		printf -v MessageBody "🐋 Containers on $FromHost with updates available:\n\n$UpdToString"
-
-		trigger_notification
-}
-
-### Rename (eg. disabled_dockcheck_notification), remove or comment out the following function
-### to not send notifications when dockcheck itself has updates.
-dockcheck_notification() {
-		printf "\nSending email dockcheck notification.\n"
-
-		MessageTitle="New version of dockcheck available on"
-		# Setting the MessageBody variable here.
-		printf -v MessageBody "Installed version: $1 \nLatest version: $2 \n\nChangenotes: $3"
-
-    RawNotifyUrl="https://raw.githubusercontent.com/mag37/dockcheck/main/notify_templates/notify_smtp.sh"
-    LatestNotifyRelease="$(curl -s -r 0-150 $RawNotifyUrl | sed -n "/NOTIFY_SMTP_VERSION/s/NOTIFY_SMTP_VERSION=//p" | tr -d '"')"
-    if [[ "$NOTIFY_SMTP_VERSION" != "$LatestNotifyRelease" ]] ; then
-        printf -v NotifyUpdate "\n\nnotify_smtp.sh update avialable:\n $NOTIFY_SMTP_VERSION -> $LatestNotifyRelease\n"
-        MessageBody="${MessageBody}${NotifyUpdate}"
-    fi
-
-		trigger_notification
 }

notify_templates/notify_telegram.sh

@@ -1,51 +1,39 @@
 ### DISCLAIMER: This is a third party addition to dockcheck - best effort testing.
-NOTIFY_TELEGRAM_VERSION="v0.1"
+NOTIFY_TELEGRAM_VERSION="v0.4"
 #
-# Copy/rename this file to notify.sh to enable the notification snippet.
 # Required receiving services must already be set up.
-# Modify to fit your setup - set TelegramChatId and TelegramToken.
+# Leave (or place) this file in the "notify_templates" subdirectory within the same directory as the main dockcheck.sh script.
+# If you instead wish make your own modifications, make a copy in the same directory as the main dockcheck.sh script.
+# Do not modify this file directly within the "notify_templates" subdirectory. Set TELEGRAM_CHAT_ID and TELEGRAM_TOKEN in your dockcheck.config file.
 
-FromHost=$(hostname)
+if [[ -z "${TELEGRAM_CHAT_ID:-}" ]] || [[ -z "${TELEGRAM_TOKEN:-}" ]]; then
+  printf "Telegram notification channel enabled, but required configuration variables are missing. Telegram notifications will not be sent.\n"
 
-trigger_notification() {
+  remove_channel telegram
-    # Modify to fit your setup:
+fi
-    TelegramToken="Your Telegram token here"
-    TelegramChatId="Your Telegram ChatId here"
-    TelegramUrl="https://api.telegram.org/bot$TelegramToken"
-    TelegramTopicID=12345678 ## Set to 0 if not using specific topic within chat
-    TelegramData="{\"chat_id\":\"$TelegramChatId\",\"text\":\"$MessageBody\",\"message_thread_id\":\"$TelegramTopicID\",\"disable_notification\": false}"
 
-    curl -sS -o /dev/null --fail -X POST "$TelegramUrl/sendMessage" -H 'Content-Type: application/json' -d "$TelegramData"
+trigger_telegram_notification() {
-}
+  if [[ "$PrintMarkdownURL" == true ]]; then
-
+      ParseMode="Markdown"
-send_notification() {
+  else
-    [ -s "$ScriptWorkDir"/urls.list ] && releasenotes || Updates=("$@")
+      ParseMode="HTML"
-    UpdToString=$( printf '%s\\n' "${Updates[@]}" )
+  fi
-
+
-    # platform specific notification code would go here
+  TelegramToken="${TELEGRAM_TOKEN}" # e.g. TELEGRAM_TOKEN=token-value
-    printf "\nSending Telegram notification\n"
+  TelegramChatId="${TELEGRAM_CHAT_ID}" # e.g. TELEGRAM_CHAT_ID=mychatid
-
+  TelegramUrl="https://api.telegram.org/bot$TelegramToken"
-    # Setting the MessageBody variable here.
+  TelegramTopicID=${TELEGRAM_TOPIC_ID:="0"}
-    MessageBody="🐋 Containers on $FromHost with updates available: \n$UpdToString"
+
-
+  JsonData=$( "$jqbin" -n \
-    trigger_notification
+              --arg chatid "$TelegramChatId" \
-}
+              --arg text "$MessageBody" \
-
+              --arg thread "$TelegramTopicID" \
-### Rename (eg. disabled_dockcheck_notification), remove or comment out the following function
+              --arg parse_mode "$ParseMode" \
-### to not send notifications when dockcheck itself has updates.
+              '{"chat_id": $chatid, "text": $text, "message_thread_id": $thread, "disable_notification": false, "parse_mode": $parse_mode, "disable_web_page_preview": true}' )
-dockcheck_notification() {
+
-    printf "\nSending Telegram dockcheck notification\n"
+  curl -S -o /dev/null ${CurlArgs} -X POST "$TelegramUrl/sendMessage" -H 'Content-Type: application/json' -d "$JsonData"
-
+
-    MessageTitle="$FromHost - New version of dockcheck available."
+  if [[ $? -gt 0 ]]; then
-    # Setting the MessageBody variable here.
+    NotifyError=true
-    printf -v MessageBody "$FromHost - New version of dockcheck available.\n\nInstalled version: $1 \nLatest version: $2 \n\nChangenotes: $3"
+  fi
-
-    RawNotifyUrl="https://raw.githubusercontent.com/mag37/dockcheck/main/notify_templates/notify_telegram.sh"
-    LatestNotifyRelease="$(curl -s -r 0-150 $RawNotifyUrl | sed -n "/NOTIFY_TELEGRAM_VERSION/s/NOTIFY_TELEGRAM_VERSION=//p" | tr -d '"')"
-    if [[ "$NOTIFY_TELEGRAM_VERSION" != "$LatestNotifyRelease" ]] ; then
-        printf -v NotifyUpdate "\n\nnotify_telegram.sh update avialable:\n $NOTIFY_TELEGRAM_VERSION -> $LatestNotifyRelease\n"
-        MessageBody="${MessageBody}${NotifyUpdate}"
-    fi
-
-    trigger_notification
 }

notify_templates/notify_v2.sh

@@ -0,0 +1,265 @@
+NOTIFY_V2_VERSION="v0.4"
+#
+# If migrating from an older notify template, remove your existing notify.sh file.
+# Leave (or place) this file in the "notify_templates" subdirectory within the same directory as the main dockcheck.sh script.
+# If you instead wish make your own modifications, make a copy in the same directory as the main dockcheck.sh script and rename to notify.sh.
+# Enable and configure all required notification variables in your dockcheck.config file, e.g.:
+# NOTIFY_CHANNELS=apprise gotify slack
+# SLACK_TOKEN=xoxb-some-token-value
+# GOTIFY_TOKEN=some.token
+
+# Number of seconds to snooze identical update notifications based on local image name
+# or dockcheck.sh/notify.sh template file updates.
+# Actual snooze will be 60 seconds less to avoid the chance of missed notifications due to minor scheduling or script run time issues.
+snooze="${SNOOZE_SECONDS:-}"
+SnoozeFile="${ScriptWorkDir}/snooze.list"
+
+enabled_notify_channels=( ${NOTIFY_CHANNELS:-} )
+
+FromHost=$(cat /etc/hostname)
+
+CurrentEpochTime=$(date +"%Y-%m-%dT%H:%M:%S")
+CurrentEpochSeconds=$(date +%s)
+
+NotifyError=false
+
+remove_channel() {
+  local temp_array=()
+  for channel in "${enabled_notify_channels[@]}"; do
+    [[ "${channel}" != "$1" ]] && temp_array+=("${channel}")
+  done
+  enabled_notify_channels=( "${temp_array[@]}" )
+}
+
+for channel in "${enabled_notify_channels[@]}"; do
+  source_if_exists_or_fail "${ScriptWorkDir}/notify_${channel}.sh" || \
+  source_if_exists_or_fail "${ScriptWorkDir}/notify_templates/notify_${channel}.sh" || \
+  printf "The notification channel ${channel} is enabled, but notify_${channel}.sh was not found. Check the ${ScriptWorkDir} directory or the notify_templates subdirectory.\n"
+done
+
+notify_containers_count() {
+  unset NotifyContainers
+  NotifyContainers=()
+
+  [[ ! -f "${SnoozeFile}" ]] && touch "${SnoozeFile}"
+
+  for update in "$@"
+  do
+    read -a container <<< "${update}"
+    found=$(grep -w "${container[0]}" "${SnoozeFile}" || printf "")
+
+    if [[ -n "${found}" ]]; then
+      read -a arr <<< "${found}"
+      CheckEpochSeconds=$(( $(date -d "${arr[1]}" +%s 2>/dev/null) + ${snooze} - 60 )) || CheckEpochSeconds=$(( $(date -f "%Y-%m-%d" -j "${arr[1]}" +%s) + ${snooze} - 60 ))
+      if [[ "${CurrentEpochSeconds}" -gt "${CheckEpochSeconds}" ]]; then
+        NotifyContainers+=("${update}")
+      fi
+    else
+      NotifyContainers+=("${update}")
+    fi
+  done
+
+  printf "${#NotifyContainers[@]}"
+}
+
+update_snooze() {
+
+  [[ ! -f "${SnoozeFile}" ]] && touch "${SnoozeFile}"
+
+  for arg in "$@"
+  do
+    read -a entry <<< "${arg}"
+    found=$(grep -w "${entry[0]}" "${SnoozeFile}" || printf "")
+
+    if [[ -n "${found}" ]]; then
+      sed -e "s/${entry[0]}.*/${entry[0]} ${CurrentEpochTime}/" "${SnoozeFile}" > "${SnoozeFile}.new"
+      mv "${SnoozeFile}.new" "${SnoozeFile}"
+    else
+      printf "${entry[0]} ${CurrentEpochTime}\n" >> "${SnoozeFile}"
+    fi
+  done
+}
+
+cleanup_snooze() {
+  unset NotifyEntries
+  NotifyEntries=()
+  switch=""
+
+  [[ ! -f "${SnoozeFile}" ]] && touch "${SnoozeFile}"
+
+  for arg in "$@"
+  do
+    read -a entry <<< "${arg}"
+    NotifyEntries+=("${entry[0]}")
+  done
+
+  if [[ ! "${NotifyEntries[@]}" == *".sh"* ]]; then
+    switch="-v"
+  fi
+
+  while read -r entry datestamp; do
+    if [[ ! "${NotifyEntries[@]}" == *"$entry"* ]]; then
+      sed -e "/${entry}/d" "${SnoozeFile}" > "${SnoozeFile}.new"
+      mv "${SnoozeFile}.new" "${SnoozeFile}"
+    fi
+  done <<< "$(grep ${switch} '\.sh ' ${SnoozeFile})"
+}
+
+send_notification() {
+  [[ -s "$ScriptWorkDir"/urls.list ]] && releasenotes || Updates=("$@")
+
+  if [[ -n "${snooze}" ]] && [[ -f "${SnoozeFile}" ]]; then
+    UpdNotifyCount=$(notify_containers_count "${Updates[@]}")
+  else
+    UpdNotifyCount="${#Updates[@]}"
+  fi
+
+  NotifyError=false
+
+  if [[ "${UpdNotifyCount}" -gt 0 ]]; then
+    UpdToString=$( printf '%s\\n' "${Updates[@]}" )
+    UpdToString=${UpdToString%\\n}
+
+    for channel in "${enabled_notify_channels[@]}"; do
+      printf "\nSending ${channel} notification\n"
+
+      # To be added in the MessageBody if "-d X" was used
+      # leading space is left intentionally for clean output
+      [[ -n "$DaysOld" ]] && msgdaysold="with images ${DaysOld}+ days old " || msgdaysold=""
+
+      MessageTitle="$FromHost - updates ${msgdaysold}available."
+      # Setting the MessageBody variable here.
+      printf -v MessageBody "🐋 Containers on $FromHost with updates available:\n${UpdToString}\n"
+
+      exec_if_exists_or_fail trigger_${channel}_notification || \
+      printf "Attempted to send notification to channel ${channel}, but the function was not found. Make sure notify_${channel}.sh is available in the ${ScriptWorkDir} directory or notify_templates subdirectory.\n"
+    done
+
+    [[ -n "${snooze}" ]] && [[ "${NotifyError}" == "false" ]] && update_snooze "${Updates[@]}"
+  fi
+
+  [[ -n "${snooze}" ]] && cleanup_snooze "${Updates[@]}"
+
+  return 0
+}
+
+### Set DISABLE_DOCKCHECK_NOTIFICATION=false in dockcheck.config
+### to not send notifications when dockcheck itself has updates.
+dockcheck_notification() {
+  if [[ ! "${DISABLE_DOCKCHECK_NOTIFICATION:-}" == "true" ]]; then
+    DockcheckNotify=false
+    NotifyError=false
+
+    if [[ -n "${snooze}" ]] && [[ -f "${SnoozeFile}" ]]; then
+      found=$(grep -w "dockcheck\.sh" "${SnoozeFile}" || printf "")
+      if [[ -n "${found}" ]]; then
+        read -a arr <<< "${found}"
+        CheckEpochSeconds=$(( $(date -d "${arr[1]}" +%s 2>/dev/null) + ${snooze} - 60 )) || CheckEpochSeconds=$(( $(date -f "%Y-%m-%d" -j "${arr[1]}" +%s) + ${snooze} - 60 ))
+        if [[ "${CurrentEpochSeconds}" -gt "${CheckEpochSeconds}" ]]; then
+          DockcheckNotify=true
+        fi
+      else
+        DockcheckNotify=true
+      fi
+    else
+      DockcheckNotify=true
+    fi
+
+    if [[ "${DockcheckNotify}" == "true" ]]; then
+      MessageTitle="$FromHost - New version of dockcheck available."
+      # Setting the MessageBody variable here.
+      printf -v MessageBody "Installed version: $1\nLatest version: $2\n\nChangenotes: $3\n"
+
+      if [[ ${#enabled_notify_channels[@]} -gt 0 ]]; then printf "\n"; fi
+      for channel in "${enabled_notify_channels[@]}"; do
+        printf "Sending dockcheck update notification - ${channel}\n"
+        exec_if_exists_or_fail trigger_${channel}_notification || \
+        printf "Attempted to send notification to channel ${channel}, but the function was not found. Make sure notify_${channel}.sh is available in the ${ScriptWorkDir} directory or notify_templates subdirectory.\n"
+      done
+
+      if [[ -n "${snooze}" ]] && [[ -f "${SnoozeFile}" ]]; then
+        if [[ "${NotifyError}" == "false" ]]; then
+          if [[ -n "${found}" ]]; then
+            sed -e "s/dockcheck\.sh.*/dockcheck\.sh ${CurrentEpochTime}/" "${SnoozeFile}" > "${SnoozeFile}.new"
+            mv "${SnoozeFile}.new" "${SnoozeFile}"
+          else
+            printf "dockcheck.sh ${CurrentEpochTime}\n" >> "${SnoozeFile}"
+          fi
+        fi
+      fi
+    fi
+  fi
+
+  return 0
+}
+
+### Set DISABLE_NOTIFY_NOTIFICATION=false in dockcheck.config
+### to not send notifications when notify scripts themselves have updates.
+notify_update_notification() {
+  if [[ ! "${DISABLE_NOTIFY_NOTIFICATION:-}" == "true" ]]; then
+    NotifyUpdateNotify=false
+    NotifyError=false
+    NotifyUpdates=()
+
+    UpdateChannels=( "${enabled_notify_channels[@]}" "v2" )
+
+    for NotifyScript in "${UpdateChannels[@]}"; do
+      UpperChannel=$(tr '[:lower:]' '[:upper:]' <<< "$NotifyScript")
+      VersionVar="NOTIFY_${UpperChannel}_VERSION"
+      if [[ -n "${!VersionVar:-}" ]]; then
+        RawNotifyUrl="https://raw.githubusercontent.com/mag37/dockcheck/main/notify_templates/notify_${NotifyScript}.sh"
+        LatestNotifySnippet="$(curl ${CurlArgs} -r 0-150 "$RawNotifyUrl" || printf "undefined")"
+        LatestNotifyRelease="$(echo "$LatestNotifySnippet" | sed -n "/${VersionVar}/s/${VersionVar}=//p" | tr -d '"')"
+        if [[ ! "${LatestNotifyRelease}" == "undefined" ]]; then
+          if [[ "${!VersionVar}" != "${LatestNotifyRelease}" ]] ; then
+            NotifyUpdates+=("${NotifyScript}.sh ${!VersionVar} -> ${LatestNotifyRelease}")
+          fi
+        fi
+      fi
+    done
+
+    if [[ -n "${snooze}" ]] && [[ -f "${SnoozeFile}" ]]; then
+      for update in "${NotifyUpdates[@]}"; do
+        read -a NotifyScript <<< "${update}"
+        found=$(grep -w "${NotifyScript}" "${SnoozeFile}" || printf "")
+        if [[ -n "${found}" ]]; then
+          read -a arr <<< "${found}"
+          CheckEpochSeconds=$(( $(date -d "${arr[1]}" +%s 2>/dev/null) + ${snooze} - 60 )) || CheckEpochSeconds=$(( $(date -f "%Y-%m-%d" -j "${arr[1]}" +%s) + ${snooze} - 60 ))
+          if [[ "${CurrentEpochSeconds}" -gt "${CheckEpochSeconds}" ]]; then
+            NotifyUpdateNotify=true
+          fi
+        else
+          NotifyUpdateNotify=true
+        fi
+      done
+    else
+      NotifyUpdateNotify=true
+    fi
+
+    if [[ "${NotifyUpdateNotify}" == "true" ]]; then
+      if [[ "${#NotifyUpdates[@]}" -gt 0 ]]; then
+        UpdToString=$( printf '%s\\n' "${NotifyUpdates[@]}" )
+        UpdToString=${UpdToString%\\n}
+        NotifyError=false
+
+        MessageTitle="$FromHost - New version of notify templates available."
+
+        printf -v MessageBody "Notify templates on $FromHost with updates available:\n${UpdToString}\n"
+
+        for channel in "${enabled_notify_channels[@]}"; do
+          printf "Sending notify template update notification - ${channel}\n"
+          exec_if_exists_or_fail trigger_${channel}_notification || \
+          printf "Attempted to send notification to channel ${channel}, but the function was not found. Make sure notify_${channel}.sh is available in the ${ScriptWorkDir} directory or notify_templates subdirectory.\n"
+        done
+
+        [[ -n "${snooze}" ]] && [[ "${NotifyError}" == "false" ]] && update_snooze "${NotifyUpdates[@]}"
+      fi
+    fi
+
+    UpdatesPlusDockcheck=("${NotifyUpdates[@]}")
+    UpdatesPlusDockcheck+=("dockcheck.sh")
+    [[ -n "${snooze}" ]] && cleanup_snooze "${UpdatesPlusDockcheck[@]}"
+  fi
+
+  return 0
+}

notify_templates/urls.list

@@ -1,35 +1,75 @@
-# This is a list of container names and releasenote urls, separated by space.
-# Modify, add and (if necessary) remove to fit your needs.
 # Additions are welcome! Append your list to the git-repo, use generic names and sensible urls.
+# Modify, add and (if necessary) remove to fit your needs.
+# This is a list of container names and releasenote urls, separated by space.
 
-apprise-api https://github.com/linuxserver/docker-apprise-api/releases
-homer https://github.com/bastienwirtz/homer/releases
-nginx https://github.com/docker-library/official-images/blob/master/library/nginx
-vaultwarden-server https://github.com/dani-garcia/vaultwarden/releases
-bruceforce-vaultwarden-backup https://github.com/Bruceforce/vaultwarden-backup/blob/main/CHANGELOG.md
 actual_server https://actualbudget.org/blog
-gotify https://github.com/gotify/server/releases
+apprise-api https://github.com/linuxserver/docker-apprise-api/releases
-traefik https://github.com/traefik/traefik/releases
-caddy https://github.com/caddyserver/caddy/releases
-
-calibre https://github.com/linuxserver/docker-calibre/releases
-calibre-web https://github.com/linuxserver/docker-calibre-web/releases
-readarr https://github.com/Readarr/Readarr/releases
 audiobookshelf https://github.com/advplyr/audiobookshelf/releases
-
-gluetun https://github.com/qdm12/gluetun/releases
 bazarr https://github.com/morpheus65535/bazarr/releases
 bazarr-ls https://github.com/linuxserver/docker-bazarr/releases
+beszel https://github.com/henrygd/beszel/releases
+bookstack https://github.com/BookStackApp/BookStack/releases
+bruceforce-vaultwarden-backup https://github.com/Bruceforce/vaultwarden-backup/blob/main/CHANGELOG.md
+caddy https://github.com/caddyserver/caddy/releases
+calibre https://github.com/linuxserver/docker-calibre/releases
+calibre-web https://github.com/linuxserver/docker-calibre-web/releases
+cleanuperr https://github.com/flmorg/cleanuperr/releases
+cross-seed https://github.com/cross-seed/cross-seed/releases
+cup https://github.com/sergi0g/cup/releases
+dockge https://github.com/louislam/dockge/releases
+dozzle https://github.com/amir20/dozzle/releases
+flatnotes https://github.com/dullage/flatnotes/releases
+forgejo https://codeberg.org/forgejo/forgejo/releases
+fressrss https://github.com/FreshRSS/FreshRSS/releases
+gluetun https://github.com/qdm12/gluetun/releases
+go2rtc https://github.com/AlexxIT/go2rtc/releases
+gotify https://github.com/gotify/server/releases
+hbbr https://github.com/rustdesk/rustdesk-server/releases
+hbbs https://github.com/rustdesk/rustdesk-server/releases
+homarr https://github.com/homarr-labs/homarr/releases
+home-assistant https://github.com/home-assistant/core/releases/
+homer https://github.com/bastienwirtz/homer/releases
+immich_machine_learning https://github.com/immich-app/immich/releases
+immich_postgres https://github.com/tensorchord/VectorChord/releases
+immich_redis https://github.com/valkey-io/valkey/releases
+immich_server https://github.com/immich-app/immich/releases
+jellyfin https://github.com/jellyfin/jellyfin/releases
+jellyseerr https://github.com/Fallenbagel/jellyseerr/releases
+jellystat https://github.com/CyferShepard/Jellystat/releases
+librespeed https://github.com/librespeed/speedtest/releases
+lidarr https://github.com/Lidarr/Lidarr/releases/
+lidarr-ls https://github.com/linuxserver/docker-lidarr/releases
+lubelogger https://github.com/hargata/lubelog/releases
+mattermost https://github.com/mattermost/mattermost/releases
+mealie https://github.com/mealie-recipes/mealie/releases
+meilisearch https://github.com/meilisearch/meilisearch/releases
+monica https://github.com/monicahq/monica/releases
+mqtt https://github.com/eclipse/mosquitto/tags
+nextcloud-aio-mastercontainer https://github.com/nextcloud/all-in-one/releases
+nginx https://github.com/docker-library/official-images/blob/master/library/nginx
+owncast https://github.com/owncast/owncast/releases
 prowlarr https://github.com/Prowlarr/Prowlarr/releases
 prowlarr-ls https://github.com/linuxserver/docker-prowlarr/releases
+qbittorrent https://www.qbittorrent.org/news
+qbittorrent-nox https://www.qbittorrent.org/news
+radarr https://github.com/Radarr/Radarr/releases/
+radarr-ls https://github.com/linuxserver/docker-radarr/releases
+readarr https://github.com/Readarr/Readarr/releases
+readeck https://codeberg.org/readeck/readeck/releases
 recyclarr https://github.com/recyclarr/recyclarr/releases
+roundcubemail https://github.com/roundcube/roundcubemail/releases
 sabnzbd https://github.com/linuxserver/docker-sabnzbd/releases
-sonarr https://github.com/linuxserver/docker-sonarr/releases
+scrutiny https://github.com/AnalogJ/scrutiny/releases
-radarr https://github.com/linuxserver/docker-radarr/releases
+sftpgo https://github.com/drakkan/sftpgo/releases
-lidarr https://github.com/linuxserver/docker-lidarr/releases
+slskd https://github.com/slskd/slskd/releases
-jellyseerr https://github.com/Fallenbagel/jellyseerr/releases
+snappymail https://github.com/the-djmaze/snappymail/releases
-jellyfin https://github.com/jellyfin/jellyfin/releases
+sonarr https://github.com/Sonarr/Sonarr/releases/
-
+sonarr-ls https://github.com/linuxserver/docker-sonarr/releases
-home-assistant https://github.com/home-assistant/docker/releases
+syncthing https://github.com/syncthing/syncthing/releases
+tautulli https://github.com/Tautulli/Tautulli/releases
+thelounge https://github.com/thelounge/thelounge/releases
+traefik https://github.com/traefik/traefik/releases
+vaultwarden-server https://github.com/dani-garcia/vaultwarden/releases
+watchtower https://github.com/beatkind/watchtower/releases
+wud https://github.com/getwud/wud/releases
 zigbee2mqtt https://github.com/Koenkk/zigbee2mqtt/releases
-mqtt https://github.com/eclipse/mosquitto/tags