versionbump

local image check changed, Gotify-template fixed

README.md

@@ -18,6 +18,8 @@
 ___
 ## :bell: Changelog
 
+- **v0.5.3**: 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.5.0**: Rewritten notify logic - all templates are adjusted and should be migrated!
     - Copy the custom settings from your current template to the new version of the same template.
@@ -26,9 +28,6 @@ ___
         - Added Discord notify template.
         - Verbosity changed of `regctl`.
 - **v0.4.9**: Added a function to enrich the notify-message with release note URLs. See [Release notes addon](https://github.com/mag37/dockcheck#date-release-notes-addon-to-notifications)
-- **v0.4.8**: Rewrote prune logic to not prompt with options `-a|-y` or `-n`. Auto prune with `-p`.
-- **v0.4.7**: Notification Template changes to gotify(new!), DSM(improved), SMTP(deprecation alternative).
-- **v0.4.6**: Compatibility changes to timeout, due to busybox.
 ___
 
 
@@ -57,7 +56,6 @@ Options:"
 -v     Prints current version.
 ```
 
-
 ### Basic example:
 ```
 $ ./dockcheck.sh
@@ -82,6 +80,8 @@ ___
 ## :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
+- [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))  
   - User will be prompted to download `regctl` if not in `PATH` or `PWD`.  
   - regctl requires `amd64/arm64` - see [workaround](#roller_coaster-workaround-for-non-amd64--arm64) if other architecture is used.

dockcheck.sh

@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
-VERSION="v0.5.1"
-# ChangeNotes: DEPENDENCY WARNING: now requires jq. And upstreaming changes from sudo-kraken/podcheck
+VERSION="v0.5.3.0"
+### ChangeNotes: Bugfixes - local image check changed, Gotify-template fixed
 Github="https://github.com/mag37/dockcheck"
 RawUrl="https://raw.githubusercontent.com/mag37/dockcheck/main/dockcheck.sh"
 
@@ -173,27 +173,64 @@ SearchName="$1"
 # Create array of excludes
 IFS=',' read -r -a Excludes <<< "$Exclude" ; unset IFS
 
-# Check if required binary exists in PATH or directory
+# Static binary downloader for dependencies
+binary_downloader() {
+  BinaryName="$1"
+  BinaryUrl="$2"
+  case "$(uname --machine)" in
+    x86_64|amd64) architecture="amd64" ;;
+    arm64|aarch64) architecture="arm64";;
+    *) 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" ; 
+  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="dnf install"
+  elif [[ -f /etc/SuSE-release ]] ; then PkgInstaller="zypper install"
+  elif [[ -f /etc/debian_version ]] ; then PkgInstaller="apt-get install"
+  else PkgInstaller="ERROR" ; printf "\n%bNo distribution could be determined%b, falling back to static binary.\n" "$c_yellow" "$c_reset"
+  fi
+}
+
+# Dependency check for jq in PATH or directory
+if [[ $(command -v jq) ]]; then jqbin="jq" ;
+elif [[ -f "$ScriptWorkDir/jq" ]]; then jqbin="$ScriptWorkDir/jq" ;
+else
+  printf "%s\n" "Required dependency 'jq' missing, do you want to install it?"
+  read -r -p "y: With packagemanager (sudo). / s: Download static binary. y/s/[n] " GetJq
+  GetJq=${GetJq:-no} # set default to no if nothing is given
+  if [[ "$GetJq" =~ [yYsS] ]] ; then
+    [[ "$GetJq" =~ [yY] ]] && distro_checker
+    if [[ -n "$PkgInstaller" && "$PkgInstaller" != "ERROR" ]] ; then 
+      (sudo $PkgInstaller jq) ; PkgExitcode="$?"
+      [[ "$PkgExitcode" == 0 ]] && jqbin="jq" || printf "\n%bPackagemanager install failed%b, falling back to static binary.\n" "$c_yellow" "$c_reset"
+    fi
+    if [[ "$GetJq" =~ [nN] || "$PkgInstaller" == "ERROR" || "$PkgExitcode" != 0 ]] ; then
+        binary_downloader "jq" "https://github.com/jqlang/jq/releases/latest/download/jq-linux-TEMP"
+        [[ -f "$ScriptWorkDir/jq" ]] && jqbin="$ScriptWorkDir/jq" 
+    fi
+  else printf "\n%bDependency missing, exiting.%b\n" "$c_red" "$c_reset" ; exit 1 ;
+  fi
+fi
+# Final check if binary is correct
+$jqbin --version &> /dev/null  || { printf "%s\n" "jq is not working - try to remove it and re-download it, exiting."; exit 1; }
+
+# Dependency check for regctl in PATH or directory
 if [[ $(command -v regctl) ]]; then regbin="regctl" ;
 elif [[ -f "$ScriptWorkDir/regctl" ]]; then regbin="$ScriptWorkDir/regctl" ;
 else
