fixed :tag for pull

Pull did not take tag in account when pulling. Quickfixed it to use the
actual tag of the image of the running container when pulling.
This commit is contained in:
mag37 2023-02-23 13:05:06 +01:00
parent 6ff15f6d97
commit e754450300

View File

@ -157,10 +157,10 @@ if [ -n "$GotUpdates" ] ; then
ContConfigFile=$(docker inspect "$i" --format '{{ index .Config.Labels "com.docker.compose.project.config_files" }}') 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" }}')
ContEnv=$(docker inspect "$i" --format '{{index .Config.Labels "com.docker.compose.project.environment_file" }}') ContEnv=$(docker inspect "$i" --format '{{index .Config.Labels "com.docker.compose.project.environment_file" }}')
ContImage=$(docker inspect "$i" --format='{{.Config.Image}}')
### Checking if compose-values are empty - hence started with docker run: ### Checking if compose-values are empty - hence started with docker run:
if [ -z "$ContPath" ] ; then if [ -z "$ContPath" ] ; then
if [ "$DrUp" == "yes" ] ; then if [ "$DrUp" == "yes" ] ; then
ContImage=$(docker inspect "$i" --format='{{.Config.Image}}')
docker pull "$ContImage" docker pull "$ContImage"
printf "%s\n" "$i got a new image downloaded, rebuild manually with preferred 'docker run'-parameters" printf "%s\n" "$i got a new image downloaded, rebuild manually with preferred 'docker run'-parameters"
else else
@ -176,12 +176,11 @@ if [ -n "$GotUpdates" ] ; then
fi fi
### cd to the compose-file directory to account for people who use relative volumes, eg - ${PWD}/data:data ### cd to the compose-file directory to account for people who use relative volumes, eg - ${PWD}/data:data
cd "$(dirname "${ComposeFile}")" || { echo "Path error - skipping $i" ; continue ; } cd "$(dirname "${ComposeFile}")" || { echo "Path error - skipping $i" ; continue ; }
docker pull "$ContImage"
### Check if the container got an environment file set, use it if so: ### Check if the container got an environment file set, use it if so:
if [ -n "$ContEnv" ]; then if [ -n "$ContEnv" ]; then
$DockerBin -f "$ComposeFile" --env-file "$ContEnv" pull "$ContName"
$DockerBin -f "$ComposeFile" --env-file "$ContEnv" up -d "$ContName" $DockerBin -f "$ComposeFile" --env-file "$ContEnv" up -d "$ContName"
else else
$DockerBin -f "$ComposeFile" pull "$ContName"
$DockerBin -f "$ComposeFile" up -d "$ContName" $DockerBin -f "$ComposeFile" up -d "$ContName"
fi fi
done done