Skip to content

Commit

Permalink
fix: Fix commandline argument passing to runBlazegraph.sh
Browse files Browse the repository at this point in the history
This commit fixes two issues in the container scripts that prevented
users from passing any options to blazegraph (as document here:
https://www.mediawiki.org/wiki/Wikidata_Query_Service/User_Manual#Configurable_properties)

This commit changes two things:
 - Rather than overwrite $BLAZEGRAPH_OPTS in entrypoint.sh, it extends
   it
 - It modified the root directoy runBlazegraph.sh to no longer drop all
   arguments passed to the docker command property
  • Loading branch information
kwisatz committed Sep 28, 2022
1 parent 4fc9ad5 commit 3601aa1
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 2 deletions.
2 changes: 1 addition & 1 deletion Docker/build/WDQS/entrypoint.sh
Expand Up @@ -13,7 +13,7 @@ done

set -eu

export BLAZEGRAPH_OPTS="-DwikibaseHost=${WIKIBASE_HOST}"
export BLAZEGRAPH_OPTS="${BLAZEGRAPH_OPTS} -DwikibaseHost=${WIKIBASE_HOST}"
export UPDATER_OPTS="-DwikibaseHost=${WIKIBASE_HOST} -DwikibaseMaxDaysBack=${WIKIBASE_MAX_DAYS_BACK}"

envsubst < /templates/mwservices.json > /wdqs/mwservices.json
Expand Down
3 changes: 2 additions & 1 deletion Docker/build/WDQS/runBlazegraph.sh
Expand Up @@ -2,5 +2,6 @@
# This file is provided by the wikibase/wdqs docker image.

cd /wdqs || exit
shift

./runBlazegraph.sh
./runBlazegraph.sh "$@"

0 comments on commit 3601aa1

Please sign in to comment.