Switch to a standard GraphDB 10.x Docker image from DockerHub. Simplify configuration.

Author: ledsoft

.env

@@ -1,4 +1,3 @@
 ROOT=/termit
 URL=http://localhost
 JWT_SECRET_KEY=TermIt-SvqaszimBKkhowbnPaal-Secr3tK3y
-GRAPHDB_FILE=graphdb-free-10.1.5-dist.zip

README.md

@@ -8,7 +8,6 @@ TermIt Docker serves to spin off a TermIt deployment, consisting of:
 
 ## Prerequisities
 1. Docker 19.03.0 or later & Docker Compose installed (and accessible under the current user).
-2. [GraphDB](https://www.ontotext.com) (Free, SE, EE) ZIP file downloaded (8.x or later).
 
 ### Resource Requirements
 
@@ -21,18 +20,17 @@ Ideally, the whole deployment should have at least 4GB RAM available, with at le
 
 
 ## Running TermIt
-1. Place your [GraphDB](https://www.ontotext.com) (Free, SE, EE) standalone server ZIP archive into the 'db-server' folder.
-2. Set `GRAPHDB_FILE` variable in `.env` to the name of the file you just downloaded. 
-3. (_Optional_) Set `ROOT` variable in .env to reflect the local context prefix the app will be running on.
-4. (_Optional_) Set `URL` variable in .env to reflect the server the app will be running on.
-5. (_Optional_, recommended) Set `JWT_SECRET_KEY` variable in .env. It should be a string of at least 32 characters that will be used to hash the JWT authentication token for logged-in users.
-6. Start the GraphDB server
+1. (_Optional_) If you have a license file for GraphDB (SE or EE), place it in the `db-server/license` directory.
+2. (_Optional_) Set `ROOT` variable in .env to reflect the local context prefix the app will be running on.
+3. (_Optional_) Set `URL` variable in .env to reflect the server the app will be running on.
+4. (_Optional_, recommended) Set `JWT_SECRET_KEY` variable in .env. It should be a string of at least 32 characters that will be used to hash the JWT authentication token for logged-in users.
+5. Start the GraphDB server
    `docker-compose up -d termit-db-server`
-7. Go to `http://localhost:7200/import#server`, select the "termit" repository, and in the "Server files" section, click the "Import" button for all the files. In the "Import settings" dialog, set the Base IRI to `http://onto.fel.cvut.cz/ontologies/termit`.
-8. Go to `http://localhost:7200/sparql` and execute all the queries in the 'db-server/lucene' directory to create Lucene connectors for full-text search.
-9. Run the remaining services by
+6. Go to `http://localhost:7200/import#server`, select the "termit" repository, and in the "Server files" section, click the "Import" button for all the files. In the "Import settings" dialog, set the Base IRI to `http://onto.fel.cvut.cz/ontologies/termit`.
+7. Go to `http://localhost:7200/sparql` and execute all the queries in the 'db-server/lucene' directory to create Lucene connectors for full-text search.
+8. Run the remaining services by
     `docker-compose up -d`
-10. Look for admin credentials in the `termit-server` log and use them for first login at the configured URL, e.g. `http://localhost/termit`.
+9. Look for admin credentials in the `termit-server` log and use them for first login at the configured URL, e.g. `http://localhost/termit`.
 
 ## Configuration
 

db-server/Dockerfile

@@ -1,38 +1,24 @@
-FROM eclipse-temurin:11-jdk-alpine
+FROM ontotext/graphdb:10.2.0
 
-# Add bash, it is required by GraphDB run script
-RUN apk --no-cache add bash
-# Add curl
-RUN apk --no-cache add curl
+# Override parent entrypoint
+ENTRYPOINT []
 
-ARG GRAPHDB_ZIP
+ENV GRAPHDB_HOME=/opt/graphdb/home
+ENV GRAPHDB_INSTALL_DIR=/opt/graphdb/dist
 
-RUN \
-    # Check for mandatory build arguments
-    : "${GRAPHDB_ZIP:?Provide the downloaded GraphDB Free ZIP file}"
+WORKDIR ${GRAPHDB_HOME}
+# Copy license file if it exists
+COPY ./license/. ${GRAPHDB_HOME}/conf/
 
-ENV GRAPHDB_VOLUME=/graphdb
-ENV GRAPHDB_HOME=${GRAPHDB_VOLUME}/home
-ENV GRAPHDB_INSTALL_DIR=${GRAPHDB_VOLUME}/dist
-RUN mkdir -p $GRAPHDB_VOLUME $GRAPHDB_INSTALL_DIR $GRAPHDB_HOME
-
-ADD $GRAPHDB_ZIP /tmp/$GRAPHDB_ZIP
-
-WORKDIR /tmp
-RUN unzip $GRAPHDB_ZIP
-RUN export GRAPHDB_DIR=`ls -d graphdb*/` && mv $GRAPHDB_DIR/* $GRAPHDB_INSTALL_DIR
-
-ENV PATH=${GRAPHDB_INSTALL_DIR}/bin:$PATH
-
-COPY rulesets ${GRAPHDB_HOME}/rulesets
+# Copy our custom ruleset
+COPY rulesets rulesets
 
+# Copy initialization data and repository config
 COPY init-data /root/graphdb-import
 COPY init-config /termit-repo-config
 COPY repo-init.sh ${GRAPHDB_INSTALL_DIR}/repo-init.sh
 
-COPY conf ${GRAPHDB_HOME}/conf
-
 EXPOSE 7200
 
-CMD ${GRAPHDB_INSTALL_DIR}/repo-init.sh /termit-repo-config ${GRAPHDB_HOME} & ${GRAPHDB_INSTALL_DIR}/bin/graphdb -Dgraphdb.home=${GRAPHDB_HOME} -Dgraphdb.logback=conf/logback.xml
+CMD ${GRAPHDB_INSTALL_DIR}/repo-init.sh /termit-repo-config ${GRAPHDB_HOME} & ${GRAPHDB_INSTALL_DIR}/bin/graphdb -Dgraphdb.home=${GRAPHDB_HOME} -Dgraphdb.logback=${GRAPHDB_INSTALL_DIR}/conf/logback.xml
 

db-server/Dockerfile-se-ee

@@ -7,7 +7,7 @@
 <#termit> a rep:Repository;
   rep:repositoryID "termit";
   rep:repositoryImpl [
-      rep:repositoryType "graphdb:FreeSailRepository";
+      rep:repositoryType "graphdb:SailRepository";
       <http://www.openrdf.org/config/repository/sail#sailImpl> [
           <http://www.ontotext.com/trree/owlim#base-URL> "http://example.org/owlim#";
           <http://www.ontotext.com/trree/owlim#check-for-inconsistencies> "false";
@@ -28,7 +28,7 @@
           <http://www.ontotext.com/trree/owlim#ruleset> "/graphdb/home/rulesets/rules-termit-graphdb.pie";
           <http://www.ontotext.com/trree/owlim#storage-folder> "storage";
           <http://www.ontotext.com/trree/owlim#throw-QueryEvaluationException-on-timeout> "false";
-          sail:sailType "graphdb:FreeSail"
+          sail:sailType "graphdb:Sail"
         ]
     ];
   rdfs:label "TermIt Repository" .

db-server/init-config/config.ttl

@@ -17,16 +17,14 @@ services:
   termit-db-server:
     build:
       context: db-server
-      args:
-        GRAPHDB_ZIP: $GRAPHDB_FILE
     image: termit-db-server
     environment:
       GDB_JAVA_OPTS: -Dgraphdb.external-url=${URL}${ROOT}/sluzby/db-server -Ddefault.min.distinct.threshold=67108864
     restart: always
     ports:
       - "7200:7200"
     volumes:
-      - termit-db-server:/graphdb/home
+      - termit-db-server:/opt/graphdb/home
   termit-server:
     image: kbsscvut/termit
     depends_on: