quickfix printfs

* first iteration rewriting the update logic

* formatting fixes

* Added an option to have compose up only target the specific container.
Used with either -F flag, config variable or label.

* Skipping update check on non-compose containers unless option is set

* Versionbump
Added new info and upped the version number.

README.md

@@ -11,32 +11,33 @@
 </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>
-
-<h4 align="center">For Podman - see the fork <a href="https://github.com/sudo-kraken/podcheck">sudo-kraken/podcheck</a>!</h4>
+<h3 align="center">selective updates, exclude containers, custom labels, notification plugins, prune when done etc.</h3>
 
 <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.6.4**: Restructured the update process - first pulls all updates, then recreates all containers.
+    - Added logic to skip update check on non-compose containers (unless `-r` option).
+    - Added option `-F` to revert to `compose up -d <ContainerName>` targeting specific container and not the stack.
+        - Also added corresponding label and config-option.
+    - Added markdown formatting to `notify_ntfy-sh.sh` template.
+- **v0.6.3**: Some fixes and changes:
+    - Stops when a container recreation (compose up -d) fails, also `up`s the whole stack now.
+    - `-M`, Markdown format url-releasenotes in notification (requires template rework, look at gotify!)
+    - Added [addons/DSM/README.md](./addons/DSM/README.md) for more info Synology DSM info.
+    - Permission checks - graceful exit if no docker permissions + checking if root for pkg-manager.
+- **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.
-- **v0.5.8**: Added version checks to all templates and a notification if a new template is released.
-- **v0.5.7**: Rewritten templates - now with a function to notify when there's a new Dockcheck release.
-    - Manually migrate your current `notify.sh` settings to a new template for new functionality.
-- **v0.5.6.1**: Async xargs hotfix - due to errors `failed to request manifest head ... context canceled`
-    - Defaulted subprocess to 1 with `MaxAsync=1`, increase to find a stable value in your environment.
-    - Added `-x N` option to pass `MaxAsync` value at runtime.
-    - To disable xargs `-P` flag (max processes) all together, set `MaxAsync` to 0.
-- **v0.5.6.0**: Heavily improved performance due to async checking for updates.
 ___
 
 
@@ -46,23 +47,27 @@ ___
 ```
 $ ./dockcheck.sh -h
 Syntax:     dockcheck.sh [OPTION] [part of name to filter]
-Example:    dockcheck.sh -y -d 10 -e nextcloud,heimdall
+Example:    dockcheck.sh -y -x 10 -d 10 -e nextcloud,heimdall
 
 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 (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.
 -s     Include stopped containers in the check. (Logic: docker ps -a).
 -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.
 ```
@@ -121,9 +126,9 @@ 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!  
-Will also send a notification when `dockcheck.sh` itself has an update.
 
 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)  
 **Current templates:**
@@ -144,9 +149,13 @@ Use a `notify_X.sh` template file from the **notify_templates** directory, copy
 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.  
