Compare commits

..

14 Commits

Author SHA1 Message Date
mag37
44f9742bde Update README.md
Added new fixes to the list.
2023-02-04 13:10:03 +01:00
mag37
07a9269e76 fixed typo.
Quoting broke functionality, unquoted.
2023-02-04 12:56:51 +01:00
mag37
3f1be334d5 Merge pull request #10 from mag37/testing
Testing
2023-02-04 12:39:50 +01:00
mag37
dd42100a3d added new update from main
Added the fix to only update the service chosen, not the whole stack. thanx to @maanoobh
2023-02-04 12:35:08 +01:00
mag37
64c1f097b1 Merge pull request #9 from maanoobh/specify-service
Specify which service when pulling the update (to avoid pulling non-chosen containers of the same stack)
2023-02-04 12:30:50 +01:00
Mahmood Alansari
8f37417eab Fixed a bug, the command expects the service name in the file. 2023-02-04 08:42:05 +00:00
Mahmood Alansari
fb44099b0f specify which service to pull and update 2023-02-04 07:57:15 +00:00
mag37
bde81aad22 forgot quoting.
Quote the variables... again.
2023-02-02 22:07:33 +01:00
mag37
08175c87ab added ugly version-check
curl-check on the version in local VS raw on github to let the user know there's a new release.
2023-02-02 22:02:41 +01:00
mag37
a7bfb49fad version-format
Changed Version-format to a variable instead of comment, for future use with version-checking.
2023-02-02 21:29:10 +01:00
mag37
8ae13837f1 cleaning
Securing some variable calls with quoting.
Minor cleaning.
2023-02-02 13:17:15 +01:00
mag37
72a4ab889c quickfix
Removed unnecessary docker-compose binary check - as this should ONLY be used if no composes are used. Not recommended.
2023-02-02 10:13:46 +01:00
mag37
a4f58c317a quickfix
Fixed that (sometimes) calling old `docker-compose` binary returned error.
Thanks [xoseperez](https://github.com/xoseperez) for pointing out.
2023-02-02 10:12:05 +01:00
mag37
67fe04cb64 +webui reference 2023-02-01 20:55:20 +01:00
3 changed files with 21 additions and 21 deletions

View File

@@ -69,6 +69,8 @@ No updates installed, exiting
- ~~Multi-digest images didn't correctly check with registry, giving false positives on updates.~~ - ~~Multi-digest images didn't correctly check with registry, giving false positives on updates.~~
- ~~Not working with filenames other than `docker-compose.yml`~~ - ~~Not working with filenames other than `docker-compose.yml`~~
- ~~Lists are not alphabetically sorted (due to stacks and other parameters)~~ - ~~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.~~
### :hammer: Known issues ### :hammer: Known issues
- ~~No granular choice of what to update (except initial name filter).~~ - ~~No granular choice of what to update (except initial name filter).~~
@@ -91,6 +93,8 @@ Updates available for local_nginx.
nginx_reverse is already latest. nginx_reverse is already latest.
Updates available for paperless-ng. Updates available for paperless-ng.
``` ```
## Also check out a spinoff brother-project [Palleri/dockcheck-web](https://github.com/Palleri/dockcheck-web) for a WebUI-front!
---
## Special Thanks: ## Special Thanks:
:bison: [t0rnis](https://github.com/t0rnis) :bison: [t0rnis](https://github.com/t0rnis)

27
dockcheck.sh Normal file → Executable file
View File

@@ -1,5 +1,10 @@
#!/bin/bash #!/bin/bash
### VERSION v.0.1.1 VERSION="v0.1.3"
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 Function:
Help() { Help() {
@@ -21,7 +26,7 @@ while getopts "aynh" options; do
done done
shift "$((OPTIND-1))" shift "$((OPTIND-1))"
### Set $1 to a variable for later ### Set $1 to a variable for name filtering later.
SearchName="$1" SearchName="$1"
### Check if required binary exists in PATH or directory: ### Check if required binary exists in PATH or directory:
@@ -50,7 +55,7 @@ fi
### Check docker compose binary: ### Check docker compose binary:
if docker compose &> /dev/null ; then if docker compose &> /dev/null ; then
DockerBin="docker compose" DockerBin="docker compose"
elif docker-compose &> /dev/null; then elif docker-compose -v &> /dev/null; then
DockerBin="docker-compose" DockerBin="docker-compose"
else else
printf "%s\n" "No docker compose binary available, quitting." printf "%s\n" "No docker compose binary available, quitting."
@@ -70,15 +75,14 @@ done
choosecontainers() { choosecontainers() {
while [[ "$ChoiceClean" =~ [A-Za-z] || -z "$ChoiceClean" ]]; do while [[ "$ChoiceClean" =~ [A-Za-z] || -z "$ChoiceClean" ]]; do
printf "What containers do you like to update? \n" printf "What containers do you like to update? \n"
# options
read -p 'Enter number(s) separated by comma (eg. 1,3,4): ' Choice read -p 'Enter number(s) separated by comma (eg. 1,3,4): ' Choice
if [ "$Choice" == "0" ] ; then if [ "$Choice" == "0" ] ; then
SelectedUpdates=( ${NumberedUpdates[@]:1} ) SelectedUpdates=( "${NumberedUpdates[@]:1}" )
ChoiceClean=$(echo $Choice|sed 's/[,.:;]/ /g') ChoiceClean=$(echo "$Choice" |sed 's/[,.:;]/ /g')
else else
ChoiceClean=$(echo $Choice|sed 's/[,.:;]/ /g') ChoiceClean=$(echo "$Choice" |sed 's/[,.:;]/ /g')
for s in $ChoiceClean; do for s in $ChoiceClean; do
SelectedUpdates+=( ${NumberedUpdates[$s]} ) SelectedUpdates+=( "${NumberedUpdates[$s]}" )
done done
fi fi
done done
@@ -92,7 +96,7 @@ for i in $(docker ps --filter "name=$SearchName" --format '{{.Names}}') ; do
RepoUrl=$(docker inspect "$i" --format='{{.Config.Image}}') RepoUrl=$(docker inspect "$i" --format='{{.Config.Image}}')
LocalHash=$(docker image inspect "$RepoUrl" --format '{{.RepoDigests}}') LocalHash=$(docker image inspect "$RepoUrl" --format '{{.RepoDigests}}')
RegHash=$($regbin image digest --list "$RepoUrl" 2>/dev/null) 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 [ $? -eq 0 ] ; then
if [[ "$LocalHash" = *"$RegHash"* ]] ; then NoUpdates+=("$i"); else GotUpdates+=("$i"); fi if [[ "$LocalHash" = *"$RegHash"* ]] ; then NoUpdates+=("$i"); else GotUpdates+=("$i"); fi
else else
@@ -136,8 +140,9 @@ if [ -n "$GotUpdates" ] ; then
for i in "${SelectedUpdates[@]}" for i in "${SelectedUpdates[@]}"
do 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.config_files" }}')
$DockerBin -f "$ContPath" pull ContName=$(docker inspect "$i" --format '{{ index .Config.Labels "com.docker.compose.service" }}')
$DockerBin -f "$ContPath" up -d $DockerBin -f "$ContPath" pull "$ContName"
$DockerBin -f "$ContPath" up -d "$ContName"
done done
else else
printf "\nNo updates installed, exiting.\n" printf "\nNo updates installed, exiting.\n"

View File

@@ -52,15 +52,6 @@ else
exit exit
fi fi
fi fi
### Check docker compose binary:
if docker compose &> /dev/null ; then
DockerBin="docker compose"
elif docker-compose &> /dev/null; then
DockerBin="docker-compose"
else
printf "%s\n" "No docker compose binary available, quitting."
exit
fi
### Numbered List -function: ### Numbered List -function:
options() { options() {