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

@@ -20,6 +20,16 @@
 ___
 ## :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`)
@@ -28,11 +38,6 @@ ___
     - 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.
-
 ___
 
 
@@ -42,19 +47,21 @@ ___
 ```
 $ ./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 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.
@@ -147,6 +154,7 @@ There's a function to use a lookup-file to add release note URL's to the notific
 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:
 ```
@@ -165,6 +173,11 @@ Change the default value by editing the `MaxAsync=N` variable in `dockcheck.sh`.
 
 ## :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:
@@ -192,11 +205,13 @@ See [discussion here](https://github.com/mag37/dockcheck/discussions/145).
 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.
@@ -257,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

@@ -17,7 +17,9 @@
 #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.
+#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.2"
+VERSION="v0.6.4"
-### ChangeNotes: Added options: -u; auto self update. -I; print release URL, +style and colour fixes.
+### 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,19 +27,21 @@ 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 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."
@@ -66,10 +68,13 @@ 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=()
@@ -86,17 +91,19 @@ c_blue="\033[0;34m"
 c_teal="\033[0;36m"
 c_reset="\033[0m"
 
-while getopts "ayfhiIlmnprsuvc: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}" ;;
     d)   DaysOld=${OPTARG} ;;
     e)   Exclude=${OPTARG} ;;
     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 ;;
@@ -192,9 +199,6 @@ choosecontainers() {
       done
     fi
   done
-  printf "\n%bUpdating container(s):%b\n" "$c_blue" "$c_reset"
-  printf "%s\n" "${SelectedUpdates[@]}"
-  printf "\n"
 }
 
 datecheck() {
@@ -226,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
 }
 
@@ -247,17 +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="sudo pacman -S"
+  isRoot=false
-  elif [[ -f /etc/redhat-release ]]; then PkgInstaller="sudo dnf install"
+  [[ ${EUID:-} == 0 ]] && isRoot=true
-  elif [[ -f /etc/SuSE-release ]]; then PkgInstaller="sudo zypper install"
+  if [[ -f /etc/alpine-release ]] ; then
-  elif [[ -f /etc/debian_version ]]; then PkgInstaller="sudo apt-get install"
+    [[ "$isRoot" == true ]] && PkgInstaller="apk add" || PkgInstaller="doas apk add"
-  elif [[ -f /etc/alpine-release ]] ; then 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
@@ -271,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
@@ -289,7 +306,7 @@ dependency_check() {
       fi
       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
@@ -302,9 +319,8 @@ dependency_check() {
 
 # Numbered List function
 # if urls.list exists add release note url per line
-options() {
+list_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++))
@@ -327,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
@@ -369,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}}')
@@ -393,14 +419,14 @@ 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
@@ -453,8 +479,9 @@ if [[ -n ${GotErrors[*]:-} ]]; then
 fi
 if [[ -n ${GotUpdates[*]:-} ]]; then
   printf "\n%bContainers with updates available:%b\n" "$c_yellow" "$c_reset"
-   [[ "$AutoMode" == false ]] && options || printf "%s\n" "${GotUpdates[@]}"
+  if [[ -s "$ScriptWorkDir/urls.list" ]] && [[ "$PrintReleaseURL" == true ]]; then releasenotes; else Updates=("${GotUpdates[@]}"); fi
-   [[ "$Notify" == true ]] && { type -t send_notification &>/dev/null && send_notification "${GotUpdates[@]}" || printf "Could not source notification function.\n"; }
+  [[ "$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
@@ -466,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[@]}"
+    for i in "${SelectedUpdates[@]}"; do
-    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
@@ -487,17 +545,12 @@ 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
+      [[ -z "$ContPath" ]] && continue
-        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
       # cd to the compose-file directory to account for people who use relative volumes
       cd "$ContPath" || { printf "\n%bPath error - skipping%b %s" "$c_red" "$c_reset" "$i"; continue; }
       ## Reformatting path + multi compose
@@ -506,22 +559,22 @@ if [[ -n "${GotUpdates:-}" ]]; then
       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 read -rep "\nWould you like to prune dangling images? y/[n]: " AutoPrune; fi
+    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 docker image prune -f; 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"
   else
     printf "\nNo updates installed, exiting.\n"

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 \
+    if [[ "$PrintMarkdownURL" == true ]]; then
-        -F "title=${MessageTitle}" \
+        ContentType="text/markdown"
-        -F "message=${MessageBody}" \
+    else
-        -F "priority=5" \
+        ContentType="text/plain"
-        -X POST "${GotifyUrl}" 1> /dev/null
+    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