Merge pull request #47 from mag37/agecheck

datecheck merge.

README.md

@@ -2,7 +2,8 @@
   <img src="extras/dockcheck_logo_by_booYah187.png" width="160" title="dockcheck">
 </p>
 <p align="center"> 
-  <img src="https://img.shields.io/badge/-bash-grey?style=flat-square&logo=gnubash" alt="bash">
+  <img src="https://img.shields.io/badge/coded%20by%20Human-100%25-yellow?style=flat-square" alt="No AI!">
+  <img src="https://img.shields.io/badge/bash-4.3-green?style=flat-square&logo=gnubash" alt="bash">
   <a href="https://www.gnu.org/licenses/gpl-3.0.html"><img src="https://img.shields.io/badge/license-GPLv3-red?style=flat-square" alt="GPLv3"></a>
   <img src="https://img.shields.io/github/v/tag/mag37/dockcheck?style=flat-square&label=release" alt="release">
   <a href="https://ko-fi.com/mag37"><img src="https://img.shields.io/badge/-Ko--fi-grey?style=flat-square&logo=Ko-fi" alt="Buy me a Coffee"></a>
@@ -14,11 +15,11 @@
 <h4 align="center">With features like excluding specific containers, filter by name, auto-prune dangling images and more.</h4</h3>
 
 
-### :warning: URGENT! The 2.1 change had a breaking error - make sure you run an updated version.
-If you've had errors, inspect your containers and look for odd compose paths, volumes or ports.
-[errorCheck.sh](https://github.com/mag37/dockcheck/blob/main/errorCheck.sh) lists the important bits of each running container. If anything suspicious, recreate the container manually with `docker compose`. 
-
 ### :pushpin: Recent changes:
+- **v0.3.0**: Added a flag `-d N` to choose how many days old new images have to be before being pulled and updated.
+- **v0.2.6**: regctl check / download logic changed. Now using the scripts directory as primary location.
+- **v0.2.5**: Added a new option `-s` to include stopped containers in the check for updates.
+- **v0.2.4**: Fixed a bug with the Exclude-logic to only exclude exact matches. Added a counter.
 - **v0.2.3**: Added a self updating function (curl/git) and a ugly changenote-message for updates.
 - **v0.2.2**: Fixed breaking errors with multi-compose, odd breakage and working dir error.
 - **v0.2.1**: Added option to exclude a list of containers.
@@ -39,16 +40,18 @@ ___
 ## `dockcheck.sh`
 ```
 $ ./dockcheck.sh -h
-Syntax:     dockcheck.sh [OPTION] [part of name to filter]
+ Syntax:     dockcheck.sh [OPTION] [part of name to filter] 
-Example:    dockcheck.sh -a -e nextcloud,heimdall
+ Example:    dockcheck.sh -y -d 10 -e nextcloud,heimdall
-
+ 
-Options:
+ Options:
--h     Print this Help.
+ -h     Print this Help.
--a|y   Automatic updates, without interaction.
+ -a|y   Automatic updates, without interaction.
--n     No updates, only checking availability.
+ -n     No updates, only checking availability.
--p     Auto-Prune dangling images after update.
+ -e X   Exclude containers, separated by comma.
--e     Exclude containers, separated by comma.
+ -d N   Only update to new images that are N+ days old. Lists too recent with +prefix. 2xSlower.
--r     Allow updating images for docker run, wont update the container.
+ -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).
 ```
 
 Basic example:
@@ -78,8 +81,9 @@ After the updates are complete, you'll get prompted if you'd like to prune dangl
 Containers need to be manually stopped, removed and created again to run on the new image.
 
 ### :hammer: Known issues
-- No detailed error feedback (just skip + list what's skipped) .
+- No detailed error feedback (just skip + list what's skipped).
 - Not respecting `--profile` options when re-creating the container.
+- Not working well with containers created by Portainer.
 
 ## `dc_brief.sh`
 Just a brief, slimmed down version of the script to only print what containers got updates, no updates or errors.
@@ -88,8 +92,7 @@ Just a brief, slimmed down version of the script to only print what containers g
 dockcheck is created and released under the [GNU GPL v3.0](https://www.gnu.org/licenses/gpl-3.0-standalone.html) license.
 ___
 
-## Check out a spinoff brother-project:
+### Check out a spinoff project: [Palleri/DCW](https://github.com/Palleri/DCW) for a WebUI-front with exporters and notifications.
-### [Palleri/dockcheck-web](https://github.com/Palleri/dockcheck-web) for a WebUI-front!
 
 ## Special Thanks:
 - :bison: [t0rnis](https://github.com/t0rnis)   

dc_brief.sh

@@ -16,7 +16,7 @@ IFS=',' read -r -a Excludes <<< "$Exclude" ; unset IFS
 SearchName="$1"
 
 for i in $(docker ps --filter "name=$SearchName" --format '{{.Names}}') ; do
-  [[ " ${Excludes[*]} " =~ ${i} ]] && continue; # Skip if the container is excluded
+  for e in "${Excludes[@]}" ; do [[ "$i" == "$e" ]] && continue 2 ; done
   printf ". "
   RepoUrl=$(docker inspect "$i" --format='{{.Config.Image}}')
   LocalHash=$(docker image inspect "$RepoUrl" --format '{{.RepoDigests}}')

dockcheck.sh

@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
-VERSION="v0.2.3"
+VERSION="v0.3.0"
-### ChangeNotes: Added self-updating git/curl-function and a dirty changenote.
+### ChangeNotes: Added feature (-d N) to only update to new images that are N+ days old.
 Github="https://github.com/mag37/dockcheck"
 RawUrl="https://raw.githubusercontent.com/mag37/dockcheck/main/dockcheck.sh"
 
@@ -17,25 +17,31 @@ LatestChanges="$(curl -s -r 0-200 $RawUrl | sed -n "/ChangeNotes/s/### ChangeNot
 ### Help Function:
 Help() {
   echo "Syntax:     dockcheck.sh [OPTION] [part of name to filter]" 
-  echo "Example:    dockcheck.sh -a -e nextcloud,heimdall"
+  echo "Example:    dockcheck.sh -y -d 10 -e nextcloud,heimdall"
   echo
   echo "Options:"
   echo "-h     Print this Help."
   echo "-a|y   Automatic updates, without interaction."
   echo "-n     No updates, only checking availability."
-  echo "-e     Exclude containers, separated by comma."
+  echo "-e X   Exclude containers, separated by comma."
+  echo "-d N   Only update to new images that are N+ days old. Lists too recent with +prefix and age. 2xSlower."
   echo "-p     Auto-Prune dangling images after update."
   echo "-r     Allow updating images for docker run, wont update the container"
+  echo "-s     Include stopped containers in the check. (Logic: docker ps -a)"
 }
 
-while getopts "aynprhe:" options; do
+Stopped=""
+while getopts "aynprhse:d:" options; do
   case "${options}" in
     a|y) UpdYes="yes" ;;
-    n) UpdYes="no" ;;
+    n)   UpdYes="no" ;;
-    r) DrUp="yes" ;;
+    r)   DrUp="yes" ;;
-    p) PruneQ="yes" ;;
+    p)   PruneQ="yes" ;;
-    e) Exclude=${OPTARG} ;;
+    e)   Exclude=${OPTARG} ;;
-    h|*) Help ; exit 0 ;;
+    s)   Stopped="-a" ;;
+    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 ;;
   esac
 done
 shift "$((OPTIND-1))"
