From b9514b3174349164645e6f25b742c689f3718dc2 Mon Sep 17 00:00:00 2001 From: Szymon Bultrowicz Date: Tue, 8 Dec 2015 14:29:17 +0100 Subject: [PATCH] DPNG-3812 Added parameters to specify application-broker service name and icon --- lib/make/cloudfoundry.mk | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/lib/make/cloudfoundry.mk b/lib/make/cloudfoundry.mk index eab08e2..2e5fbaf 100644 --- a/lib/make/cloudfoundry.mk +++ b/lib/make/cloudfoundry.mk @@ -151,10 +151,12 @@ $(appdir)/%/.app: $(eval domain:=$(shell $(call r_ymlelemval,$(yml_appdmn)) <$(appstack_file))) $(eval app_name:=$(subst $(appdir)/,,$(@D))) $(eval desc:=$(shell $(call r_appgetattr,$(app_name),.fetch("env",{}).fetch("description","")) <$(@D)/$(applcl_mfst))) + $(eval disp_name:=$(shell $(call r_appgetattr,$(app_name),.fetch("env",{}).fetch("display_name","")) <$(@D)/$(applcl_mfst))) + $(eval image_url:=$(shell $(call r_appgetattr,$(app_name),.fetch("env",{}).fetch("image_url","")) <$(@D)/$(applcl_mfst))) $(eval register_in:=$(shell $(call r_appgetattr,$(app_name),.fetch("env",{}).fetch("register_in","")) <$(@D)/$(applcl_mfst))) $(eval auth_username:=$(shell $(call r_appgetattr,$(register_in),.fetch("env",{}).fetch("AUTH_USER","")) <$(appdir)/$(register_in)/$(applcl_mfst))) $(eval auth_password:=$(shell $(call r_appgetattr,$(register_in),.fetch("env",{}).fetch("AUTH_PASS","")) <$(appdir)/$(register_in)/$(applcl_mfst))) - $(shmute)if [ ! -z "$(register_in)" ]; then $(appdir)/$(register_in)/register.sh "http://$(register_in).$(domain)" "$(auth_username)" "$(auth_password)" "$(app_name)" "$(app_name)" "$(desc)"; fi + $(shmute)if [ ! -z "$(register_in)" ]; then $(appdir)/$(register_in)/register.sh -b "http://$(register_in).$(domain)" -u "$(auth_username)" -p "$(auth_password)" -a "$(app_name)" -n "$(app_name)" -s "$(disp_name)" -d "$(desc)" -i "$(image_url)"; fi $(shmute)rm -f $| $(shmute)touch $@