stack: update demo stack

stack/README.md

@@ -3,12 +3,13 @@
 Run the complete demo stack using the following command:
 
 ```sh
-docker-compose up -d --build
+docker compose pull
+docker compose up -d --build
 ```
 
 Here is where each component is exposed:
 
-- Nilea: http://127.0.0.1:8081/
+- Blueprint: http://127.0.0.1:8081/
 - Fuseki (the triple store): http://127.0.0.1:3030/ (credentials: `admin` / `admin`)
 - Trifid: http://127.0.0.1:8080/
 
@@ -27,7 +28,7 @@ Here is the list of graphs that are used for this demo:
 Once you started the Docker Compose stack, you can run the following command:
 
 ```sh
-docker-compose -f docker-compose.data.yaml up add-demo-k8s-data --build
+docker compose -f docker-compose.data.yaml up add-demo-k8s-data --build
 ```
 
 This will run a job that will import the triples that are in the `demo-data/k8s.ttl` file.
@@ -64,5 +65,5 @@ The `demo-data/k8s.ttl` was was generated that way, using a Kubernetes cluster c
 
 Importing generated triples to the Fuseki triplestore (run one of both):
 
-- for the custom file with your cluster (`volumes/k8s-data/data.ttl`): `docker-compose -f docker-compose.data.yaml up add-custom-k8s-data --build`
-- for the demo file (`demo-data/k8s.ttl`): `docker-compose -f docker-compose.data.yaml up add-demo-k8s-data --build`
+- for the custom file with your cluster (`volumes/k8s-data/data.ttl`): `docker compose -f docker-compose.data.yaml up add-custom-k8s-data --build`
+- for the demo file (`demo-data/k8s.ttl`): `docker compose -f docker-compose.data.yaml up add-demo-k8s-data --build`

stack/nilea/config.json → stack/blueprint/config.json

@@ -1,5 +1,6 @@
 {
-  "endpointUrl": "http://127.0.0.1:3030/nilea/sparql",
+  "endpointUrl": "http://127.0.0.1:8080/query",
   "sparqlConsoleUrl": "http://127.0.0.1:8080/sparql/#query",
-  "graphExplorerUrl": "http://127.0.0.1:8080/graph-explorer/?resource"
+  "graphExplorerUrl": "http://127.0.0.1:8080/graph-explorer/?resource",
+  "fullTextSearchDialect": "fuseki"
 }

stack/docker-compose.data.yaml

@@ -1,22 +1,20 @@
-version: "3"
-
 services:
-  # add k8s demo data (for those who don't have a Kubernetes cluster)
+  # Add k8s demo data (for those who don't have a Kubernetes cluster)
   add-demo-k8s-data:
     build:
       context: ./alpine-curl/
       dockerfile: Dockerfile
     restart: "no"
-    command: 'curl -vvv --fail-with-body -u admin:admin http://store:3030/nilea/data?graph=urn:graph:k8s --data-binary @data.ttl --header "Content-Type: text/turtle"'
+    command: 'curl -vvv --fail-with-body -u admin:admin http://store:3030/blueprint/data?graph=urn:graph:k8s --data-binary @data.ttl --header "Content-Type: text/turtle"'
     volumes:
       - ./demo-data/k8s.ttl:/app/data.ttl:ro
 
-  # add custom k8s data generated locally (will not be in the git history)
+  # Add custom k8s data generated locally (will not be in the git history)
   add-custom-k8s-data:
     build:
       context: ./alpine-curl/
       dockerfile: Dockerfile
     restart: "no"
-    command: 'curl -vvv --fail-with-body -u admin:admin http://store:3030/nilea/data?graph=urn:graph:k8s --data-binary @data.ttl --header "Content-Type: text/turtle"'
+    command: 'curl -vvv --fail-with-body -u admin:admin http://store:3030/blueprint/data?graph=urn:graph:k8s --data-binary @data.ttl --header "Content-Type: text/turtle"'
     volumes:
       - ./volumes/k8s-data/data.ttl:/app/data.ttl:ro

stack/docker-compose.yaml

@@ -1,8 +1,6 @@
-version: "3"
-
 services:
   store:
-    image: ghcr.io/zazuko/fuseki-geosparql:v2.2.0
+    image: ghcr.io/zazuko/fuseki-geosparql:v3
     ports:
       - 3030:3030
     environment:
@@ -20,23 +18,21 @@ services:
     volumes:
       - ./fuseki-data:/app/data:ro
 
-  nilea:
+  blueprint:
     build:
       context: ..
-      dockerfile: nilea.Dockerfile
+      dockerfile: Dockerfile
     volumes:
-      - ./nilea/config.json:/app/config.json:ro
+      - ./blueprint/config.json:/app/config.json:ro
     ports:
       - 8081:80
 
   trifid:
-    build:
-      context: ./trifid/
-      dockerfile: Dockerfile
+    image: ghcr.io/zazuko/trifid:v5
     ports:
       - 8080:8080
     environment:
       - DATASET_BASE_URL=
-      - SPARQL_ENDPOINT_URL=http://store:3030/nilea/query
+      - SPARQL_ENDPOINT_URL=http://store:3030/blueprint/query
       - SPARQL_USERNAME=admin
       - SPARQL_PASSWORD=admin

stack/fuseki-data/load-data.sh

@@ -18,7 +18,7 @@ echo ""
 for f in /app/data/*.ttl; do
   graph=$(basename -s .ttl "${f}")
   echo "Loading '${f}' in graph urn:graph:${graph}…"
-  curl -s --fail-with-body -u admin:admin "http://store:3030/nilea/data?graph=urn:graph:${graph}" --data-binary "@${f}" --header "Content-Type: text/turtle"
+  curl -s --fail-with-body -u admin:admin "http://store:3030/blueprint/data?graph=urn:graph:${graph}" --data-binary "@${f}" --header "Content-Type: text/turtle"
   echo ""
 done
 

stack/fuseki/config.ttl

@@ -30,7 +30,7 @@
 .
 
 <#service> rdf:type fuseki:Service ;
-  fuseki:name "nilea" ;
+  fuseki:name "blueprint" ;
 
   fuseki:endpoint [ fuseki:operation fuseki:query ; ] ;
   fuseki:endpoint [ fuseki:operation fuseki:query ; fuseki:name "sparql" ] ;
@@ -53,12 +53,12 @@
 .
 
 <#dataset> rdf:type tdb2:DatasetTDB2 ;
-  tdb2:location "databases/nilea" ;
+  tdb2:location "databases/blueprint" ;
   tdb2:unionDefaultGraph true ;
 .
 
 <#indexLucene> a text:TextIndexLucene ;
-  text:directory <file:/fuseki/databases/nilea/INDEX> ;
+  text:directory <file:/fuseki/databases/blueprint/INDEX> ;
   text:entityMap <#entMap> ;
   text:storeValues true ;
   text:analyzer [ a text:StandardAnalyzer ] ;