From c628a4f664c9f10e1f5565304fba74b65c378643 Mon Sep 17 00:00:00 2001 From: Enrico Fagnoni Date: Tue, 14 May 2024 19:44:44 +0200 Subject: [PATCH] Dev 4.2.1 (#30) * fix: removed unused variable from dockerfile * fix: issue #28 --- README.md | 2 +- docker-compose.yaml | 2 -- modules/core | 4 ++-- 3 files changed, 3 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index 4a5b8d2..538edaa 100644 --- a/README.md +++ b/README.md @@ -90,7 +90,7 @@ To push a new docker image to docker hub: # docker login # docker buildx create --name multi-arch-builder -NAME="linkeddatacenter/sdaas-ce" MAJOR="4" MINOR="2" PATCH="0" +NAME="linkeddatacenter/sdaas-ce" MAJOR="4" MINOR="2" PATCH="1" docker buildx build --builder multi-arch-builder --platform linux/arm64,linux/amd64 --build-arg MODE=prod --push -t $NAME:$MAJOR.$MINOR.$PATCH . ``` diff --git a/docker-compose.yaml b/docker-compose.yaml index b4cf511..fe31a84 100644 --- a/docker-compose.yaml +++ b/docker-compose.yaml @@ -1,5 +1,3 @@ -version: "3.3" - services: kb: diff --git a/modules/core b/modules/core index 6c621dc..01376e4 100644 --- a/modules/core +++ b/modules/core @@ -21,7 +21,7 @@ STORE_TYPE=${STORE_TYPE:-w3c} SD_LOG_PRIORITY=${SD_LOG_PRIORITY:-5} SD_ABORT_ON_FAIL=${SD_ABORT_ON_FAIL:-false} -SD_DEFAULT_CONTEXT=${SD_DEFAULT_CONTEXT:-"sid=STORE activity=Activity"} +SD_DEFAULT_CONTEXT=${SD_DEFAULT_CONTEXT:-"sid=STORE"} # WARNING: changing this variable breaks the license agreement SDAAS_SIGNATURE=${SDAAS_SIGNATURE:-"SDaaS $SDAAS_APPLICATION_ID $SDAAS_VERSION"} @@ -135,7 +135,7 @@ sd_include() { fi # test if the module was already included - if eval "[ ! -z \${__module_${module}+x} ]" ; then return ; fi + if eval "[ ! -z \${__module_${module}+x} ]" ; then return 0 ; fi if [[ -e "$HOME/modules/$module" ]]; then # try local defined module (override default installation)