|
|
@ -1665,6 +1665,7 @@ service_ensure_image_ready() { |
|
|
|
.services.[\"${service_quoted}\"].image = \"${charm_image_name}:${hash}\"" \ |
|
|
|
"$_CURRENT_DOCKER_COMPOSE" || return 1 |
|
|
|
|
|
|
|
fi |
|
|
|
if [ "$COMPOSE_ACTION" != "build" ] && docker_has_image "${charm_image_name}:${hash}"; then |
|
|
|
if [ -n "$DEBUG" ]; then |
|
|
|
Elt "using ${DARKPINK}$charm${NORMAL}'s image from local cache" >&2 |
|
|
@ -1675,7 +1676,6 @@ service_ensure_image_ready() { |
|
|
|
printf "%s" "${charm_image_name}:${hash}" | tee "$cache_file" |
|
|
|
return $? |
|
|
|
fi |
|
|
|
fi |
|
|
|
|
|
|
|
## Can we pull it ? Let's check on $COMPOSE_DOCKER_REGISTRY |
|
|
|
if [ "$COMPOSE_ACTION" != "build" ] && [ -n "$COMPOSE_DOCKER_REGISTRY" ]; then |
|
|
|