Mirrored_Repos/dockcheck
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #12 from nnmalex/main

Browse Source 
Merge fixes compatibility with value from `com.docker.compose.project.config_files` not giving full path in some cases, probably due to old `docker-compose` binary.

Thank you **nnmalex** for finding and contributing!
This commit is contained in:
mag37 2023-02-09 19:30:32 +01:00 committed by GitHub
commit 5a722e6d40
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
dockcheck.sh
View File

@ -1,5 +1,5 @@
#!/bin/bash #!/bin/bash
VERSION="v0.1.4" VERSION="v0.1.5"
Github="https://github.com/mag37/dockcheck" Github="https://github.com/mag37/dockcheck"
### Check if there's a new release of the script: ### Check if there's a new release of the script:
@ -140,10 +140,17 @@ if [ -n "$GotUpdates" ] ; then
if [ "$UpdYes" == "${UpdYes#[Nn]}" ] ; then if [ "$UpdYes" == "${UpdYes#[Nn]}" ] ; 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.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" }}') ContName=$(docker inspect "$i" --format '{{ index .Config.Labels "com.docker.compose.service" }}')
$DockerBin -f "$ContPath" pull "$ContName" ### Checking if "com.docker.compose.project.config_files" returns the full path to the config file or just the file name
$DockerBin -f "$ContPath" up -d "$ContName" if [[ $ContConfigFile = '/'* ]] ; then
ComposeFile="$ContConfigFile"
else
ComposeFile="$ContPath/$ContConfigFile"
fi
$DockerBin -f "$ComposeFile" pull "$ContName"
$DockerBin -f "$ComposeFile" up -d "$ContName"
done done
else else
printf "\nNo updates installed, exiting.\n" printf "\nNo updates installed, exiting.\n"
@ -153,4 +160,3 @@ else
fi fi
exit 0 exit 0