Moving the label logic to earlier in the process - at check level

README.md

@@ -22,22 +22,6 @@
 ___
 ## Changelog
 
-- **v0.7.4**:
-    - Added new option `-R`:
-      - Will skip container recreation after pulling images.
-      - Allows for more control and possible pipeline integration.
-    - Fixes:
-      - Bugfix for *value too great* error due to leading zeroes - solved with base10 conversion.
-      - Clean up of some legacy readme sections.
-- **v0.7.3**: Bugfix - unquoted variable in printf list caused occasional issues.
-- **v0.7.2**:
-    - Label rework:
-      - Moved up label logic to work globally on the current run.
-      - Only iterating on labeled containers when used with `-l` option, not listing others.
-      - Clarified messaging and readme/help texts.
-    - List reformatting for "available updates" numbering to easier highlight and copy:
-      - Padded with zero, changed `)` to `-`, example: `02 - homer`
-      - Can be selected by writing `2,3,4` or `02,03,04`.
 - **v0.7.1**:
     - Added support for multiple notifications using the same template
     - Added support for notification output format
@@ -48,6 +32,22 @@ ___
       - `<channel>_CONTAINERSONLY` : Only notify for docker container related updates
       - `<channel>_ALLOWEMPTY` : Always send notifications, even when empty
       - `<channel>_OUTPUT` : Define output format
+- **v0.7.0**:
+    - Bugfix: snooze dockcheck.sh-self-notification and some config clarification.
+    - Added authentication support to Ntfy.sh.
+    - Added suport for sendmail in the SMTP-template.
+- **v0.6.9**:
+    - Bugfix: label logic didn't skip recreation (skipped pulling).
+    - Added comma separated search filtering so you can selectively search exactly which containers to check/update.
+      - eg: `dockcheck.sh -yp homer,dozzle`
+- **v0.6.8**:
+    - Bugfix: Unbound variable in notify_v2.sh
+    - New option: "DisplaySourcedFiles" *config* added to list what files get sourced
+- **v0.6.7**: Snooze feature, curl, and consolidation
+    - Added snooze feature to delay notifications
+    - Added configurable default curl arguments
+    - Consolidated and standardized notify template update notifications
+    - Added curl error handling
 ___
 
 
@@ -69,13 +69,12 @@ Options:
 -h     Print this Help.
 -i     Inform - send a preconfigured notification.
 -I     Prints custom releasenote urls alongside each container with updates in CLI output (requires urls.list).
--l     Only include containers with label set. See readme.
+-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 checking for updates/updating images for docker run containers. Won't update the container.
--R     Skip container recreation after pulling images.
 -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.
@@ -105,7 +104,7 @@ After the updates are complete, you'll get prompted if you'd like to prune dangl
 ___
 
 ## Dependencies
