From cf8bdec91c15b07a303e6661ad8e1cc861499cfc Mon Sep 17 00:00:00 2001
From: Ivan Subotic <400790+subotic@users.noreply.github.com>
Date: Tue, 23 Nov 2021 15:55:45 +0100
Subject: [PATCH] build: bump fuseki base container version (#1946)

---
 README.md                                            | 11 -----------
 WORKSPACE                                            |  2 --
 third_party/versions.bzl                             |  8 ++++----
 webapi/scripts/fuseki-functions.sh                   |  2 +-
 webapi/scripts/fuseki-repository-config.ttl.template |  2 +-
 5 files changed, 6 insertions(+), 19 deletions(-)

diff --git a/README.md b/README.md
index 2106940a3c..6a082b24b9 100644
--- a/README.md
+++ b/README.md
@@ -175,17 +175,6 @@ A pull request should include tests and documentation for the changes that were
 made. See the [documentation README](https://github.com/dasch-swiss/knora-api/blob/main/docs/Readme.md)
 for information on writing Knora documentation.
 
-## Contact information
-
-### Technical
-
-Please use the [discuss.dasch.swiss](https://discuss.dasch.swiss) forum for
-technical questions.
-
-### Administrative
-
-Lukas Rosenthaler `<lukas.rosenthaler@unibas.ch>`
-
 ## Commit Message Schema
 
 When writing commit messages, we follow the [Conventional Commit messages](https://www.conventionalcommits.org/) rules.
diff --git a/WORKSPACE b/WORKSPACE
index a99b20b973..4f0670abec 100644
--- a/WORKSPACE
+++ b/WORKSPACE
@@ -74,7 +74,6 @@ container_pull(
     digest = SIPI_IMAGE_DIGEST,
     registry = "docker.io",
     repository = SIPI_REPOSITORY,
-    # tag = SIPI_VERSION,
 )
 
 container_pull(
@@ -82,7 +81,6 @@ container_pull(
     digest = FUSEKI_IMAGE_DIGEST,
     registry = "docker.io",
     repository = FUSEKI_REPOSITORY,
-    # tag = FUSEKI_VERSION,
 )
 
 #####################################
diff --git a/third_party/versions.bzl b/third_party/versions.bzl
index 1552e1faea..12844d2cd4 100644
--- a/third_party/versions.bzl
+++ b/third_party/versions.bzl
@@ -9,11 +9,11 @@ METRICS_VERSION = "4.0.1"
 # SIPI - digest takes precedence!
 SIPI_REPOSITORY = "daschswiss/sipi"
 SIPI_VERSION = "3.3.0"
-SIPI_IMAGE = SIPI_REPOSITORY + ":" + SIPI_VERSION
+SIPI_IMAGE = SIPI_REPOSITORY
 SIPI_IMAGE_DIGEST = "sha256:24ff26999d3727aa4a0c4751fc5706761cea01e9df02e08e676160f234d8506d"
 
 # Jena Fuseki - digest takes precedence!
 FUSEKI_REPOSITORY = "daschswiss/apache-jena-fuseki"
-FUSEKI_VERSION = "1.0.5"  # contains Fuseki 3.16
-FUSEKI_IMAGE = FUSEKI_REPOSITORY + ":" + FUSEKI_VERSION
-FUSEKI_IMAGE_DIGEST = "sha256:5caba3d092ccc04fe8dc988137d97c012b020eeb649f439511429d6b4ae467ec"
+FUSEKI_VERSION = "2.0.2"  # contains Fuseki 4.2.0
+FUSEKI_IMAGE = FUSEKI_REPOSITORY
+FUSEKI_IMAGE_DIGEST = "sha256:7b04aa3a9b51a419948f1cd92ce6504435b9930726a2f714be2e37bd7a32e624"
diff --git a/webapi/scripts/fuseki-functions.sh b/webapi/scripts/fuseki-functions.sh
index 173e675307..dbb0a80693 100644
--- a/webapi/scripts/fuseki-functions.sh
+++ b/webapi/scripts/fuseki-functions.sh
@@ -79,7 +79,7 @@ create-repository() {
 }
 
 upload-graph() {
-  STATUS=$(curl -s -o /dev/null -w '%{http_code}' -u ${USER_NAME}:${PASSWORD} -H "Content-Type:text/turtle; charset=utf-8" --data-binary @$1 -X PUT http://${HOST}/${REPOSITORY}\?graph\="$2")
+  STATUS=$(curl -s -o /dev/null -w '%{http_code}' -u ${USER_NAME}:${PASSWORD} -H "Content-Type:text/turtle; charset=utf-8" --data-binary @$1 -X PUT http://${HOST}/${REPOSITORY}/data\?graph\="$2")
 
   if [ "${STATUS}" -eq 201 ]; then
     echo "==> 201 Created: $1 -> $2"
diff --git a/webapi/scripts/fuseki-repository-config.ttl.template b/webapi/scripts/fuseki-repository-config.ttl.template
index 82e72fdc67..7d3abbe3be 100644
--- a/webapi/scripts/fuseki-repository-config.ttl.template
+++ b/webapi/scripts/fuseki-repository-config.ttl.template
@@ -29,7 +29,7 @@
                         text:dataset                        :tdb_dataset_readwrite ;
                         text:index                          :indexLucene .
 
-# A TDB datset used for RDF storage
+# A TDB2 dataset used for RDF storage
 :tdb_dataset_readwrite  a                                   tdb2:DatasetTDB2 ;
                         tdb2:unionDefaultGraph              true ;
                         tdb2:location                       "/fuseki/databases/@REPOSITORY@" .