Style and additions (#160)

* correcting colors

* hides progress bar in monochrome mode, added monochrome mode to config

* Added config/option to auto self-update, use with caution!

* use notification release notes url function for cli options as well

* added the flag, reordered flags

* change output order + add alpine pkgmngr

* changed logic of default.config

* added an extras section

* modifying urls list, adding option flag

* prometheus hotfix + minor tweaks

* quick pkginstaller fix

---------

Co-authored-by: Joachim Schuster <dev@joachimschuster.de>

.gitignore

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

README.md

@@ -11,19 +11,28 @@
 </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 and more.</h3>
+<h3 align="center">selective updates, exclude containers, custom labels, notification plugins, prune when done etc.</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.5.0**: osx and bsd compatibility changes + rewrite of dependency installer
-- **v0.5.4.0**: Added support for a Prometheus+node_exporter metric collection through a file collector.
-- **v0.5.3.0**: Local image check changed (use imageId instead of name) and Gotify-template fixed (whale icon removed).
-- **v0.5.2.1**: Rewrite of dependency downloads, jq can be installed with package manager or static binary.
-- **v0.5.1**: DEPENDENCY WARNING: now requires **jq**. + Upstreaming changes from [sudo-kraken/podcheck](https://github.com/sudo-kraken/podcheck)
+- **v0.6.2**: Style and colour changes, prometheus hotfix, new options:
+    - `-u`, Allow auto self update of dockcheck.sh
+    - `-I`, Print container release URLs in the CLI "choose update" list. (please contribute to `urls.list`)
+    - Extras: `-m`, Monochrome mode now hides the progress bar.
+- **v0.6.1**: Hotfixes: (try removing set+shopt+shopt if debugging more errors)
+    - xargs/pipefail, removed `-set -e` bash option for now.
+    - unbound variables fixed (hopefully)
+    - dependency installer from pkgmanager rewritten
+- **v0.6.0**: Refactored a lot of code, cleaner logic and syntax, safer variables.
+    - Safer bash options with `set -euo pipefail`, `shopt -s nullglob` and `failglob`.
+    - Added a `default.conf` for user settings - persistent through updates.
+    - Added `notify_slack.sh` template for slack curl api.
+
 ___
 
 
@@ -35,7 +44,7 @@ $ ./dockcheck.sh -h
 Syntax:     dockcheck.sh [OPTION] [part of name to filter]
 Example:    dockcheck.sh -y -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.
@@ -43,14 +52,17 @@ Options:"
 -f     Force stack restart after update. Caution: restarts once for every updated container within stack.
 -h     Print this Help.
 -i     Inform - send a preconfigured notification.
+-I     Prints custom releasenote urls alongside each container with updates (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.
 -n     No updates, only checking availability.
 -p     Auto-Prune dangling images after update.
 -r     Allow updating images for docker run, wont 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:
@@ -77,6 +89,7 @@ ___
 ## :nut_and_bolt: Dependencies
 - Running docker (duh) and compose, either standalone or plugin. (see [Podman fork](https://github.com/sudo-kraken/podcheck)  
 - Bash shell or compatible shell of at least v4.3
+  - POSIX `xargs`, usually default but can be installed with the `findutils` package - to enable async.
 - [jq](https://github.com/jqlang/jq)
   - User will be prompted to install with package manager or download static binary.
 - [regclient/regctl](https://github.com/regclient/regclient) (Licensed under [Apache-2.0 License](http://www.apache.org/licenses/LICENSE-2.0))  
@@ -84,7 +97,7 @@ ___
   - regctl requires `amd64/arm64` - see [workaround](#roller_coaster-workaround-for-non-amd64--arm64) if other architecture is used.
 
 ## :tent: Install Instructions
-Download the script to a directory in **PATH**, I'd suggest using `~/.local/bin` as that's usually in **PATH**.   
+Download the script to a directory in **PATH**, I'd suggest using `~/.local/bin` as that's usually in **PATH**.  
 For OSX/macOS preferably use `/usr/local/bin`.
 ```sh
 # basic example with curl:
@@ -100,9 +113,14 @@ 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 if `notify.sh` is present and configured.  
+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)  
@@ -119,13 +137,17 @@ Use a `notify_X.sh` template file from the **notify_templates** directory, copy
 - [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!  
 <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.  
+
 The output of the notification will look something like this:
 ```
 Containers on hostname with updates available:
@@ -136,17 +158,36 @@ nginx  ->  https://github.com/docker-library/official-images/blob/master/library
 ```
 The `urls.list` file is just an example and I'd gladly see that people contribute back when they add their preferred URLs to their lists.
 
-## :chart_with_upwards_trend: Prometheus and node_exporter
+## :fast_forward: Asyncronous update checks with **xargs**; `-x N` option. (default=1)
+Pass `-x N` where N is number of subprocesses allowed, experiment in your environment to find a suitable max!  
+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: Extra plugins and tools:
+
+### :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 Shows number 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:
 ```
@@ -177,7 +218,15 @@ chmod 755 regctl
 ```
 Test it with `./regctl --help` and then either add the file to the same path as *dockcheck.sh* or in your path (eg. `~/.local/bin/regctl`).
 
-## :guardsman: Function to auth with docker hub before running
+## :whale: Docker Hub pull limit :chart_with_downwards_trend: not an issue for checks but for actual pulls
+Due to recent changes in [Docker Hub usage and limits](https://docs.docker.com/docker-hub/usage/)
+>Unauthenticated users: 10 pulls/hour  
+>Authenticated users with a free account: 100 pulls/hour
+
+This is not an issue for registry checks. But if you have a large stack and pull more than 10 updates at once consider updating more often or to create a free account.
+You could use/modify the login-wrapper function in the example below to automate the login prior to running `dockcheck.sh`.
+
+### :guardsman: Function to auth with docker hub before running
 **Example** - Change names, paths, and remove cat+password flag if you rather get prompted:
 ```sh
 function dchk {
@@ -207,6 +256,7 @@ 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)
 
 ___
 

default.config

@@ -0,0 +1,23 @@
+### 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 stack restart after update. Caution.
+#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)`

dockcheck.sh

@@ -1,17 +1,28 @@
 #!/usr/bin/env bash
-VERSION="v0.5.5.0"
-### ChangeNotes: osx and bsd compatibility changes + rewrite of dependency installer
+VERSION="v0.6.2"
+### ChangeNotes: Added options: -u; auto self update. -I; print release URL, +style and colour fixes.
 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
-LatestRelease="$(curl -s -r 0-50 $RawUrl | sed -n "/VERSION/s/VERSION=//p" | tr -d '"')"
-LatestChanges="$(curl -s -r 0-200 $RawUrl | sed -n "/ChangeNotes/s/# ChangeNotes: //p")"
+LatestRelease="$(curl -s -r 0-50 "$RawUrl" | sed -n "/VERSION/s/VERSION=//p" | tr -d '"')"
+LatestChanges="$(curl -s -r 0-200 "$RawUrl" | sed -n "/ChangeNotes/s/# ChangeNotes: //p")"
+
+# User customizable defaults
+if [[ -s "${HOME}/.config/dockcheck.config" ]]; then
+  source "${HOME}/.config/dockcheck.config"
+elif [[ -s "${ScriptWorkDir}/dockcheck.config" ]]; then
+  source "${ScriptWorkDir}/dockcheck.config"
+fi
 
 # Help Function
 Help() {
@@ -26,19 +37,48 @@ Help() {
   echo "-f     Force stack restart after update. Caution: restarts once for every updated container within stack."
   echo "-h     Print this Help."
   echo "-i     Inform - send a preconfigured notification."
+  echo "-I     Prints custom releasenote urls alongside each container with updates (requires urls.list)."
   echo "-l     Only update if label is set. See readme."
-  echo "-m     Monochrome mode, no printf color codes."
-  echo "-n     No updates; only checking availability."
+  echo "-m     Monochrome mode, no printf colour codes and hides progress bar."
+  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 "-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}
+Stopped=${Stopped:=""}
+CollectorTextFileDirectory=${CollectorTextFileDirectory:-}
+Exclude=${Exclude:-}
+DaysOld=${DaysOld:-}
+Excludes=()
+GotUpdates=()
+NoUpdates=()
+GotErrors=()
+SelectedUpdates=()
+regbin=""
+jqbin=""
+
+# Colours
 c_red="\033[0;31m"
 c_green="\033[0;32m"
 c_yellow="\033[0;33m"
@@ -46,94 +86,122 @@ c_blue="\033[0;34m"
 c_teal="\033[0;36m"
 c_reset="\033[0m"
 
-Timeout=10
-Stopped=""
-while getopts "aynpfrhlisvmc:e:d:t:" options; do
+while getopts "ayfhiIlmnprsuvc:e:d:t:x:" options; do
   case "${options}" in
-    a|y) AutoUp="yes" ;;
-    c)   CollectorTextFileDirectory="${OPTARG}"
-         if ! [[ -d  $CollectorTextFileDirectory ]] ; then { printf "The directory (%s) does not exist.\n" "${CollectorTextFileDirectory}"  ; exit 2; } fi ;;
-    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" ; } ;;
+    a|y) AutoMode=true ;;
+    c)   CollectorTextFileDirectory="${OPTARG}" ;;
+    d)   DaysOld=${OPTARG} ;;
     e)   Exclude=${OPTARG} ;;
-    m)   declare c_{red,green,yellow,blue,teal,reset}="" ;;
+    f)   ForceRestartStacks=true ;;
+    i)   Notify=true ;;
+    I)   PrintReleaseURL=true ;;
+    l)   OnlyLabel=true ;;
+    m)   MonoMode=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 ;;
-    d)   DaysOld=${OPTARG}
-         if ! [[ $DaysOld =~ ^[0-9]+$ ]] ; then { printf "Days -d argument given (%s) is not a number.\n" "${DaysOld}" ; exit 2 ; } ; fi ;;
-    h|*) Help ; exit 2 ;;
+    u)   AutoSelfUpdate=true ;;
+    v)   printf "%s\n" "$VERSION"; exit 0 ;;
+    x)   MaxAsync=${OPTARG} ;;
+    h|*) Help; exit 2 ;;
   esac
 done
 shift "$((OPTIND-1))"
 