-- Running docker (duh) and compose, either standalone or plugin. (see [Podman fork](https://github.com/sudo-kraken/podcheck))
+- Running docker (duh) and compose, either standalone or plugin. (see [Podman fork](https://github.com/sudo-kraken/podcheck)  
 - Bash shell or compatible shell of at least v4.3
   - POSIX `xargs`, usually default but can be installed with the `findutils` package - to enable async.
 - [jq](https://github.com/jqlang/jq)
@@ -284,12 +283,10 @@ Optionally add labels to compose-files. Currently these are the usable labels:
       mag37.dockcheck.only-specific-container: true
       mag37.dockcheck.restart-stack: true
 ```
-- `mag37.dockcheck.update: true` will when used with the `-l` option only check and update containers with this label set and skip the rest.  
+- `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).
 
-Adding or modifying labels in compose-files requires a restart of the container to take effect.
-
 ## Workaround for non **amd64** / **arm64**
 `regctl` provides binaries for amd64/arm64, to use on other architecture you could try this workaround.
 Run regctl in a container wrapped in a shell script. Copied from [regclient/docs/install.md](https://github.com/regclient/regclient/blob/main/docs/install.md):
@@ -348,17 +345,11 @@ dockcheck is created and released under the [GNU GPL v3.0](https://www.gnu.org/l
 
 ## Sponsorlist
 
-:small_orange_diamond: [avegy](https://github.com/avegy)
+- [avegy](https://github.com/avegy)
-:small_orange_diamond: [eichhorn](https://github.com/eichhorn)
+- [eichhorn](https://github.com/eichhorn)
-:small_orange_diamond: [stepdg](https://github.com/stepdg)
+- [stepdg](https://github.com/stepdg)
-:small_orange_diamond: [acer2220](https://github.com/acer2220)
+- [acer2220](https://github.com/acer2220)
-:small_orange_diamond: [shgew](https://github.com/shgew)
+- [shgew](https://github.com/shgew)
-:small_orange_diamond: [jonas3456](https://github.com/jonas3456)
-:small_orange_diamond: [4ndreasH](https://github.com/4ndreasH)
-:small_orange_diamond: [markoe01](https://github.com/markoe01)
-:small_orange_diamond: [mushrowan](https://github.com/mushrowan)
-:small_orange_diamond:
-
 ___
 
 ### The [story](https://mag37.org/posts/project_dockcheck/) behind it. 1 year in retrospect.

default.config

@@ -19,7 +19,6 @@
 #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.
-#SkipRecreate    # Skip container recreation after pulling images.
 #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
@@ -90,3 +89,4 @@
 # TELEGRAM_TOPIC_ID="0"
 #
 # FILE_PATH="${ScriptWorkDir}/updates_available.txt"
+

dockcheck.sh

@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
-VERSION="v0.7.4"
+VERSION="v0.7.1"
-# ChangeNotes: New option -R to pull without recreation. Fixes: value too great error, legacy cleanups.
+# ChangeNotes: Add support for multiple notifications of the same type, output formatting, and file output
 Github="https://github.com/mag37/dockcheck"
 RawUrl="https://raw.githubusercontent.com/mag37/dockcheck/main/dockcheck.sh"
 
@@ -42,12 +42,11 @@ Help() {
   echo "-h     Print this Help."
   echo "-i     Inform - send a preconfigured notification."
   echo "-I     Prints custom releasenote urls alongside each container with updates in CLI output (requires urls.list)."
-  echo "-l     Only include containers with label set. See readme."
+  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     Skip container recreation after pulling images."
   echo "-r     Allow checking for updates/updating images for docker run containers. 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."
@@ -79,7 +78,6 @@ Exclude=${Exclude:-}
 DaysOld=${DaysOld:-}
 OnlySpecific=${OnlySpecific:-false}
 SpecificContainer=${SpecificContainer:-""}
-SkipRecreate=${SkipRecreate:-false}
 Excludes=()
 GotUpdates=()
 NoUpdates=()
@@ -97,7 +95,7 @@ c_blue="\033[0;34m"
 c_teal="\033[0;36m"
 c_reset="\033[0m"
 
-while getopts "ayfFhiIlmMnprsuvc:e:d:t:x:R" options; do
+while getopts "ayfFhiIlmMnprsuvc:e:d:t:x:" options; do
   case "${options}" in
     a|y) AutoMode=true ;;
     c)   CollectorTextFileDirectory="${OPTARG}" ;;
@@ -112,7 +110,6 @@ while getopts "ayfFhiIlmMnprsuvc:e:d:t:x:R" options; do
     M)   PrintMarkdownURL=true ;;
     n)   DontUpdate=true; AutoMode=true;;
     p)   AutoPrune=true ;;
-    R)   SkipRecreate=true ;;
     r)   DRunUp=true ;;
     s)   Stopped="-a" ;;
     t)   Timeout="${OPTARG}" ;;
@@ -216,7 +213,6 @@ choosecontainers() {
     else
       ChoiceClean=${Choice//[,.:;]/ }
       for CC in $ChoiceClean; do
-        CC=$((10#$CC)) # Base 10 interpretation to strip leading zeroes
         if [[ "$CC" -lt 1 || "$CC" -gt $UpdCount ]]; then # Reset choice if out of bounds
           echo "Number not in list: $CC"; unset ChoiceClean; break 1
         else
@@ -346,13 +342,12 @@ dependency_check() {
 dependency_check "regctl" "regbin" "https://github.com/regclient/regclient/releases/latest/download/regctl-linux-TEMP"
 dependency_check "jq" "jqbin" "https://github.com/jqlang/jq/releases/latest/download/jq-linux-TEMP"
 
-# Numbered List function - pads with zero
+# Numbered List function
+# if urls.list exists add release note url per line
 list_options() {
-  local total="${#Updates[@]}"
+  num=1
-  [[ ${#total} < 2 ]] && local pads=2 || local pads="${#total}"
-  local num=1
   for update in "${Updates[@]}"; do
-    printf "%0*d - %s\n" "$pads" "$num" "$update"
+    echo "$num) $update"
     ((num++))
   done
 }
@@ -487,7 +482,7 @@ done < <( \
   xargs $XargsAsync -I {} bash -c 'check_image "{}"' \
 )
 
-[[ "$OnlyLabel" == true ]] && printf "\n%bLabel option active:%b Only checking containers with labels set.\n" "$c_blue" "$c_reset"
+[[ "$OnlyLabel" == true ]] && printf "\n%bLabel option set:%b Only checking containers with labels set.\n" "$c_blue" "$c_reset"
 
 # Sort arrays alphabetically
 IFS=$'\n'
@@ -558,12 +553,8 @@ if [[ -n "${GotUpdates:-}" ]]; then
 
       docker pull "$ContImage" || { printf "\n%bDocker error, exiting!%b\n" "$c_red" "$c_reset" ; exit 1; }
     done
-    printf "\n%bDone pulling updates.%b\n" "$c_green" "$c_reset"
+    printf "\n%bDone pulling updates. %bRecreating updated containers.%b\n" "$c_green" "$c_blue" "$c_reset"
 
-    if [[ "$SkipRecreate" == true ]]; then
-      printf "%bSkipping container recreation due to -R.%b\n" "$c_yellow" "$c_reset"
-    else
-      printf "%bRecreating updated containers.%b\n" "$c_blue" "$c_reset"
     CurrentQue=0
     for i in "${SelectedUpdates[@]}"; do
       ((CurrentQue+=1))
@@ -609,8 +600,7 @@ if [[ -n "${GotUpdates:-}" ]]; then
         ${DockerBin} ${CompleteConfs} ${ContEnvs} up -d ${SpecificContainer} || { printf "\n%bDocker error, exiting!%b\n" "$c_red" "$c_reset" ; exit 1; }
       fi
     done
-    fi
+    if [[ "$AutoPrune" == false ]] && [[ "$AutoMode" == false ]]; then printf "\n"; read -rep "Would 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 all dangling images? y/[n]: " AutoPrune; fi
     if [[ "$AutoPrune" == true ]] || [[ "$AutoPrune" =~ [yY] ]]; then printf "\nAuto pruning.."; docker image prune -f; fi
     printf "\n%bAll done!%b\n" "$c_green" "$c_reset"
   else

extras/apprise_quickstart.md

@@ -38,15 +38,35 @@ You can also use the [caronc/apprise-api](https://github.com/caronc/apprise-api)
 
 
 ### Customize the **notify.sh** file.
-After you're done with the setup of the container and tried your notifications, you need to follow the configuration setup (explained in detail in the README).
+After you're done with the setup of the container and tried your notifications, you can copy the `notify_apprise.sh` file to `notify.sh` and start editing it.
-Briefly: Copy `default.config` to `dockcheck.config` then edit it to change the following, `APPRISE_URL` matching your environment:
 
+Comment out/remove the bare metal apprise-command (starting with `apprise -vv -t...`).
+Uncomment and edit the `AppriseURL` variable and *curl* line
+It should look something like this when curling the API:
 ```bash
-NOTIFY_CHANNELS="apprise"
+send_notification() {
-APPRISE_URL="http://apprise.mydomain.tld:1234/notify/apprise"
+Updates=("$@")
+UpdToString=$( printf "%s\n" "${Updates[@]}" )
+FromHost=$(hostname)
+
+printf "\nSending Apprise notification\n"
+
+MessageTitle="$FromHost - updates available."
+# Setting the MessageBody variable here.
+read -d '\n' MessageBody << __EOF
+Containers on $FromHost with updates available:
+
+$UpdToString
+
+__EOF
+
+AppriseURL="http://IP.or.mydomain.tld:8000/notify/apprise"
+curl -X POST -F "title=$MessageTitle" -F "body=$MessageBody" -F "tags=all" $AppriseURL
+
+}
 ```
 
-That's it!
+That's all!
 ___
 ___