@@ -47,7 +53,6 @@ self_update_git() {
   git fetch
   [ -n "$(git diff --name-only "$ScriptUpstream" "$ScriptName")" ] && {
     printf "%s\n" "Pulling the latest version."
-   # git checkout "$ScriptUpstream"
     git pull --force
     printf "%s\n" "--- starting over with the updated version ---"
     cd - || { printf "Path error.\n" ; return ; }
@@ -100,8 +105,19 @@ choosecontainers() {
   printf "\n"
 }
 
+datecheck() {
+  ImageDate=$($regbin image inspect "$RepoUrl" --format='{{.Created}}' | cut -d" " -f1 )
+  ImageAge=$((($(date +%s) - $(date -d "$ImageDate" +%s))/86400))
+  if [ $ImageAge -gt $DaysOld ] ; then
+    return 0
+  else
+    return 1
+  fi
+}
+
+
 ### Version check & initiate self update
-[[ "$VERSION" != "$LatestRelease" ]] && { printf "New version available! Local: %s - Latest: %s \n Change Notes: %s \n" "$VERSION" "$LatestRelease" "$LatestChanges" ; self_update_select ; }
+[[ "$VERSION" != "$LatestRelease" ]] && { printf "New version available! Local: %s - Latest: %s \n Change Notes: %s \n" "$VERSION" "$LatestRelease" "$LatestChanges" ; [[ -z "$UpdYes" ]] && self_update_select ; }
 
 ### Set $1 to a variable for name filtering later.
 SearchName="$1"
@@ -110,7 +126,7 @@ IFS=',' read -r -a Excludes <<< "$Exclude" ; unset IFS
 
 ### Check if required binary exists in PATH or directory:
 if [[ $(builtin type -P "regctl") ]]; then regbin="regctl" ;
-elif [[ -f "./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
@@ -121,8 +137,8 @@ else
       *) echo "Architecture not supported, exiting." ; exit 1;;
     esac
     RegUrl="https://github.com/regclient/regclient/releases/latest/download/regctl-linux-$architecture"
-    if [[ $(builtin type -P curl) ]]; then curl -L $RegUrl > ./regctl ; chmod +x ./regctl ; regbin="./regctl" ;
+    if [[ $(builtin type -P curl) ]]; then curl -L $RegUrl > "$ScriptWorkDir/regctl" ; chmod +x "$ScriptWorkDir/regctl" ; regbin="$ScriptWorkDir/regctl" ;
-    elif [[ $(builtin type -P wget) ]]; then wget $RegUrl -O ./regctl ; chmod +x ./regctl ; regbin="./regctl" ;
+    elif [[ $(builtin type -P 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
@@ -154,15 +170,31 @@ for i in "${GotUpdates[@]}"; do
 done
 }
 
+### Listing typed exclusions:
+if [[ -n ${Excludes[*]} ]] ; then
+  printf "\n\033[0;34mExcluding these names:\033[0m\n"
+  printf "%s\n" "${Excludes[@]}"
+  printf "\n"
+fi
+
 ### Check the image-hash of every running container VS the registry
-for i in $(docker ps --filter "name=$SearchName" --format '{{.Names}}') ; do
+for i in $(docker ps $Stopped --filter "name=$SearchName" --format '{{.Names}}') ; do
-  [[ " ${Excludes[*]} " =~ ${i} ]] && continue; # Skip if the container is excluded
+  ### Looping every item over the list of excluded names and skipping:
+  for e in "${Excludes[@]}" ; do [[ "$i" == "$e" ]] && continue 2 ; done 
   printf ". "
   RepoUrl=$(docker inspect "$i" --format='{{.Config.Image}}')
   LocalHash=$(docker image inspect "$RepoUrl" --format '{{.RepoDigests}}')
   ### Checking for errors while setting the variable:
   if RegHash=$($regbin image digest --list "$RepoUrl" 2>/dev/null) ; then
-    if [[ "$LocalHash" = *"$RegHash"* ]] ; then NoUpdates+=("$i"); else GotUpdates+=("$i"); fi
+    if [[ "$LocalHash" = *"$RegHash"* ]] ; then 
+      NoUpdates+=("$i") 
+    else 
+      if [[ -n "$DaysOld" ]] && ! datecheck ; then
+        NoUpdates+=("+$i ${ImageAge}d") 
+      else 
+        GotUpdates+=("$i")
+      fi
+    fi
   else
     GotErrors+=("$i")
   fi
@@ -200,8 +232,11 @@ if [ -n "$GotUpdates" ] ; then
     SelectedUpdates=( "${GotUpdates[@]}" )
   fi
   if [ "$UpdYes" == "${UpdYes#[Nn]}" ] ; then
+    NumberofUpdates="${#SelectedUpdates[@]}"
+    CurrentQue=0
     for i in "${SelectedUpdates[@]}"
     do
+      ((CurrentQue+=1))
       unset CompleteConfs
       ContPath=$(docker inspect "$i" --format '{{ index .Config.Labels "com.docker.compose.project.working_dir" }}')
       ContConfigFile=$(docker inspect "$i" --format '{{ index .Config.Labels "com.docker.compose.project.config_files" }}')
@@ -226,6 +261,7 @@ if [ -n "$GotUpdates" ] ; then
       fi
       ### cd to the compose-file directory to account for people who use relative volumes, eg - ${PWD}/data:data
       cd "$ContPath" || { echo "Path error - skipping $i" ; continue ; }
+      printf "\n\033[0;36mNow updating (%s/%s): \033[0;34m%s\033[0m\n" "$CurrentQue" "$NumberofUpdates" "$i"
       docker pull "$ContImage"
       ### Reformat for multi-compose:
       IFS=',' read -r -a Confs <<< "$ComposeFile" ; unset IFS