From 503697ea6a7bb606d59476b7d74fa5b6727dd7bc Mon Sep 17 00:00:00 2001
From: Valentin Lab <valentin.lab@kalysto.org>
Date: Tue, 8 Oct 2019 11:35:13 +0200
Subject: [PATCH] new: dev: update for kal-shlib-charm 0.5.0 compatibility

---
 Dockerfile       | 2 +-
 bin/compose-core | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 031f70b..d38e603 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -11,7 +11,7 @@ RUN apk --update add curl
 ## would love to use args... but I need it as an environment variable
 ENV KAL_SHLIB_ARRAY_VERSION="0.2.0" \
     KAL_SHLIB_CACHE_VERSION="0.0.1" \
-    KAL_SHLIB_CHARM_VERSION="0.4.1" \
+    KAL_SHLIB_CHARM_VERSION="0.5.0" \
     KAL_SHLIB_CMDLINE_VERSION="0.0.5" \
     KAL_SHLIB_COMMON_VERSION="0.4.17" \
     KAL_SHLIB_CONFIG_VERSION="0.0.2" \
diff --git a/bin/compose-core b/bin/compose-core
index a29149d..34b2a61 100755
--- a/bin/compose-core
+++ b/bin/compose-core
@@ -1562,7 +1562,7 @@ run_service_hook () {
             export MASTER_BASE_SERVICE_NAME="$MASTER_BASE_SERVICE_NAME"
             export MASTER_BASE_CHARM_NAME="$MASTER_BASE_CHARM_NAME"
 
-            charm.run_hook "$charm" "$action"
+            charm.run_hook "local" "$charm" "$action"
 
 EOF
             loaded[$subservice]=1
@@ -1900,7 +1900,7 @@ _run_service_relation () {
                 SERVICE_DATASTORE="$DATASTORE/$target_service"
                 SERVICE_CONFIGSTORE="$CONFIGSTORE/$target_service"
                 export SERVICE_NAME DOCKER_BASE_IMAGE SERVICE_DATASTORE SERVICE_CONFIGSTORE
-                charm.run_relation_hook "$target_charm" "$relation_name" relation-joined
+                charm.run_relation_hook local "$target_charm" "$relation_name" relation-joined
                 echo "$?" > "$relation_dir/target_errlvl"
             ) | logstdout "$DARKYELLOW$target_service$NORMAL/$DARKBLUE$relation_name$NORMAL (joined) ${GREEN}@${NORMAL}"
         } 3>&1 1>&2 2>&3 | logstderr "$DARKYELLOW$target_service$NORMAL/$DARKBLUE$relation_name$NORMAL (joined) ${RED}@${NORMAL}" 3>&1 1>&2 2>&3
@@ -1932,7 +1932,7 @@ _run_service_relation () {
                     SERVICE_DATASTORE="$DATASTORE/$service"
                     SERVICE_CONFIGSTORE="$CONFIGSTORE/$service"
                     export SERVICE_NAME DOCKER_BASE_IMAGE SERVICE_DATASTORE SERVICE_CONFIGSTORE
-                    charm.run_relation_hook "$charm" "$relation_name" relation-joined
+                    charm.run_relation_hook local "$charm" "$relation_name" relation-joined
                     echo "$?" > "$relation_dir/errlvl"
                 ) | logstdout "$DARKYELLOW$service$NORMAL/$DARKBLUE$relation_name$NORMAL (joined) ${GREEN}@${NORMAL}"
             } 3>&1 1>&2 2>&3 | logstderr "$DARKYELLOW$service$NORMAL/$DARKBLUE$relation_name$NORMAL (joined) ${RED}@$NORMAL" 3>&1 1>&2 2>&3