From 4302d450339bee2aa20e740efeba92365fb13bbf Mon Sep 17 00:00:00 2001 From: Alex <6181345+nnmalex@users.noreply.github.com> Date: Thu, 9 Feb 2023 10:33:02 +0000 Subject: [PATCH 1/3] Update dockcheck.sh Adding `docker-config.yaml` file path handling. --- dockcheck.sh | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/dockcheck.sh b/dockcheck.sh index 87f05d3..bbc56a7 100755 --- a/dockcheck.sh +++ b/dockcheck.sh @@ -1,5 +1,5 @@ #!/bin/bash -VERSION="v0.1.4" +VERSION="v0.1.5" Github="https://github.com/mag37/dockcheck" ### Check if there's a new release of the script: @@ -140,10 +140,11 @@ if [ -n "$GotUpdates" ] ; 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" + $DockerBin -f "$ContPath/$ContConfigFile" pull "$ContName" + $DockerBin -f "$ContPath/$ContConfigFile" up -d "$ContName" done else printf "\nNo updates installed, exiting.\n" From d5c90fb98dc8238dad570b07cd3c5439bac9dc4e Mon Sep 17 00:00:00 2001 From: Alex <6181345+nnmalex@users.noreply.github.com> Date: Thu, 9 Feb 2023 12:00:29 +0000 Subject: [PATCH 2/3] Update dockcheck.sh Added condition based on the contents of the `com.docker.compose.project.config_files` label. --- dockcheck.sh | 201 ++++++++++++++++++++++++++------------------------- 1 file changed, 103 insertions(+), 98 deletions(-) diff --git a/dockcheck.sh b/dockcheck.sh index bbc56a7..ceec84d 100755 --- a/dockcheck.sh +++ b/dockcheck.sh @@ -1,5 +1,5 @@ #!/bin/bash -VERSION="v0.1.5" +VERSION="v0.1.4" Github="https://github.com/mag37/dockcheck" ### Check if there's a new release of the script: @@ -8,107 +8,107 @@ LatestRelease="$(curl -s -r 0-30 https://raw.githubusercontent.com/mag37/dockche ### Help Function: Help() { - echo "Syntax: dockcheck.sh [OPTION] [part of name to filter]" - echo "Example: dockcheck.sh -a ng" - echo - echo "Options:" - echo "-h Print this Help." - echo "-a|y Automatic updates, without interaction." - echo "-n No updates, only checking availability." -} + echo "Syntax: dockcheck.sh [OPTION] [part of name to filter]" + echo "Example: dockcheck.sh -a ng" + echo + echo "Options:" + echo "-h Print this Help." + echo "-a|y Automatic updates, without interaction." + echo "-n No updates, only checking availability." + } -while getopts "aynh" options; do - case "${options}" in - a|y) UpdYes="yes" ;; - n) UpdYes="no" ;; - h|*) Help ; exit 0 ;; - esac -done -shift "$((OPTIND-1))" + while getopts "aynh" options; do + case "${options}" in + a|y) UpdYes="yes" ;; + n) UpdYes="no" ;; + h|*) Help ; exit 0 ;; + esac + done + shift "$((OPTIND-1))" -### Set $1 to a variable for name filtering later. -SearchName="$1" + ### Set $1 to a variable for name filtering later. + SearchName="$1" -### Check if required binary exists in PATH or directory: -if [[ $(builtin type -P "regctl") ]]; then - regbin="regctl" -elif [[ -f "./regctl" ]]; then - regbin="./regctl" -else - printf "Required dependency 'regctl' missing, do you want it downloaded? y/[n] " - read GetDep - if [ "$GetDep" != "${GetDep#[Yy]}" ]; then - ### Check arch: - case "$(uname --machine)" in - x86_64|amd64) architecture="amd64" ;; - arm64|aarch64) architecture="arm64";; - *) echo "Architecture not supported, exiting." ; exit ;; - esac - curl -L https://github.com/regclient/regclient/releases/latest/download/regctl-linux-$architecture >./regctl - chmod 755 ./regctl - regbin="./regctl" - else - printf "%s\n" "Dependency missing, quitting." - exit - fi -fi -### Check docker compose binary: -if docker compose &> /dev/null ; then - DockerBin="docker compose" -elif docker-compose -v &> /dev/null; then - DockerBin="docker-compose" -else - printf "%s\n" "No docker compose binary available, quitting." - exit -fi + ### Check if required binary exists in PATH or directory: + if [[ $(builtin type -P "regctl") ]]; then + regbin="regctl" + elif [[ -f "./regctl" ]]; then + regbin="./regctl" + else + printf "Required dependency 'regctl' missing, do you want it downloaded? y/[n] " + read GetDep + if [ "$GetDep" != "${GetDep#[Yy]}" ]; then + ### Check arch: + case "$(uname --machine)" in + x86_64|amd64) architecture="amd64" ;; + arm64|aarch64) architecture="arm64";; + *) echo "Architecture not supported, exiting." ; exit ;; + esac + curl -L https://github.com/regclient/regclient/releases/latest/download/regctl-linux-$architecture >./regctl + chmod 755 ./regctl + regbin="./regctl" + else + printf "%s\n" "Dependency missing, quitting." + exit + fi + fi + ### Check docker compose binary: + if docker compose &> /dev/null ; then + DockerBin="docker compose" + elif docker-compose -v &> /dev/null; then + DockerBin="docker-compose" + else + printf "%s\n" "No docker compose binary available, quitting." + exit + fi -### Numbered List -function: -options() { -num=0 -for i in "${NumberedUpdates[@]}"; do - echo "$num) $i" - ((num++)) -done -} + ### Numbered List -function: + options() { + num=0 + for i in "${NumberedUpdates[@]}"; do + echo "$num) $i" + ((num++)) + done + } -### Choose from list -function: -choosecontainers() { - while [[ "$ChoiceClean" =~ [A-Za-z] || -z "$ChoiceClean" ]]; do - 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') - for s in $ChoiceClean; do - SelectedUpdates+=( "${NumberedUpdates[$s]}" ) - done - fi - done - printf "\nUpdating containers:\n" - printf "%s\n" "${SelectedUpdates[@]}" - printf "\n" -} + ### Choose from list -function: + choosecontainers() { + while [[ "$ChoiceClean" =~ [A-Za-z] || -z "$ChoiceClean" ]]; do + 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') + for s in $ChoiceClean; do + SelectedUpdates+=( "${NumberedUpdates[$s]}" ) + done + fi + done + printf "\nUpdating containers:\n" + printf "%s\n" "${SelectedUpdates[@]}" + printf "\n" + } -### Check the image-hash of every running container VS the registry -for i in $(docker ps --filter "name=$SearchName" --format '{{.Names}}') ; do - printf ". " - RepoUrl=$(docker inspect "$i" --format='{{.Config.Image}}') - LocalHash=$(docker image inspect "$RepoUrl" --format '{{.RepoDigests}}') - RegHash=$($regbin image digest --list "$RepoUrl" 2>/dev/null) - # Add container to GotErrors if regctl encounter problems. - if [ $? -eq 0 ] ; then - if [[ "$LocalHash" = *"$RegHash"* ]] ; then NoUpdates+=("$i"); else GotUpdates+=("$i"); fi - else - GotErrors+=("$i") - fi -done + ### Check the image-hash of every running container VS the registry + for i in $(docker ps --filter "name=$SearchName" --format '{{.Names}}') ; do + printf ". " + RepoUrl=$(docker inspect "$i" --format='{{.Config.Image}}') + LocalHash=$(docker image inspect "$RepoUrl" --format '{{.RepoDigests}}') + RegHash=$($regbin image digest --list "$RepoUrl" 2>/dev/null) + # Add container to GotErrors if regctl encounter problems. + if [ $? -eq 0 ] ; then + if [[ "$LocalHash" = *"$RegHash"* ]] ; then NoUpdates+=("$i"); else GotUpdates+=("$i"); fi + else + GotErrors+=("$i") + fi + done -### Sort arrays alphabetically -IFS=$'\n' -NoUpdates=($(sort <<<"${NoUpdates[*]}")) + ### Sort arrays alphabetically + IFS=$'\n' + NoUpdates=($(sort <<<"${NoUpdates[*]}")) GotUpdates=($(sort <<<"${GotUpdates[*]}")) GotErrors=($(sort <<<"${GotErrors[*]}")) unset IFS @@ -143,8 +143,14 @@ if [ -n "$GotUpdates" ] ; then 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/$ContConfigFile" pull "$ContName" - $DockerBin -f "$ContPath/$ContConfigFile" 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" @@ -154,4 +160,3 @@ else fi exit 0 - From 8b8ac84a446e3a37219b0c80105608658fd22771 Mon Sep 17 00:00:00 2001 From: Alex <6181345+nnmalex@users.noreply.github.com> Date: Thu, 9 Feb 2023 12:03:27 +0000 Subject: [PATCH 3/3] Update dockcheck.sh Fixed formatting. --- dockcheck.sh | 190 +++++++++++++++++++++++++-------------------------- 1 file changed, 95 insertions(+), 95 deletions(-) diff --git a/dockcheck.sh b/dockcheck.sh index ceec84d..59254b9 100755 --- a/dockcheck.sh +++ b/dockcheck.sh @@ -1,5 +1,5 @@ #!/bin/bash -VERSION="v0.1.4" +VERSION="v0.1.5" Github="https://github.com/mag37/dockcheck" ### Check if there's a new release of the script: @@ -8,107 +8,107 @@ LatestRelease="$(curl -s -r 0-30 https://raw.githubusercontent.com/mag37/dockche ### Help Function: Help() { - echo "Syntax: dockcheck.sh [OPTION] [part of name to filter]" - echo "Example: dockcheck.sh -a ng" - echo - echo "Options:" - echo "-h Print this Help." - echo "-a|y Automatic updates, without interaction." - echo "-n No updates, only checking availability." - } + echo "Syntax: dockcheck.sh [OPTION] [part of name to filter]" + echo "Example: dockcheck.sh -a ng" + echo + echo "Options:" + echo "-h Print this Help." + echo "-a|y Automatic updates, without interaction." + echo "-n No updates, only checking availability." +} - while getopts "aynh" options; do - case "${options}" in - a|y) UpdYes="yes" ;; - n) UpdYes="no" ;; - h|*) Help ; exit 0 ;; - esac - done - shift "$((OPTIND-1))" +while getopts "aynh" options; do + case "${options}" in + a|y) UpdYes="yes" ;; + n) UpdYes="no" ;; + h|*) Help ; exit 0 ;; + esac +done +shift "$((OPTIND-1))" - ### Set $1 to a variable for name filtering later. - SearchName="$1" +### Set $1 to a variable for name filtering later. +SearchName="$1" - ### Check if required binary exists in PATH or directory: - if [[ $(builtin type -P "regctl") ]]; then - regbin="regctl" - elif [[ -f "./regctl" ]]; then - regbin="./regctl" - else - printf "Required dependency 'regctl' missing, do you want it downloaded? y/[n] " - read GetDep - if [ "$GetDep" != "${GetDep#[Yy]}" ]; then - ### Check arch: - case "$(uname --machine)" in - x86_64|amd64) architecture="amd64" ;; - arm64|aarch64) architecture="arm64";; - *) echo "Architecture not supported, exiting." ; exit ;; - esac - curl -L https://github.com/regclient/regclient/releases/latest/download/regctl-linux-$architecture >./regctl - chmod 755 ./regctl - regbin="./regctl" - else - printf "%s\n" "Dependency missing, quitting." - exit - fi - fi - ### Check docker compose binary: - if docker compose &> /dev/null ; then - DockerBin="docker compose" - elif docker-compose -v &> /dev/null; then - DockerBin="docker-compose" - else - printf "%s\n" "No docker compose binary available, quitting." - exit - fi +### Check if required binary exists in PATH or directory: +if [[ $(builtin type -P "regctl") ]]; then + regbin="regctl" +elif [[ -f "./regctl" ]]; then + regbin="./regctl" +else + printf "Required dependency 'regctl' missing, do you want it downloaded? y/[n] " + read GetDep + if [ "$GetDep" != "${GetDep#[Yy]}" ]; then + ### Check arch: + case "$(uname --machine)" in + x86_64|amd64) architecture="amd64" ;; + arm64|aarch64) architecture="arm64";; + *) echo "Architecture not supported, exiting." ; exit ;; + esac + curl -L https://github.com/regclient/regclient/releases/latest/download/regctl-linux-$architecture >./regctl + chmod 755 ./regctl + regbin="./regctl" + else + printf "%s\n" "Dependency missing, quitting." + exit + fi +fi +### Check docker compose binary: +if docker compose &> /dev/null ; then + DockerBin="docker compose" +elif docker-compose -v &> /dev/null; then + DockerBin="docker-compose" +else + printf "%s\n" "No docker compose binary available, quitting." + exit +fi - ### Numbered List -function: - options() { - num=0 - for i in "${NumberedUpdates[@]}"; do - echo "$num) $i" - ((num++)) - done - } +### Numbered List -function: +options() { +num=0 +for i in "${NumberedUpdates[@]}"; do + echo "$num) $i" + ((num++)) +done +} - ### Choose from list -function: - choosecontainers() { - while [[ "$ChoiceClean" =~ [A-Za-z] || -z "$ChoiceClean" ]]; do - 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') - for s in $ChoiceClean; do - SelectedUpdates+=( "${NumberedUpdates[$s]}" ) - done - fi - done - printf "\nUpdating containers:\n" - printf "%s\n" "${SelectedUpdates[@]}" - printf "\n" - } +### Choose from list -function: +choosecontainers() { + while [[ "$ChoiceClean" =~ [A-Za-z] || -z "$ChoiceClean" ]]; do + 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') + for s in $ChoiceClean; do + SelectedUpdates+=( "${NumberedUpdates[$s]}" ) + done + fi + done + printf "\nUpdating containers:\n" + printf "%s\n" "${SelectedUpdates[@]}" + printf "\n" +} - ### Check the image-hash of every running container VS the registry - for i in $(docker ps --filter "name=$SearchName" --format '{{.Names}}') ; do - printf ". " - RepoUrl=$(docker inspect "$i" --format='{{.Config.Image}}') - LocalHash=$(docker image inspect "$RepoUrl" --format '{{.RepoDigests}}') - RegHash=$($regbin image digest --list "$RepoUrl" 2>/dev/null) - # Add container to GotErrors if regctl encounter problems. - if [ $? -eq 0 ] ; then - if [[ "$LocalHash" = *"$RegHash"* ]] ; then NoUpdates+=("$i"); else GotUpdates+=("$i"); fi - else - GotErrors+=("$i") - fi - done +### Check the image-hash of every running container VS the registry +for i in $(docker ps --filter "name=$SearchName" --format '{{.Names}}') ; do + printf ". " + RepoUrl=$(docker inspect "$i" --format='{{.Config.Image}}') + LocalHash=$(docker image inspect "$RepoUrl" --format '{{.RepoDigests}}') + RegHash=$($regbin image digest --list "$RepoUrl" 2>/dev/null) + # Add container to GotErrors if regctl encounter problems. + if [ $? -eq 0 ] ; then + if [[ "$LocalHash" = *"$RegHash"* ]] ; then NoUpdates+=("$i"); else GotUpdates+=("$i"); fi + else + GotErrors+=("$i") + fi +done - ### Sort arrays alphabetically - IFS=$'\n' - NoUpdates=($(sort <<<"${NoUpdates[*]}")) +### Sort arrays alphabetically +IFS=$'\n' +NoUpdates=($(sort <<<"${NoUpdates[*]}")) GotUpdates=($(sort <<<"${GotUpdates[*]}")) GotErrors=($(sort <<<"${GotErrors[*]}")) unset IFS