diff --git a/README.md b/README.md index cca75d9..1f52c14 100644 --- a/README.md +++ b/README.md @@ -13,7 +13,7 @@ ___ ![](https://github.com/mag37/dockcheck/blob/main/example.gif) ## `dockcheck.sh` -```bash +``` $ ./dockcheck.sh -h Syntax: dockcheck.sh [OPTION] [part of name to filter] Example: dockcheck.sh -a ng @@ -22,10 +22,11 @@ Options: -h Print this Help. -a|y Automatic updates, without interaction. -n No updates, only checking availability. +-r Allow updating images for docker run, wont update the container. ``` Basic example: -```bash +``` $ ./dockcheck.sh . . . Containers on latest version: @@ -45,6 +46,11 @@ 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. +### `-r flag` :warning: disclaimer and warning: +**Wont auto-update the containers, only their images. (compose is recommended)** +`docker run` dont support using new images just by restarting a container. +Containers need to be manually stopped, removed and created again to run on the new image. + ### :beetle: Squashed Bugs: - ~~No options for running without updates or auto update.~~ @@ -57,18 +63,12 @@ Then it proceedes to run `pull` and `up -d` on every container with updates. - ~~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.~~ +- ~~Script breaks if one of the chosen containers are a `docker run` container. ### :hammer: Known issues - ~~No granular choice of what to update (except initial name filter).~~ - No detailed error feedback (just skip + list what's skipped) . -## `dockcheck_docker-run_ver.sh` -### Wont auto-update the containers, only their images. (compose is recommended) -Alternative version for people who use `docker run` and no composes. -`docker run` dont support using new images just by restarting a container. -Containers need to be stopped, removed and created again to run on the new image. - - ## `dupc_function.sh` Function to quickly check for updates on a single contianer or list of containers by name. **Without the need of pulling**. Preferably placed in `.bashrc` or similar. diff --git a/dockcheck.sh b/dockcheck.sh index 59254b9..735a6f7 100755 --- a/dockcheck.sh +++ b/dockcheck.sh @@ -1,5 +1,5 @@ #!/bin/bash -VERSION="v0.1.5" +VERSION="v0.1.6" Github="https://github.com/mag37/dockcheck" ### Check if there's a new release of the script: @@ -15,12 +15,14 @@ Help() { echo "-h Print this Help." echo "-a|y Automatic updates, without interaction." echo "-n No updates, only checking availability." + echo "-r Allow updating images for docker run, wont update the container" } -while getopts "aynh" options; do +while getopts "aynrh" options; do case "${options}" in a|y) UpdYes="yes" ;; n) UpdYes="no" ;; + r) DrUp="yes" ;; h|*) Help ; exit 0 ;; esac done @@ -53,12 +55,15 @@ else fi fi ### Check docker compose binary: -if docker compose &> /dev/null ; then +if docker compose version &> /dev/null ; then DockerBin="docker compose" elif docker-compose -v &> /dev/null; then DockerBin="docker-compose" +elif docker -v &> /dev/null; then + printf "%s\n" "No docker compose binary available, using plain docker (Not recommended!)" + printf "%s\n" "'docker run' will ONLY update images, not the container itself." else - printf "%s\n" "No docker compose binary available, quitting." + printf "%s\n" "No docker binaries available, exiting." exit fi @@ -143,6 +148,17 @@ 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" }}') + ### Checking if compose-values are empty - hence started with docker run: + if [ -z "$ContPath" ] ; then + if [ "$DrUp" == "yes" ] ; then + ContImage=$(docker inspect "$i" --format='{{.Config.Image}}') + docker pull $ContImage + printf "%s\n" "$i got a new image downloaded, rebuild manually with preferred 'docker run'-parameters" + else + printf "\n\033[33;1m$i\033[0m has no compose labels, probably started with docker run - \033[33;1mskipping\033[0m\n\n" + fi + continue + fi ### 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" diff --git a/dockcheck_docker-run_ver.sh b/dockcheck_docker-run_ver.sh deleted file mode 100644 index 22a9a61..0000000 --- a/dockcheck_docker-run_ver.sh +++ /dev/null @@ -1,144 +0,0 @@ -#!/bin/bash -VERSION="v0.1.5" -Github="https://github.com/mag37/dockcheck" - -### 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() { - 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))" - -### 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 - -### 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" -} - -### 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[*]}")) -GotUpdates=($(sort <<<"${GotUpdates[*]}")) -GotErrors=($(sort <<<"${GotErrors[*]}")) -unset IFS -### Create new Array to use for the numbered list: -NumberedUpdates=(ALL "${GotUpdates[@]}") - -### List what containers got updates or not -if [ -n "$NoUpdates" ] ; then - printf "\n\033[32;1mContainers on latest version:\033[0m\n" - printf "%s\n" "${NoUpdates[@]}" -fi -if [ -n "$GotErrors" ] ; then - printf "\n\033[33;1mContainers with errors, wont get updated:\033[0m\n" - printf "%s\n" "${GotErrors[@]}" -fi -if [ -n "$GotUpdates" ] ; then - printf "\n\033[31;1mContainers with updates available:\033[0m\n" - [ -z "$UpdYes" ] && options || printf "%s\n" "${GotUpdates[@]}" -fi - -### Optionally get updates if there's any -if [ -n "$GotUpdates" ] ; then - if [ -z "$UpdYes" ] ; then - printf "\n\033[36;1mChoose what container-images to update.\033[0m\n" - choosecontainers - else - SelectedUpdates=( "${GotUpdates[@]}" ) - fi - if [ "$UpdYes" == "${UpdYes#[Nn]}" ] ; then - for i in "${SelectedUpdates[@]}"; do - ContImage=$(docker inspect "$i" --format='{{.Config.Image}}') - docker pull $ContImage - printf "%s\n" "$i got a new image downloaded, rebuild manually with preferred 'docker run'-parameters" - done - else - printf "\nNo updates installed, exiting.\n" - fi -else - printf "\nNo updates available, exiting.\n" -fi - -exit 0