-  read -r -p "Required dependency 'regctl' missing, do you want it downloaded? y/[n] " GetDep
-  if [[ "$GetDep" =~ [yY] ]] ; then
-    # Check architecture
-    case "$(uname --machine)" in
-      x86_64|amd64) architecture="amd64" ;;
-      arm64|aarch64) architecture="arm64";;
-      *) echo "Architecture not supported, exiting." ; exit 1;;
-    esac
-    RegUrl="https://github.com/regclient/regclient/releases/latest/download/regctl-linux-$architecture"
-    if [[ $(command -v curl) ]]; then curl -L $RegUrl > "$ScriptWorkDir/regctl" ; chmod +x "$ScriptWorkDir/regctl" ; regbin="$ScriptWorkDir/regctl" ;
-    elif [[ $(command -v wget) ]]; then wget $RegUrl -O "$ScriptWorkDir/regctl" ; chmod +x "$ScriptWorkDir/regctl" ; regbin="$ScriptWorkDir/regctl" ;
-    else
-      printf "%s\n" "curl/wget not available - get regctl manually from the repo link, quitting."
-    fi
-  else
-    printf "%s\n" "Dependency missing, quitting."
-    exit 1
+  read -r -p "Required dependency 'regctl' missing, do you want it downloaded? y/[n] " GetRegctl
+  if [[ "$GetRegctl" =~ [yY] ]] ; then
+    binary_downloader "regctl" "https://github.com/regclient/regclient/releases/latest/download/regctl-linux-TEMP"
+    [[ -f "$ScriptWorkDir/regctl" ]] && regbin="$ScriptWorkDir/regctl" 
+  else printf "\n%bDependency missing, exiting.%b\n" "$c_red" "$c_reset" ; exit 1 ;
   fi
 fi
 # Final check if binary is correct
@@ -210,12 +247,6 @@ else
   exit 1
 fi
 
-# Check for jq binary
-if [[ ! $(command -v jq) ]] ; then
-  printf "%s\n" "No jq binary, please install jq and try again, exiting."
-  exit 1
-fi
-
 # Numbered List function
 options() {
 num=1
@@ -253,8 +284,9 @@ for i in $(docker ps $Stopped --filter "name=$SearchName" --format '{{.Names}}')
   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
+  ImageId=$(docker inspect "$i" --format='{{.Image}}')
   RepoUrl=$(docker inspect "$i" --format='{{.Config.Image}}')
-  LocalHash=$(docker image inspect "$RepoUrl" --format '{{.RepoDigests}}')
+  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
@@ -315,17 +347,17 @@ if [ -n "$GotUpdates" ] ; then
       # Extract labels and metadata
       ContLabels=$(docker inspect "$i" --format '{{json .Config.Labels}}')
       ContImage=$(docker inspect "$i" --format='{{.Config.Image}}')
-      ContPath=$(jq -r '."com.docker.compose.project.working_dir"' <<< "$ContLabels")
+      ContPath=$($jqbin -r '."com.docker.compose.project.working_dir"' <<< "$ContLabels")
       [ "$ContPath" == "null" ] && ContPath=""
-      ContConfigFile=$(jq -r '."com.docker.compose.project.config_files"' <<< "$ContLabels")
+      ContConfigFile=$($jqbin -r '."com.docker.compose.project.config_files"' <<< "$ContLabels")
       [ "$ContConfigFile" == "null" ] && ContConfigFile=""
-      ContName=$(jq -r '."com.docker.compose.service"' <<< "$ContLabels")
+      ContName=$($jqbin -r '."com.docker.compose.service"' <<< "$ContLabels")
       [ "$ContName" == "null" ] && ContName=""
-      ContEnv=$(jq -r '."com.docker.compose.project.environment_file"' <<< "$ContLabels")
+      ContEnv=$($jqbin -r '."com.docker.compose.project.environment_file"' <<< "$ContLabels")
       [ "$ContEnv" == "null" ] && ContEnv=""
-      ContUpdateLabel=$(jq -r '."mag37.dockcheck.update"' <<< "$ContLabels")
+      ContUpdateLabel=$($jqbin -r '."mag37.dockcheck.update"' <<< "$ContLabels")
       [ "$ContUpdateLabel" == "null" ] && ContUpdateLabel=""
-      ContRestartStack=$(jq -r '."mag37.dockcheck.restart-stack"' <<< "$ContLabels")
+      ContRestartStack=$($jqbin -r '."mag37.dockcheck.restart-stack"' <<< "$ContLabels")
       [ "$ContRestartStack" == "null" ] && ContRestartStack=""
 
       # Checking if compose-values are empty - hence started with docker run

notify_templates/notify_DSM.sh

@@ -49,4 +49,6 @@ Content-Transfer-Encoding: 7bit
 $MessageBody
  From $SenderName
 __EOF
+# This ensures DSM's container manager will also see the update
+/var/packages/ContainerManager/target/tool/image_upgradable_checker
 }

notify_templates/notify_gotify.sh

@@ -14,7 +14,7 @@ send_notification() {
 
     # Setting the MessageTitle and MessageBody variable here.
     MessageTitle="${FromHost} - updates available."
-    printf -v MessageBody "🐋 Containers on $FromHost with updates available:\n$UpdToString"
+    printf -v MessageBody "Containers on $FromHost with updates available:\n$UpdToString"
 
     # Modify to fit your setup:
     GotifyToken="Your Gotify token here"
@@ -24,6 +24,6 @@ send_notification() {
         -F "title=${MessageTitle}" \
         -F "message=${MessageBody}" \
         -F "priority=5" \
-        -X POST "${GotifyUrl}" &> /dev/null
+        -X POST "${GotifyUrl}" 1> /dev/null
 
 }