-# Self-update function
+# Set $1 to a variable for name filtering later
+SearchName="${1:-}"
+
+# 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
+  if [[ -s "${ScriptWorkDir}/notify.sh" ]]; then
+    source "${ScriptWorkDir}/notify.sh"
+  else Notify=false
+  fi
+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
+
 self_update_curl() {
   cp "$ScriptPath" "$ScriptPath".bak
-  if [[ $(command -v curl) ]]; then
-    curl -L $RawUrl > "$ScriptPath" ; chmod +x "$ScriptPath"
-    printf "\n%s\n" "--- starting over with the updated version ---"
+  if command -v curl &>/dev/null; then
+    curl -L $RawUrl > "$ScriptPath"; chmod +x "$ScriptPath"
+    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
-    wget $RawUrl -O "$ScriptPath" ; chmod +x "$ScriptPath"
-    printf "\n%s\n" "--- starting over with the updated version ---"
+  elif command -v wget &>/dev/null; then
+    wget $RawUrl -O "$ScriptPath"; chmod +x "$ScriptPath"
+    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 ; }
-  if [[ $(command -v git) ]] && [[ "$(git ls-remote --get-url 2>/dev/null)" =~ .*"mag37/dockcheck".* ]] ; then
+  cd "$ScriptWorkDir" || { printf "%bPath error,%b skipping update.\n" "$c_red" "$c_reset"; return; }
+  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
-        if [[ "$CC" -lt 1 || "$CC" -gt $UpdCount ]] ; then # Reset choice if out of bounds
-          echo "Number not in list: $CC" ; unset ChoiceClean ; break 1
+      for CC in $ChoiceClean; do
+        if [[ "$CC" -lt 1 || "$CC" -gt $UpdCount ]]; then # Reset choice if out of bounds
+          echo "Number not in list: $CC"; unset ChoiceClean; break 1
         else
           SelectedUpdates+=( "${GotUpdates[$CC-1]}" )
         fi
       done
     fi
   done