+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:
@@ -162,26 +171,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 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:
 ```
     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.
@@ -242,6 +272,7 @@ dockcheck is created and released under the [GNU GPL v3.0](https://www.gnu.org/l
 
 - [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

@@ -6,15 +6,20 @@
 # This will not be replaced on updates
 
 #Timeout=10    # Set a timeout (in seconds) per container for registry checkups.
-#MaxAsync=1    # Set max asynchronous subprocesses, 1 default, 0 to disable.
+#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=false    # Auto-Prune dangling images after update.
-#Notify=false    # Inform - send a preconfigured notification.
+#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=false    # Only update if label is set. See readme.
-#ForceRestartStacks=false    # Force stack restart after update. Caution.
-#DRunUp=false    # Allow updating images for docker run, wont update the container.
+#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).

dockcheck.sh

@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
-VERSION="v0.6.1"
-### ChangeNotes: Hotfix - bug with xargs pipefail, pkgmanager logic, unbound variables
+VERSION="v0.6.4"
+### ChangeNotes: Restructured update process - first pulls all images, then recreates all containers. Added -F option.
 Github="https://github.com/mag37/dockcheck"
 RawUrl="https://raw.githubusercontent.com/mag37/dockcheck/main/dockcheck.sh"
 
@@ -27,23 +27,27 @@ fi
 # Help Function
 Help() {
   echo "Syntax:     dockcheck.sh [OPTION] [part of name to filter]"
-  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 (requires urls.list)."
   echo "-l     Only update if label is set. See readme."
-  echo "-m     Monochrome mode, no printf colour codes."
+  echo "-m     Monochrome mode, no printf colour codes and hides progress bar."
+  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 "-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
@@ -57,14 +61,20 @@ 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=false
+SpecificContainer=${SpecificContainer:=""}
 Excludes=()
 GotUpdates=()
 NoUpdates=()
@@ -81,23 +91,27 @@ c_blue="\033[0;34m"
 c_teal="\033[0;36m"
 c_reset="\033[0m"
 
-while getopts "aynpfrhlisvmc:e:d:t:x:" options; do
+while getopts "ayfFhiIlmMnprsuvc:e:d:t:x:" options; do
   case "${options}" in
     a|y) AutoMode=true ;;
     c)   CollectorTextFileDirectory="${OPTARG}" ;;
-    n)   DontUpdate=true; AutoMode=true;;
-    r)   DRunUp=true ;;
-    p)   AutoPrune=true ;;
-    l)   OnlyLabel=true ;;
-    f)   ForceRestartStacks=true ;;
-    i)   Notify=true ;;
+    d)   DaysOld=${OPTARG} ;;
     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}" ;;
+    u)   AutoSelfUpdate=true ;;
     v)   printf "%s\n" "$VERSION"; exit 0 ;;
     x)   MaxAsync=${OPTARG} ;;
-    d)   DaysOld=${OPTARG} ;;
     h|*) Help; exit 2 ;;
   esac
 done
@@ -108,6 +122,7 @@ 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"
@@ -137,30 +152,30 @@ self_update_curl() {
   cp "$ScriptPath" "$ScriptPath".bak
   if command -v curl &>/dev/null; then
     curl -L $RawUrl > "$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
   elif command -v wget &>/dev/null; then
     wget $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 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 &>/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 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
 }
@@ -184,9 +199,6 @@ choosecontainers() {
       done
     fi
   done
-  printf "\nUpdating containers:\n"
-  printf "%s\n" "${SelectedUpdates[@]}"
-  printf "\n"
 }
 
 datecheck() {
@@ -218,12 +230,18 @@ progress_bar() {
 
 # Function to add user-provided urls to releasenotes
 releasenotes() {
+  unset Updates
   for update in "${GotUpdates[@]}"; do
     found=false
     while read -r container url; do
-      if [[ "$update" == "$container" ]]; then Updates+=("$update  ->  $url"); found=true; fi
+      if [[ "$update" == "$container" ]] && [[ "$PrintMarkdownURL" == true ]]; then Updates+=("- [$update]($url)"); found=true;
+      elif [[ "$update" == "$container" ]]; then Updates+=("$update  ->  $url"); found=true;
+      fi
     done < "${ScriptWorkDir}/urls.list"
-    if [[ "$found" == false ]]; then Updates+=("$update  ->  url missing"); else continue; fi
+    if [[ "$found" == false ]] && [[ "$PrintMarkdownURL" == true ]]; then Updates+=("- $update  ->  url missing");
+    elif [[ "$found" == false ]]; then Updates+=("$update  ->  url missing");
+    else continue;
+    fi
   done
 }
 
@@ -239,16 +257,24 @@ binary_downloader() {
   GetUrl="${BinaryUrl/TEMP/"$architecture"}"
   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;
+  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"
-  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"
+  isRoot=false
+  [[ ${EUID:-} == 0 ]] && isRoot=true
+  if [[ -f /etc/alpine-release ]] ; then
+    [[ "$isRoot" == true ]] && PkgInstaller="apk add" || PkgInstaller="doas apk add"
+  elif [[ -f /etc/arch-release ]]; then
+    [[ "$isRoot" == true ]] && PkgInstaller="pacman -S" || PkgInstaller="sudo pacman -S"
+  elif [[ -f /etc/debian_version ]]; then
+    [[ "" == 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
@@ -262,7 +288,7 @@ dependency_check() {
   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?"
+    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
@@ -274,13 +300,13 @@ dependency_check() {
           export "$AppVar"="$AppName"
           printf "\n%b%b installed.%b\n" "$c_green" "$AppName" "$c_reset"
         else
-          PkgExitcode="ERROR"
+          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" ]]; then
+      if [[ "$GetBin" =~ [sS] ]] || [[ "$PkgInstaller" == "ERROR" ]]; then
           binary_downloader "$AppName" "$AppUrl"
-          [[ -f "$ScriptWorkDir/$AppName" ]] && { export "$AppVar"="$ScriptWorkDir/$1" && printf "\n%b%b downloaded.%b\n" "$c_green" "$AppName" "$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;
     fi
@@ -292,13 +318,14 @@ dependency_check() {
 }
 
 # Numbered List function
-options() {
+# if urls.list exists add release note url per line
+list_options() {
   num=1
-  for i in "${GotUpdates[@]}"; do
-    echo "$num) $i"
+  for update in "${Updates[@]}"; do
+    echo "$num) $update"
     ((num++))
   done
-  }
+}
 
 # Version check & initiate self update
 if [[ "$VERSION" != "$LatestRelease" ]]; then
@@ -306,6 +333,7 @@ if [[ "$VERSION" != "$LatestRelease" ]]; then
   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
@@ -315,6 +343,7 @@ dependency_check "regctl" "regbin" "https://github.com/regclient/regclient/relea
 dependency_check "jq" "jqbin" "https://github.com/jqlang/jq/releases/latest/download/jq-linux-TEMP"
 
 # Check docker compose binary
+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; }
 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
@@ -357,6 +386,15 @@ check_image() {
     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}}')
@@ -381,20 +419,20 @@ check_image() {
 # 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
+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#* }
@@ -419,8 +457,8 @@ unset IFS
 
 # Run the prometheus exporter function
 if [[ -n "${CollectorTextFileDirectory:-}" ]]; then
-  if type -t send_notification &>/dev/null; then
-    prometheus_exporter ${#NoUpdates[@]:-} ${#GotUpdates[@]:-} ${#GotErrors[@]:-}
+  if type -t prometheus_exporter &>/dev/null; then
+    prometheus_exporter ${#NoUpdates[@]} ${#GotUpdates[@]} ${#GotErrors[@]}
   else
     printf "%s\n" "Could not source prometheus exporter function."
   fi
@@ -440,9 +478,10 @@ if [[ -n ${GotErrors[*]:-} ]]; then
   printf "%binfo:%b 'unauthorized' often means not found in a public registry.\n" "$c_blue" "$c_reset"
 fi
 if [[ -n ${GotUpdates[*]:-} ]]; then
-   printf "\n%bContainers with updates available:%b\n" "$c_yellow" "$c_reset"
-   [[ "$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"; }
+  printf "\n%bContainers with updates available:%b\n" "$c_yellow" "$c_reset"
+  if [[ -s "$ScriptWorkDir/urls.list" ]] && [[ "$PrintReleaseURL" == true ]]; then releasenotes; else Updates=("${GotUpdates[@]}"); fi
+  [[ "$AutoMode" == false ]] && list_options || printf "%s\n" "${Updates[@]}"
+  [[ "$Notify" == true ]] && { type -t send_notification &>/dev/null && send_notification "${GotUpdates[@]}" || printf "\nCould not source notification function.\n"; }
 fi
 
 # Optionally get updates if there's any
@@ -454,10 +493,41 @@ if [[ -n "${GotUpdates:-}" ]]; then
     SelectedUpdates=( "${GotUpdates[@]}" )
   fi
   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[@]}"
-    do
+    for i in "${SelectedUpdates[@]}"; do
+      ((CurrentQue+=1))
+      printf "\n%bNow updating (%s/%s): %b%s%b\n" "$c_teal" "$CurrentQue" "$NumberofUpdates" "$c_blue" "$i" "$c_reset"
+      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=""
+      ContUpdateLabel=$($jqbin -r '."mag37.dockcheck.update"' <<< "$ContLabels")
+      [[ "$ContUpdateLabel" == "null" ]] && ContUpdateLabel=""
+      # Checking if Label Only -option is set, and if container got the label
+      [[ "$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 [[ "$DRunUp" == true ]]; then
+          docker pull "$ContImage"
+          printf "%s\n" "$i got a new image downloaded, rebuild manually with preferred 'docker run'-parameters"
+        else
+          printf "\n%b%s%b has no compose labels, probably started with docker run - %bskipping%b\n\n" "$c_yellow" "$i" "$c_reset" "$c_yellow" "$c_reset"
+        fi
+        continue
+      fi
+
+      docker pull "$ContImage" || { printf "\n%bDocker error, exiting!%b\n" "$c_red" "$c_reset" ; exit 1; }
+    done
+    printf "\n%bDone pulling updates. %bRecreating updated containers.%b\n" "$c_green" "$c_blue" "$c_reset"
+
+    CurrentQue=0
+    for i in "${SelectedUpdates[@]}"; do
       ((CurrentQue+=1))
       unset CompleteConfs
       # Extract labels and metadata
@@ -475,42 +545,37 @@ if [[ -n "${GotUpdates:-}" ]]; then
       [[ "$ContUpdateLabel" == "null" ]] && ContUpdateLabel=""
       ContRestartStack=$($jqbin -r '."mag37.dockcheck.restart-stack"' <<< "$ContLabels")
       [[ "$ContRestartStack" == "null" ]] && ContRestartStack=""
+      ContOnlySpecific=$($jqbin -r '."mag37.dockcheck.only-specific-container"' <<< "$ContLabels")
+      [[ "$ContRestartStack" == "null" ]] && ContRestartStack=""
 
       # Checking if compose-values are empty - hence started with docker run
-      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
-          printf "\n%b%s%b has no compose labels, probably started with docker run - %bskipping%b\n\n" "$c_yellow" "$i" "$c_reset" "$c_yellow" "$c_reset"
-        fi
-        continue
-      fi
+      [[ -z "$ContPath" ]] && continue
+
       # 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)
       else
         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" || { 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
       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
+
+      printf "\n%bNow recreating (%s/%s): %b%s%b\n" "$c_teal" "$CurrentQue" "$NumberofUpdates" "$c_blue" "$i" "$c_reset"
       # Check if the whole stack should be restarted
       if [[ "$ContRestartStack" == true ]] || [[ "$ForceRestartStacks" == true ]]; then
-        ${DockerBin} ${CompleteConfs} stop; ${DockerBin} ${CompleteConfs} ${ContEnvs} up -d
+        ${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 ${ContName}
+        ${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 [[ "$AutoPrune" == false ]] && [[ "$AutoMode" == false ]]; then read -r -p "Would you like to prune dangling images? y/[n]: " AutoPrune; fi
-    if [[ "$AutoPrune" == true ]] || [[ "$AutoPrune" =~ [yY] ]]; then docker image prune -f; fi
   else
     printf "\nNo updates installed, exiting.\n"
   fi

notify_templates/notify_gotify.sh

@@ -1,5 +1,5 @@
 ### DISCLAIMER: This is a third party addition to dockcheck - best effort testing.
-NOTIFY_GOTIFY_VERSION="v0.1"
+NOTIFY_GOTIFY_VERSION="v0.2"
 #
 # Copy/rename this file to notify.sh to enable the notification snippet.
 # Required receiving services must already be set up.
@@ -12,11 +12,19 @@ trigger_notification() {
     GotifyToken="Your Gotify token here"
     GotifyUrl="https://api.gotify/message?token=${GotifyToken}"
 
-    curl \
-        -F "title=${MessageTitle}" \
-        -F "message=${MessageBody}" \
-        -F "priority=5" \
-        -X POST "${GotifyUrl}" 1> /dev/null
+    if [[ "$PrintMarkdownURL" == true ]]; then
+        ContentType="text/markdown"
+    else
+        ContentType="text/plain"
+    fi
+
+    JsonData=$( jq -n \
+                  --arg body "$MessageBody" \
+                  --arg title "$MessageTitle" \
+                  --arg type "$ContentType" \
+                  '{message: $body, title: $title, priority: 5, extras: {"client::display": {"contentType": $type}}}' )
+
+    curl -s -S --data "${JsonData}" -H 'Content-Type: application/json' -X POST "${GotifyUrl}" 1> /dev/null
 }
 
 send_notification() {

notify_templates/notify_ntfy-sh.sh

@@ -1,5 +1,5 @@
 ### DISCLAIMER: This is a third party addition to dockcheck - best effort testing.
-NOTIFY_NTFYSH_VERSION="v0.1"
+NOTIFY_NTFYSH_VERSION="v0.2"
 #
 # Copy/rename this file to notify.sh to enable the notification snippet.
 # Setup app and subscription at https://ntfy.sh
@@ -11,10 +11,17 @@ trigger_notification() {
     # Modify to fit your setup:
     NtfyUrl="ntfy.sh/YourUniqueTopicName"
 
+    if [[ "$PrintMarkdownURL" == true ]]; then
+        ContentType="Markdown: yes"
+    else
+        ContentType="Markdown: no" #text/plain
+    fi
+
     curl -sS -o /dev/null --show-error --fail \
       -H "Title: $MessageTitle" \
+      -H "$ContentType"      \
       -d "$MessageBody" \
-      $NtfyUrl
+      "$NtfyUrl"
 }
 
 send_notification() {

notify_templates/notify_telegram.sh

@@ -8,6 +8,13 @@ NOTIFY_TELEGRAM_VERSION="v0.1"
 FromHost=$(hostname)
 
 trigger_notification() {
+
+    if [[ "$PrintMarkdownURL" == true ]]; then
+        ParseMode="Markdown"
+    else
+        ParseMode="HTML"
+    fi
+
     # Modify to fit your setup:
     TelegramToken="Your Telegram token here"
     TelegramChatId="Your Telegram ChatId here"

notify_templates/urls.list

@@ -11,6 +11,12 @@ actual_server https://actualbudget.org/blog
 gotify https://github.com/gotify/server/releases
 traefik https://github.com/traefik/traefik/releases
 caddy https://github.com/caddyserver/caddy/releases
+homarr https://github.com/homarr-labs/homarr/releases
+dozzle https://github.com/amir20/dozzle/releases
+beszel https://github.com/henrygd/beszel/releases
+forgejo https://codeberg.org/forgejo/forgejo/releases
+dockge https://github.com/louislam/dockge/releases
+cup https://github.com/sergi0g/cup/releases
 
 calibre https://github.com/linuxserver/docker-calibre/releases
 calibre-web https://github.com/linuxserver/docker-calibre-web/releases
@@ -29,7 +35,15 @@ radarr https://github.com/linuxserver/docker-radarr/releases
 lidarr https://github.com/linuxserver/docker-lidarr/releases
 jellyseerr https://github.com/Fallenbagel/jellyseerr/releases
 jellyfin https://github.com/jellyfin/jellyfin/releases
+tautulli https://github.com/Tautulli/Tautulli/releases
+cleanuperr https://github.com/flmorg/cleanuperr/releases
+slskd https://github.com/slskd/slskd/releases
 
 home-assistant https://github.com/home-assistant/docker/releases
 zigbee2mqtt https://github.com/Koenkk/zigbee2mqtt/releases
 mqtt https://github.com/eclipse/mosquitto/tags
+
+bookstack https://github.com/BookStackApp/BookStack/releases
+lubelogger https://github.com/hargata/lubelog/releases
+mealie https://github.com/mealie-recipes/mealie/releases
+flatnotes https://github.com/dullage/flatnotes/releases