|
@ -1870,10 +1870,7 @@ service_ensure_image_ready() { |
|
|
|
|
|
|
|
|
## Can we pull it ? Let's check on $COMPOSE_DOCKER_REGISTRY |
|
|
## Can we pull it ? Let's check on $COMPOSE_DOCKER_REGISTRY |
|
|
if [ "$COMPOSE_ACTION" != "build" ] && [ -n "$COMPOSE_DOCKER_REGISTRY" ]; then |
|
|
if [ "$COMPOSE_ACTION" != "build" ] && [ -n "$COMPOSE_DOCKER_REGISTRY" ]; then |
|
|
img=$(cache:image:registry:get "$charm" "$hash" "$service") || { |
|
|
|
|
|
err "Failed to get image '$charm_image_name:$hash' from registry for ${DARKYELLOW}$service${NORMAL}." |
|
|
|
|
|
return 1 |
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
img=$(cache:image:registry:get "$charm" "$hash" "$service" 2>/dev/null) |
|
|
[ -n "$img" ] && { |
|
|
[ -n "$img" ] && { |
|
|
printf "%s" "$img" | tee "$cache_file" |
|
|
printf "%s" "$img" | tee "$cache_file" |
|
|
return $? |
|
|
return $? |
|
|