matching main

Updated this alt.version to match the main release.

README.md

@@ -8,6 +8,10 @@ ___
 Running docker (duh) and compose, either standalone or plugin.   
 `regctl` by [regclient](https://github.com/regclient/regclient) (will ask to download `regctl` if not in `PATH` or `PWD`)
 ___
+
+
+![](https://github.com/mag37/dockcheck/blob/main/example.gif)
+
 ## `dockcheck.sh`
 ```bash
 $ ./dockcheck.sh -h
@@ -20,10 +24,6 @@ Options:
 -n     No updates, only checking availability.
 ```
 
-
-
-![](https://github.com/mag37/dockcheck/blob/main/example.gif)
-
 Basic example:
 ```bash
 $ ./dockcheck.sh
@@ -39,28 +39,13 @@ Containers with updates available:
 3) whoogle-search
 
 
-Do you want to update? y/[n] y
-What containers do you like to update? 
-Enter number(s) separated by comma: 1,3
+Choose what containers to update:
+Enter number(s) separated by comma, [q] to quit: 1,3
 
 ```
 Then it proceedes to run `pull` and `up -d` on every container with updates.   
 
 
-
-And with `-n` *No updates* and `gl` for `*gl*` filtering:
-```bash
-$ ./dockcheck.sh -n gl
-. . .
-Containers with updates available:
-whoogle-search
-
-Containers on latest version:
-glances
-
-No updates installed, exiting
-```
-
 ### :beetle: Squashed Bugs:
 - ~~No options for running without updates or auto update.~~
 - ~~No filter to check only specific containers.~~
@@ -71,6 +56,7 @@ No updates installed, exiting
 - ~~Lists are not alphabetically sorted (due to stacks and other parameters)~~
 - ~~Old `docker-compose` binary-check sometimes returned false error~~
 - ~~Stacks gets updated as whole, even if only one service is chosen.~~
+- ~~Path broken occationally (from inspect) - probably due to old docker-compose binary.~~
 
 ### :hammer: Known issues
 - ~~No granular choice of what to update (except initial name filter).~~

dockcheck.sh

@@ -1,5 +1,5 @@
 #!/bin/bash
-VERSION="v0.1.3"
+VERSION="v0.1.5"
 Github="https://github.com/mag37/dockcheck"
 
 ### Check if there's a new release of the script:
@@ -74,9 +74,10 @@ done
 ### Choose from list -function:
 choosecontainers() {
   while [[ "$ChoiceClean" =~ [A-Za-z] || -z "$ChoiceClean" ]]; do
-    printf "What containers do you like to update? \n"
-    read -p 'Enter number(s) separated by comma (eg. 1,3,4): ' Choice
-    if [ "$Choice" == "0" ] ; then 
+    read -p "Enter number(s) separated by comma, [q] to quit: " Choice
+    if [[ "$Choice" =~ [qQnN] ]] ; then 
+      exit 0
+    elif [ "$Choice" == "0" ] ; then 
       SelectedUpdates=( "${NumberedUpdates[@]:1}" )
       ChoiceClean=$(echo "$Choice" |sed 's/[,.:;]/ /g')
     else
@@ -86,8 +87,9 @@ choosecontainers() {
       done
     fi
   done
-  printf "\nYou've SelectedUpdates:\n"
+  printf "\nUpdating containers:\n"
   printf "%s\n" "${SelectedUpdates[@]}"
+  printf "\n"
 }
 
 ### Check the image-hash of every running container VS the registry
@@ -130,19 +132,25 @@ fi
 ### Optionally get updates if there's any 
 if [ -n "$GotUpdates" ] ; then
   if [ -z "$UpdYes" ] ; then
-  printf "\n\033[36;1mDo you want to update? y/[n]\033[0m "
-  read UpdYes
-  [ "$UpdYes" != "${UpdYes#[Yy]}" ] && choosecontainers
+  printf "\n\033[36;1mChoose what containers to update.\033[0m\n"
+  choosecontainers
   else
     SelectedUpdates=( "${GotUpdates[@]}" )
   fi
-  if [ "$UpdYes" != "${UpdYes#[Yy]}" ] ; then
+  if [ "$UpdYes" == "${UpdYes#[Nn]}" ] ; then
     for i in "${SelectedUpdates[@]}"
     do 
-      ContPath=$(docker inspect "$i" --format '{{ index .Config.Labels "com.docker.compose.project.config_files" }}')
+      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" }}')
       ContName=$(docker inspect "$i" --format '{{ index .Config.Labels "com.docker.compose.service" }}')
-      $DockerBin -f "$ContPath" pull "$ContName"
-      $DockerBin -f "$ContPath" up -d "$ContName"
+      ### Checking if "com.docker.compose.project.config_files" returns the full path to the config file or just the file name
+      if [[ $ContConfigFile = '/'* ]] ; then
+        ComposeFile="$ContConfigFile"
+      else
+        ComposeFile="$ContPath/$ContConfigFile"
+      fi
+      $DockerBin -f "$ComposeFile" pull "$ContName"
+      $DockerBin -f "$ComposeFile" up -d "$ContName"
     done
   else
     printf "\nNo updates installed, exiting.\n"

dockcheck_docker-run_ver.sh

@@ -1,10 +1,10 @@
 #!/bin/bash
-### VERSION v.0.1.1
+VERSION="v0.1.5"
+Github="https://github.com/mag37/dockcheck"
 
-### DOCKER RUN - VERSION
-
-### WARNING WONT REBUILD CONTAINERS - ONLY GRAB NEW IMAGES
-### If running docker compose, use the main version. (recommended!)
+### Check if there's a new release of the script:
+LatestRelease="$(curl -s -r 0-30 https://raw.githubusercontent.com/mag37/dockcheck/main/dockcheck.sh | sed -n "/VERSION/s/VERSION=//p" | tr -d '"')"
+[ "$VERSION" != "$LatestRelease" ] && printf "New version available! Latest: "$LatestRelease" - Local: "$VERSION" \nGrab it here: "$Github" \n\n"
 
 ### Help Function:
 Help() {
@@ -26,7 +26,7 @@ while getopts "aynh" options; do
 done
 shift "$((OPTIND-1))"
 
-### Set $1 to a variable for later
+### Set $1 to a variable for name filtering later.
 SearchName="$1"
 
 ### Check if required binary exists in PATH or directory:
@@ -65,21 +65,22 @@ done
 ### Choose from list -function:
 choosecontainers() {
   while [[ "$ChoiceClean" =~ [A-Za-z] || -z "$ChoiceClean" ]]; do
-    printf "What containers do you like to update? \n"
-    # options
-    read -p 'Enter number(s) separated by comma (eg. 1,3,4): ' Choice
-    if [ "$Choice" == "0" ] ; then 
-      SelectedUpdates=( ${NumberedUpdates[@]:1} )
-      ChoiceClean=$(echo $Choice|sed 's/[,.:;]/ /g')
+    read -p "Enter number(s) separated by comma, [q] to quit: " Choice
+    if [[ "$Choice" =~ [qQnN] ]] ; then 
+      exit 0
+    elif [ "$Choice" == "0" ] ; then 
+      SelectedUpdates=( "${NumberedUpdates[@]:1}" )
+      ChoiceClean=$(echo "$Choice" |sed 's/[,.:;]/ /g')
     else
-      ChoiceClean=$(echo $Choice|sed 's/[,.:;]/ /g')
+      ChoiceClean=$(echo "$Choice" |sed 's/[,.:;]/ /g')
       for s in $ChoiceClean; do
-        SelectedUpdates+=( ${NumberedUpdates[$s]} )
+        SelectedUpdates+=( "${NumberedUpdates[$s]}" )
       done
     fi
   done
-  printf "\nYou've SelectedUpdates:\n"
+  printf "\nUpdating containers:\n"
   printf "%s\n" "${SelectedUpdates[@]}"
+  printf "\n"
 }
 
 ### Check the image-hash of every running container VS the registry
@@ -88,7 +89,7 @@ for i in $(docker ps --filter "name=$SearchName" --format '{{.Names}}') ; do
   RepoUrl=$(docker inspect "$i" --format='{{.Config.Image}}')
   LocalHash=$(docker image inspect "$RepoUrl" --format '{{.RepoDigests}}')
   RegHash=$($regbin image digest --list "$RepoUrl" 2>/dev/null)
-  # Check if regtcl produces errors - add to GotErrors if so.
+  # Add container to GotErrors if regctl encounter problems.
   if [ $? -eq 0 ] ; then
     if [[ "$LocalHash" = *"$RegHash"* ]] ; then NoUpdates+=("$i"); else GotUpdates+=("$i"); fi
   else
@@ -122,13 +123,12 @@ fi
 ### Optionally get updates if there's any 
 if [ -n "$GotUpdates" ] ; then
   if [ -z "$UpdYes" ] ; then
-  printf "\n\033[36;1mDo you want to update? y/[n]\033[0m "
-  read UpdYes
-  [ "$UpdYes" != "${UpdYes#[Yy]}" ] && choosecontainers
+  printf "\n\033[36;1mChoose what container-images to update.\033[0m\n"
+  choosecontainers
   else
     SelectedUpdates=( "${GotUpdates[@]}" )
   fi
-  if [ "$UpdYes" != "${UpdYes#[Yy]}" ] ; then
+  if [ "$UpdYes" == "${UpdYes#[Nn]}" ] ; then
     for i in "${SelectedUpdates[@]}"; do 
       ContImage=$(docker inspect "$i" --format='{{.Config.Image}}')
       docker pull $ContImage