-  printf "\nUpdating containers:\n"
+  printf "\n%bUpdating container(s):%b\n" "$c_blue" "$c_reset"
   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 ))
-  if [ "$ImageAge" -gt "$DaysOld" ] ; then
+  ImageAge=$(( ( $(date +%s) - ImageEpoch )/86400 ))
+  if [[ "$ImageAge" -gt "$DaysOld" ]]; then
     return 0
   else
     return 1
@@ -143,40 +211,30 @@ datecheck() {
 progress_bar() {
   QueCurrent="$1"
   QueTotal="$2"
+  BarWidth=${BarWidth:-50}
   ((Percent=100*QueCurrent/QueTotal))
-  ((Complete=50*Percent/100)) # Change first number for width (50)
-  ((Left=50-Complete)) # Change first number for width (50)
+  ((Complete=BarWidth*Percent/100))
+  ((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"
-  [[ "$QueTotal" == "$QueCurrent" ]] && printf "\r[%b%s%b] %s/%s \n" "$c_teal" "$BarComplete" "$c_reset" "$QueCurrent" "$QueTotal"
+  if [[ "$QueTotal" != "$QueCurrent" ]]; then
+    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
+  for update in "${GotUpdates[@]}"; do
     found=false
     while read -r container url; do
-      [[ $update == $container ]] && Updates+=("$update  ->  $url") && found=true
-    done < "$ScriptWorkDir"/urls.list
-    [[ $found == false ]] && Updates+=("$update  ->  url missing") || continue
+      if [[ "$update" == "$container" ]]; then Updates+=("$update  ->  $url"); found=true; fi
+    done < "${ScriptWorkDir}/urls.list"
+    if [[ "$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
-  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"
@@ -184,23 +242,24 @@ 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" ;
-  elif [[ $(command -v wget) ]]; then wget $GetUrl -O "$ScriptWorkDir/$BinaryName" ;
+  if command -v curl &>/dev/null; then curl -L "$GetUrl" > "$ScriptWorkDir/$BinaryName";
+  elif command -v wget &>/dev/null; then wget "$GetUrl" -O "$ScriptWorkDir/$BinaryName";
   else printf "%s\n" "curl/wget not available - get $BinaryName manually from the repo link, exiting."; exit 1;
   fi
   [[ -f "$ScriptWorkDir/$BinaryName" ]] && chmod +x "$ScriptWorkDir/$BinaryName"
 }
 
 distro_checker() {
-  if [[ -f /etc/arch-release ]] ; then PkgInstaller="pacman -S"
-  elif [[ -f /etc/redhat-release ]] ; then PkgInstaller="sudo dnf install"
-  elif [[ -f /etc/SuSE-release ]] ; then PkgInstaller="sudo zypper install"
-  elif [[ -f /etc/debian_version ]] ; then PkgInstaller="sudo apt-get 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"
+  if [[ -f /etc/arch-release ]]; then PkgInstaller="sudo pacman -S"
+  elif [[ -f /etc/redhat-release ]]; then PkgInstaller="sudo dnf install"
+  elif [[ -f /etc/SuSE-release ]]; then PkgInstaller="sudo zypper install"
+  elif [[ -f /etc/debian_version ]]; then PkgInstaller="sudo apt-get install"
+  elif [[ -f /etc/alpine-release ]] ; then PkgInstaller="doas apk add"
+  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
 }
 
@@ -209,41 +268,68 @@ dependency_check() {
   AppName="$1"
   AppVar="$2"
   AppUrl="$3"
-  if [[ $(command -v $AppName) ]]; then export $AppVar="$AppName" ;
-  elif [[ -f "$ScriptWorkDir/$AppName" ]]; then export $AppVar="$ScriptWorkDir/$AppName" ;
+  if command -v "$AppName" &>/dev/null; then export "$AppVar"="$AppName";
+  elif [[ -f "$ScriptWorkDir/$AppName" ]]; then export "$AppVar"="$ScriptWorkDir/$AppName";
   else
     printf "%s\n" "Required dependency '$AppName' missing, do you want to install it?"
     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 [[ "$PkgExitcode" == 0 ]] ; then { export $AppVar="$AppName" && printf "\n%b$AppName installed.%b\n" "$c_green" "$c_reset"; }
-        else printf "\n%bPackagemanager install failed%b, falling back to static binary.\n" "$c_yellow" "$c_reset"
+        if $PkgInstaller "$AppName"; then
+          AppName="$1"
+          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%b 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; }
 }
 
+# Numbered List function
+# if urls.list exists add release note url per line
+options() {
+  num=1
+  if [[ -s "$ScriptWorkDir/urls.list" ]] && [[ "$PrintReleaseURL" == true ]]; then releasenotes; else Updates=("${GotUpdates[@]}"); fi
+  for update in "${Updates[@]}"; do
+    echo "$num) $update"
+    ((num++))
+  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 [[ "$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 ]] && { [[ $(type -t dockcheck_notification) == function ]] && dockcheck_notification "$VERSION" "$LatestRelease" "$LatestChanges" || printf "Could not source notification function.\n"; }
+  fi
+fi
+
 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"
 
 # Check docker compose binary
-if docker compose version &> /dev/null ; then DockerBin="docker compose" ;
-elif docker-compose -v &> /dev/null; then DockerBin="docker-compose" ;
-elif docker -v &> /dev/null; then
+if docker compose version &>/dev/null; then DockerBin="docker compose" ;
+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
@@ -251,17 +337,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"
@@ -272,9 +349,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}"
@@ -282,71 +359,113 @@ if [[ $t_out ]]; then
 else t_out=""
 fi
 
-# Check the image-hash of every running container VS the registry
-for i in $(docker ps $Stopped --filter "name=$SearchName" --format '{{.Names}}') ; do
-  ((RegCheckQue+=1))
-  progress_bar "$RegCheckQue" "$ContCount"
-  # Looping every item over the list of excluded names and skipping
-  for e in "${Excludes[@]}" ; do [[ "$i" == "$e" ]] && continue 2 ; done
+check_image() {
+  i="$1"
+  local Excludes=($Excludes_string)
+  for e in "${Excludes[@]}"; do
+    if [[ "$i" == "$e" ]]; then
+      printf "%s\n" "Skip $i"
+      return
+    fi
+  done
+
+  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 [[ "$LocalHash" = *"$RegHash"* ]] ; then
-      NoUpdates+=("$i")
+  if RegHash=$($t_out "$regbin" -v error image digest --list "$RepoUrl" 2>&1); then
+    if [[ "$LocalHash" = *"$RegHash"* ]]; then
+      printf "%s\n" "NoUpdates $i"
     else
-      if [[ -n "$DaysOld" ]] && ! datecheck ; then
-        NoUpdates+=("+$i ${ImageAge}d")
+      if [[ -n "${DaysOld:-}" ]] && ! datecheck; then
+        printf "%s\n" "NoUpdates +$i ${ImageAge}d"
       else
-        GotUpdates+=("$i")
+        printf "%s\n" "GotUpdates $i"
       fi
     fi
   else
-    # Here the RegHash is the result of an error code
-    GotErrors+=("$i - ${RegHash}")
+    printf "%s\n" "GotErrors $i - ${RegHash}"  # Reghash contains an error code here
   fi
-done
+}
+
+# Make required functions and variables available to subprocesses
+export -f check_image datecheck
+export Excludes_string="${Excludes[*]:-}" # Can only export scalar variables
+export t_out regbin RepoUrl DaysOld
+
+# 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"
+fi
+
+# Asynchronously check the image-hash of every running container VS the registry
+while read -r line; do
+  ((RegCheckQue+=1))
+  if [[ "$MonoMode" == false ]]; then progress_bar "$RegCheckQue" "$ContCount"; fi
+
+  Got=${line%% *}  # Extracts the first word (NoUpdates, GotUpdates, GotErrors)
+  item=${line#* }
+
+  case "$Got" in
+    NoUpdates) NoUpdates+=("$item") ;;
+    GotUpdates) GotUpdates+=("$item") ;;
+    GotErrors) GotErrors+=("$item") ;;
+    Skip) ;;
+    *) echo "Error! Unexpected output from subprocess: ${line}" ;;
+  esac
+done < <( \
+  docker ps $Stopped --filter "name=$SearchName" --format '{{.Names}}' | \
+  xargs $XargsAsync -I {} bash -c 'check_image "{}"' \
+)
 
 # Sort arrays alphabetically
 IFS=$'\n'
-NoUpdates=($(sort <<<"${NoUpdates[*]}"))
-GotUpdates=($(sort <<<"${GotUpdates[*]}"))
+NoUpdates=($(sort <<<"${NoUpdates[*]:-}"))
+GotUpdates=($(sort <<<"${GotUpdates[*]:-}"))
 unset IFS
 
 # Run the prometheus exporter function
-if [ -n "$CollectorTextFileDirectory" ] ; then
-  source "$ScriptWorkDir"/addons/prometheus/prometheus_collector.sh && prometheus_exporter ${#NoUpdates[@]} ${#GotUpdates[@]} ${#GotErrors[@]}
+if [[ -n "${CollectorTextFileDirectory:-}" ]]; then
+  if type -t prometheus_exporter &>/dev/null; then
+    prometheus_exporter ${#NoUpdates[@]} ${#GotUpdates[@]} ${#GotErrors[@]}
+  else
+    printf "%s\n" "Could not source prometheus exporter function."
+  fi
 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"
-   [[ -z "$AutoUp" ]] && options || printf "%s\n" "${GotUpdates[@]}"
-   [[ -n "$Notify" ]] && { [[ $(type -t send_notification) == function ]] && send_notification "${GotUpdates[@]}" || printf "Could not source notification function.\n" ; }
+   [[ "$AutoMode" == false ]] && options || printf "%s\n" "${GotUpdates[@]}"
+   [[ "$Notify" == true ]] && { type -t send_notification &>/dev/null && send_notification "${GotUpdates[@]}" || printf "Could not source notification function.\n"; }
 fi
 
 # Optionally get updates if there's any
-if [ -n "$GotUpdates" ] ; then
-  if [ -z "$AutoUp" ] ; then
+if [[ -n "${GotUpdates:-}" ]]; 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
     NumberofUpdates="${#SelectedUpdates[@]}"
     CurrentQue=0
     for i in "${SelectedUpdates[@]}"
@@ -357,21 +476,21 @@ if [ -n "$GotUpdates" ] ; then
       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=""
+      [[ "$ContConfigFile" == "null" ]] && ContConfigFile=""
       ContName=$($jqbin -r '."com.docker.compose.service"' <<< "$ContLabels")
-      [ "$ContName" == "null" ] && ContName=""
+      [[ "$ContName" == "null" ]] && ContName=""
       ContEnv=$($jqbin -r '."com.docker.compose.project.environment_file"' <<< "$ContLabels")
-      [ "$ContEnv" == "null" ] && ContEnv=""
+      [[ "$ContEnv" == "null" ]] && ContEnv=""
       ContUpdateLabel=$($jqbin -r '."mag37.dockcheck.update"' <<< "$ContLabels")
-      [ "$ContUpdateLabel" == "null" ] && ContUpdateLabel=""
+      [[ "$ContUpdateLabel" == "null" ]] && ContUpdateLabel=""
       ContRestartStack=$($jqbin -r '."mag37.dockcheck.restart-stack"' <<< "$ContLabels")
-      [ "$ContRestartStack" == "null" ] && ContRestartStack=""
+      [[ "$ContRestartStack" == "null" ]] && ContRestartStack=""
 
       # Checking if compose-values are empty - hence started with docker run
-      if [ -z "$ContPath" ] ; then
-        if [ "$DRunUp" == "yes" ] ; then
+      if [[ -z "$ContPath" ]]; 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
@@ -380,29 +499,30 @@ if [ -n "$GotUpdates" ] ; then
         continue
       fi
       # cd to the compose-file directory to account for people who use relative volumes
-      cd "$ContPath" || { echo "Path error - skipping $i" ; continue ; }
+      cd "$ContPath" || { printf "\n%bPath error - skipping%b %s" "$c_red" "$c_reset" "$i"; continue; }
       ## Reformatting path + multi compose
-      if [[ $ContConfigFile = '/'* ]] ; then
-        CompleteConfs=$(for conf in ${ContConfigFile//,/ } ; do printf -- "-f %s " "$conf"; done)
+      if [[ $ContConfigFile = '/'* ]]; then
+        CompleteConfs=$(for conf in ${ContConfigFile//,/ }; do printf -- "-f %s " "$conf"; done)
       else
-        CompleteConfs=$(for conf in ${ContConfigFile//,/ } ; do printf -- "-f %s/%s " "$ContPath" "$conf"; done)
+        CompleteConfs=$(for conf in ${ContConfigFile//,/ }; do printf -- "-f %s/%s " "$ContPath" "$conf"; done)
       fi
       printf "\n%bNow updating (%s/%s): %b%s%b\n" "$c_teal" "$CurrentQue" "$NumberofUpdates" "$c_blue" "$i" "$c_reset"
       # Checking if Label Only -option is set, and if container got the label
-      [[ "$OnlyLabel" == true ]] && { [[ "$ContUpdateLabel" != true ]] && { echo "No update label, skipping." ; continue ; } }
-      docker pull "$ContImage"
+      [[ "$OnlyLabel" == true ]] && { [[ "$ContUpdateLabel" != true ]] && { echo "No update label, skipping."; continue; } }
+      docker pull "$ContImage" || { printf "\n%bDocker error, exiting!%b\n" "$c_red" "$c_reset" ; exit 1; }
       # Check if the container got an environment file set and reformat it
-      if [ -n "$ContEnv" ]; then ContEnvs=$(for env in ${ContEnv//,/ } ; do printf -- "--env-file %s " "$env"; done) ; fi
+      ContEnvs=""
+      if [[ -n "$ContEnv" ]]; then ContEnvs=$(for env in ${ContEnv//,/ }; do printf -- "--env-file %s " "$env"; done); fi
       # Check if the whole stack should be restarted
-      if [[ "$ContRestartStack" == true ]] || [[ "$ForceRestartStacks" == true ]] ; then
-        $DockerBin ${CompleteConfs} stop ; $DockerBin ${CompleteConfs} ${ContEnvs} up -d
+      if [[ "$ContRestartStack" == true ]] || [[ "$ForceRestartStacks" == true ]]; then
+        ${DockerBin} ${CompleteConfs} stop; ${DockerBin} ${CompleteConfs} ${ContEnvs} up -d
       else
-        $DockerBin ${CompleteConfs} ${ContEnvs} up -d ${ContName}
+        ${DockerBin} ${CompleteConfs} ${ContEnvs} up -d ${ContName}
       fi
     done
+    if [[ "$AutoPrune" == false ]] && [[ "$AutoMode" == false ]]; then read -rep "\nWould you like to prune dangling images? y/[n]: " AutoPrune; fi
+    if [[ "$AutoPrune" == true ]] || [[ "$AutoPrune" =~ [yY] ]]; then 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,5 +1,6 @@
 ### DISCLAIMER: This is a third party addition to dockcheck - best effort testing.
-# INFO: ssmtp is depcerated - consider to use msmtp instead.
+NOTIFY_DSM_VERSION="v0.1"
+# 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.
@@ -17,10 +18,9 @@ else
 	echo "No msmtp or ssmtp binary found in PATH: $PATH" ; exit 1
 fi
 
-send_notification() {
-[ -s "$ScriptWorkDir"/urls.list ] && releasenotes || Updates=("$@")
-UpdToString=$( printf '%s\\n' "${Updates[@]}" )
 FromHost=$(hostname)
+
+trigger_notification() {
 CfgFile="/usr/syno/etc/synosmtp.conf"
 
 # User variables:
@@ -34,15 +34,11 @@ 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')}
 
-printf "\nSending email notification.\n"
-
-printf -v MessageBody "🐋 Containers on $FromHost with updates available:\n\n$UpdToString"
-
 $MailPkg $SendMailTo << __EOF
 From: "$SenderName" <$SenderMail>
 date:$(date -R)
 To: <$SendMailTo>
-Subject: $SubjectTag Updates available on $FromHost
+Subject: $SubjectTag $MessageTitle $FromHost
 Content-Type: text/plain; charset=UTF-8; format=flowed
 Content-Transfer-Encoding: 7bit
 
@@ -52,3 +48,35 @@ __EOF
 # 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_apprise.sh

@@ -1,30 +1,55 @@
 ### DISCLAIMER: This is a third party addition to dockcheck - best effort testing.
+NOTIFY_APPRISE_VERSION="v0.1"
 #
 # 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.
 
-send_notification() {
-[ -s "$ScriptWorkDir"/urls.list ] && releasenotes || Updates=("$@")
-UpdToString=$( printf '%s\\n' "${Updates[@]}" )
 FromHost=$(hostname)
 
-printf "\nSending Apprise notification\n"
+trigger_notification() {
 
-MessageTitle="$FromHost - updates available."
-# Setting the MessageBody variable here.
-printf -v MessageBody "🐋 Containers on $FromHost with updates available:\n$UpdToString"
-
-# Modify to fit your setup:
-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.
-### Uncomment the AppriseURL and the curl-line below:
-# AppriseURL="http://apprise.mydomain.tld:1234/notify/apprise"
-# curl -X POST -F "title=$MessageTitle" -F "body=$MessageBody" -F "tags=all" $AppriseURL
+   ### Modify to fit your setup:
+   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.
+   ### Uncomment the AppriseURL and the curl-line below:
+   # AppriseURL="http://apprise.mydomain.tld:1234/notify/apprise"
+   # curl -X POST -F "title=$MessageTitle" -F "body=$MessageBody" -F "tags=all" $AppriseURL
+}
+
+send_notification() {
+    [ -s "$ScriptWorkDir"/urls.list ] && releasenotes || Updates=("$@")
+    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
+
+    trigger_notification
 }

notify_templates/notify_discord.sh

@@ -1,28 +1,43 @@
 ### DISCLAIMER: This is a third party addition to dockcheck - best effort testing.
+NOTIFY_DISCORD_VERSION="v0.1"
 #
 # 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
 
-send_notification() {
-    [ -s "$ScriptWorkDir"/urls.list ] && releasenotes || Updates=("$@")
-    UpdToString=$( printf '%s\\n' "${Updates[@]}" )
-
-    echo "$UpdToString"
-    FromHost=$(hostname)
-
-    # platform specific notification code would go here
-    printf "\nSending Discord notification\n"
-
-    # Setting the MessageBody variable here.
-    MessageBody="🐋 Containers on $FromHost with updates available: \n$UpdToString"
+FromHost=$(hostname)
 
+trigger_notification() {
     # Modify to fit your setup:
     DiscordWebhookUrl="PasteYourFullDiscordWebhookURL"
 
     MsgBody="{\"username\":\"$FromHost\",\"content\":\"$MessageBody\"}"
-
     curl -sS -o /dev/null --fail -X POST -H "Content-Type: application/json" -d "$MsgBody" "$DiscordWebhookUrl"
-
 }
 
+send_notification() {
+    [ -s "$ScriptWorkDir"/urls.list ] && releasenotes || Updates=("$@")
+    UpdToString=$( printf '%s\\n' "${Updates[@]}" )
+
+    printf "\nSending Discord notification\n"
+    # 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 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,16 +1,44 @@
 ### DISCLAIMER: This is a third party addition to dockcheck - best effort testing.
+NOTIFY_GENERIC_VERSION="v0.1"
 #
 # Copy/rename this file to notify.sh to enable the notification snippet.
 # generic sample, the "Hello World" of notification addons
 
-send_notification() {
-  [ -s "$ScriptWorkDir"/urls.list ] && releasenotes || Updates=("$@")
-  UpdToString=$( printf '%s\\n' "${Updates[@]}" )
+FromHost=$(hostname)
 
-  FromHost=$(hostname)
-
-  # platform specific notification code would go here
-  printf "\n%bGeneric notification addon:%b" "$c_green" "$c_reset"
-  printf "\nThe following docker containers on %s need to be updated:\n" "$FromHost"
-  printf "$UpdToString"
+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,21 +1,13 @@
 ### DISCLAIMER: This is a third party addition to dockcheck - best effort testing.
+NOTIFY_GOTIFY_VERSION="v0.1"
 #
 # 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.
 
-send_notification() {
-    [ -s "$ScriptWorkDir"/urls.list ] && releasenotes || Updates=("$@")
-    UpdToString=$( printf '%s\\n' "${Updates[@]}" )
-    FromHost=$(hostname)
-
-    # platform specific notification code would go here
-    printf "\nSending Gotify notification\n"
-
-    # Setting the MessageTitle and MessageBody variable here.
-    MessageTitle="${FromHost} - updates available."
-    printf -v MessageBody "Containers on $FromHost with updates available:\n$UpdToString"
+FromHost=$(hostname)
 
+trigger_notification() {
     # Modify to fit your setup:
     GotifyToken="Your Gotify token here"
     GotifyUrl="https://api.gotify/message?token=${GotifyToken}"
@@ -25,5 +17,37 @@ send_notification() {
         -F "message=${MessageBody}" \
         -F "priority=5" \
         -X POST "${GotifyUrl}" 1> /dev/null
-
+}
+
+send_notification() {
+    [ -s "$ScriptWorkDir"/urls.list ] && releasenotes || Updates=("$@")
+    UpdToString=$( printf '%s\\n' "${Updates[@]}" )
+
+    # platform specific notification code would go here
+    printf "\nSending Gotify notification\n"
+
+    # Setting the MessageTitle and MessageBody variable here.
+    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 "\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,20 +1,13 @@
 ### DISCLAIMER: This is a third party addition to dockcheck - best effort testing.
+NOTIFY_MATRIX_VERSION="v0.1"
 #
 # 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
 
-send_notification() {
-    [ -s "$ScriptWorkDir"/urls.list ] && releasenotes || Updates=("$@")
-    UpdToString=$( printf '%s\\n' "${Updates[@]}" )
-    FromHost=$(hostname)
-
-    # platform specific notification code would go here
-    printf "\nSending Matrix notification\n"
-
-    # Setting the MessageBody variable here.
-    MessageBody="🐋 Containers on $FromHost with updates available: \n$UpdToString"
+FromHost=$(hostname)
 
+trigger_notification() {
     # Modify to fit your setup:
     AccessToken="Your Matrix token here"
     Room_id="Enter Room_id here"
@@ -22,7 +15,37 @@ send_notification() {
     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
-
     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"
-
+}
+
+send_notification() {
+    [ -s "$ScriptWorkDir"/urls.list ] && releasenotes || Updates=("$@")
+    UpdToString=$( printf '%s\\n' "${Updates[@]}" )
+
+    # platform specific notification code would go here
+    printf "\nSending Matrix notification\n"
+
+    # 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,26 +1,50 @@
 ### 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.
 
-send_notification() {
-[ -s "$ScriptWorkDir"/urls.list ] && releasenotes || Updates=("$@")
-UpdToString=$( printf '%s\\n' "${Updates[@]}" )
 FromHost=$(hostname)
 
-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"
-
-# Modify to fit your setup:
-NtfyUrl="ntfy.sh/YourUniqueTopicName"
-
-curl -sS -o /dev/null --show-error --fail \
-  -H "Title: $MessageTitle" \
-  -d "$MessageBody" \
-  $NtfyUrl
+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_pushbullet.sh

@@ -1,27 +1,51 @@
 ### DISCLAIMER: This is a third party addition to dockcheck - best effort testing.
+NOTIFY_PUSHBULLET_VERSION="v0.1"
 #
 # 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.
 
-send_notification() {
-[ -s "$ScriptWorkDir"/urls.list ] && releasenotes || Updates=("$@")
-UpdToString=$( printf '%s\\n' "${Updates[@]}" )
 FromHost=$(hostname)
 
-# platform specific notification code would go here
-printf "\nSending pushbullet notification\n"
-
-MessageTitle="$FromHost - updates available."
-# Setting the MessageBody variable here.
-printf -v MessageBody "🐋 Containers on $FromHost with updates available:\n$UpdToString"
-
-# Modify to fit your setup:
-PushUrl="https://api.pushbullet.com/v2/pushes"
-PushToken="Your Pushbullet token here"
-
-# Requires jq to process json data
-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 @-
+trigger_notification() {
+    # Modify to fit your setup:
+    PushUrl="https://api.pushbullet.com/v2/pushes"
+    PushToken="Your Pushbullet token here"
 
+    # Requires jq to process json data
+    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 @-
+}
+
+send_notification() {
+    [ -s "$ScriptWorkDir"/urls.list ] && releasenotes || Updates=("$@")
+    UpdToString=$( printf '%s\\n' "${Updates[@]}" )
+
+    # platform specific notification code would go here
+    printf "\nSending pushbullet 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 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,22 +1,14 @@
 ### DISCLAIMER: This is a third party addition to dockcheck - best effort testing.
+NOTIFY_PUSHOVER_VERSION="v0.1"
 #
 # 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.
 
-send_notification() {
-    [ -s "$ScriptWorkDir"/urls.list ] && releasenotes || Updates=("$@")
-    UpdToString=$( printf '%s\\n' "${Updates[@]}" )
-    FromHost=$(hostname)
-
-    # platform specific notification code would go here
-    printf "\nSending pushover notification\n"
-
-    MessageTitle="$FromHost - updates available."
-    # Setting the MessageBody variable here.
-    printf -v MessageBody "🐋 Containers on $FromHost with updates available:\n$UpdToString"
+FromHost=$(hostname)
 
+trigger_notification() {
     # Modify to fit your setup:
     PushoverUrl="https://api.pushover.net/1/messages.json"
     PushoverUserKey="Your Pushover User Key Here"
@@ -30,3 +22,36 @@ send_notification() {
         -F "message=$MessageBody" \
         $PushoverUrl
 }
+
+send_notification() {
+    [ -s "$ScriptWorkDir"/urls.list ] && releasenotes || Updates=("$@")
+    UpdToString=$( printf '%s\\n' "${Updates[@]}" )
+
+    # platform specific notification code would go here
+    printf "\nSending pushover 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 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,52 @@
+### DISCLAIMER: This is a third party addition to dockcheck - best effort testing.
+NOTIFY_SLACK_VERSION="v0.1"
+#
+# Copy/rename this file to notify.sh in the same directory as dockcheck.sh to enable the notification snippet.
+# Setu app and token at https://api.slack.com/tutorials/tracks/posting-messages-with-curl
+# Add your AccessToken and ChannelID below
+
+FromHost=$(hostname)
+
+trigger_notification() {
+    # Modify to fit your setup:
+    AccessToken="xoxb-not-a-real-token-this-will-not-work"
+    ChannelID="C123456"
+    SlackUrl="https://slack.com/api/chat.postMessage"
+
+    curl -sS -o /dev/null --show-error --fail \
+      -d "text=$MessageBody" -d "channel=$ChannelID" \
+      -H "Authorization: Bearer $AccessToken" \
+      -X POST $SlackUrl
+}
+
+send_notification() {
+    [ -s "$ScriptWorkDir"/urls.list ] && releasenotes || Updates=("$@")
+    UpdToString=$( printf '%s\\n' "${Updates[@]}" )
+
+    printf "\nSending Slack 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 Slack 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_slack.sh"
+    LatestNotifyRelease="$(curl -s -r 0-150 $RawNotifyUrl | sed -n "/NOTIFY_SLACK_VERSION/s/NOTIFY_SLACK_VERSION=//p" | tr -d '"')"
+    if [[ "$NOTIFY_SLACK_VERSION" != "$LatestNotifyRelease" ]] ; then
+        printf -v NotifyUpdate "\n\nnotify_slack.sh update avialable:\n $NOTIFY_SLACK_VERSION -> $LatestNotifyRelease\n"
+        MessageBody="${MessageBody}${NotifyUpdate}"
+    fi
+
+    trigger_notification
+}

notify_templates/notify_smtp.sh

@@ -1,4 +1,5 @@
 ### DISCLAIMER: This is a third party addition to dockcheck - best effort testing.
+NOTIFY_SMTP_VERSION="v0.1"
 # INFO: ssmtp is depcerated - consider to use msmtp instead.
 #
 # Copy/rename this file to notify.sh to enable the notification snipppet.
@@ -16,25 +17,19 @@ else
 	echo "No msmtp or ssmtp binary found in PATH: $PATH" ; exit 1
 fi
 
-send_notification() {
-[ -s "$ScriptWorkDir"/urls.list ] && releasenotes || Updates=("$@")
-UpdToString=$( printf '%s\\n' "${Updates[@]}" )
 FromHost=$(hostname)
 
+trigger_notification() {
 # User variables:
 SendMailFrom="me@mydomain.tld"
 SendMailTo="me@mydomain.tld"
 SubjectTag="dockcheck"
 
-printf "\nSending email notification.\n"
-
-printf -v MessageBody "🐋 Containers on $FromHost with updates available:\n\n$UpdToString"
-
 $MailPkg $SendMailTo << __EOF
 From: "$FromHost" <$SendMailFrom>
 date:$(date -R)
 To: <$SendMailTo>
-Subject: [$SubjectTag] Updates available on $FromHost
+Subject: [$SubjectTag] $MessageTitle $FromHost
 Content-Type: text/plain; charset=UTF-8; format=flowed
 Content-Transfer-Encoding: 7bit
 
@@ -42,3 +37,35 @@ $MessageBody
 
 __EOF
 }
+
+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"
+
+    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,20 +1,13 @@
 ### DISCLAIMER: This is a third party addition to dockcheck - best effort testing.
+NOTIFY_TELEGRAM_VERSION="v0.1"
 #
 # 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.
 
-send_notification() {
-    [ -s "$ScriptWorkDir"/urls.list ] && releasenotes || Updates=("$@")
-    UpdToString=$( printf '%s\\n' "${Updates[@]}" )
-    FromHost=$(hostname)
-
-    # platform specific notification code would go here
-    printf "\nSending Telegram notification\n"
-
-    # Setting the MessageBody variable here.
-    MessageBody="🐋 Containers on $FromHost with updates available: \n$UpdToString"
+FromHost=$(hostname)
 
+trigger_notification() {
     # Modify to fit your setup:
     TelegramToken="Your Telegram token here"
     TelegramChatId="Your Telegram ChatId here"
@@ -23,5 +16,36 @@ send_notification() {
     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"
-
+}
+
+send_notification() {
+    [ -s "$ScriptWorkDir"/urls.list ] && releasenotes || Updates=("$@")
+    UpdToString=$( printf '%s\\n' "${Updates[@]}" )
+
+    # platform specific notification code would go here
+    printf "\nSending Telegram notification\n"
+
+    # 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 Telegram dockcheck notification\n"
+
+    MessageTitle="$FromHost - New version of dockcheck available."
+    # Setting the MessageBody variable here.
+    printf -v MessageBody "$FromHost - New version of dockcheck available.\n\nInstalled version: $1 \nLatest version: $2 \n\nChangenotes: $3"
+
+    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
 }