Browse Source

fix: [compose-core] make charm resource work correctly when host charm store is not ``/srv/charm-store``

master
Boris Gallet 3 days ago
committed by Valentin Lab
parent
commit
5352b6086e
  1. 10
      bin/compose-core

10
bin/compose-core

@ -4130,11 +4130,13 @@ _get_docker_compose_mixin_from_metadata_cached() {
fi
done < <(printf "%s" "$metadata" | shyaml get-values-0 "host-resources" 2>/dev/null)
while read-0 resource; do
dest="$(charm.get_dir "$charm")/resources$resource"
charm_path="$(charm.get_dir "$charm")"
dest="$charm_path/resources$resource"
host_dest="$HOST_CHARM_STORE${dest#$CHARM_STORE}"
if ! [ -e "$dest" ]; then
die "charm-resource: '$resource' does not exist (file: '$dest')."
die "charm-resource: '$resource' does not exist (file: '$host_dest')."
fi
echo " - $dest:$resource:ro"
echo " - $host_dest:$resource:ro"
done < <(echo "$metadata" | shyaml get-values-0 "charm-resources" 2>/dev/null)
) || return 1
if [ "$volumes" ]; then
@ -6405,4 +6407,4 @@ esac
clean_unused_docker_compose || exit 1
exit "$errlvl"
exit "$errlvl"
Loading…
Cancel
Save