From 7792daee3efcecce3cbd3446957558869df8b82a Mon Sep 17 00:00:00 2001
From: apano-on <albulen.pano@unibz.it>
Date: Wed, 5 Jan 2022 20:48:34 +0100
Subject: [PATCH] Update to latest version of Ontop (4.2.0)

---
 linkedgeodata-docker/docker-compose.yml       | 2 --
 linkedgeodata-docker/lgd-ontop-web/Dockerfile | 9 +--------
 2 files changed, 1 insertion(+), 10 deletions(-)

diff --git a/linkedgeodata-docker/docker-compose.yml b/linkedgeodata-docker/docker-compose.yml
index 379ab67..73828fd 100644
--- a/linkedgeodata-docker/docker-compose.yml
+++ b/linkedgeodata-docker/docker-compose.yml
@@ -93,7 +93,6 @@ services:
       context: ./lgd-ontop-web
     environment:
       - ONTOP_JAVA_ARGS=-Xmx2g
-      - ONTOP_DB_NAME=${DB_NAME}
       - ONTOP_DB_USER=${DB_USER}
       - ONTOP_DB_PASSWORD=${DB_PASS}
       - ONTOP_DB_URL=jdbc:${DB_TYPE_JDBC}://${DB_HOST}:${DB_PORT}/${DB_NAME}
@@ -104,7 +103,6 @@ services:
       - ONTOP_ONTOLOGY_FILE=/opt/ontop/input/lgd.owl
       - ONTOP_XML_CATALOG_FILE=/opt/ontop/input/catalog-v001.xml
       - ONTOP_PORTAL_FILE=/opt/ontop/input/lgd.portal.toml
-#      - ONTOP_OPTS=${ONTOP_OPTS}
     ports:
       - ${ONTOP_PORT}:8080
     depends_on:
diff --git a/linkedgeodata-docker/lgd-ontop-web/Dockerfile b/linkedgeodata-docker/lgd-ontop-web/Dockerfile
index df09dd5..b23fc91 100644
--- a/linkedgeodata-docker/lgd-ontop-web/Dockerfile
+++ b/linkedgeodata-docker/lgd-ontop-web/Dockerfile
@@ -1,4 +1,4 @@
-FROM ontop/ontop-endpoint:4.2-SNAPSHOT
+FROM ontop/ontop-endpoint:latest
 WORKDIR /opt/ontop
 
 #ADD https://repo1.maven.org/maven2/org/postgresql/postgresql/42.2.18/postgresql-42.2.18.jar jdbc/
@@ -8,17 +8,13 @@ WORKDIR /opt/ontop
 #ADD https://repo1.maven.org/maven2/org/postgresql/postgresql/9.3-1103-jdbc3/postgresql-9.3-1103-jdbc3.jar jdbc/
 ADD https://repo1.maven.org/maven2/org/postgresql/postgresql/42.2.19/postgresql-42.2.19.jar jdbc/
 
-#ADD https://raw.githubusercontent.com/alpano-unibz/LinkedGeoData/ontop-dev/linkedgeodata-ontop/lgd.obda input/
 ADD lgd.obda input/lgd.obda
 ADD lgd.owl input/lgd.owl
 ADD lgd.portal.toml input/lgd.portal.toml
 ADD catalog-v001.xml input/catalog-v001.xml
 ADD library input/library
 
-#ADD create-properties.sh .
-#RUN chmod +x create-properties.sh
 RUN sleep 3
-# Substitute ':' with '\:' - affects e.g. url schemas
 
 ### Custom script to expand Ontop-Metamappings
 ### Assumes ONTOP_OBDA_FILE= "lgd.obda"
@@ -28,10 +24,7 @@ RUN sleep 3
 # RUN chmod +x input/expand-metamappings.sh
 # RUN cd input && ./expand-metamappings.sh
 
-#RUN ONTOP_DB_NAME="lgd" ONTOP_DB_USER="lgd" ONTOP_DB_PASSWORD="lgdpwd" ONTOP_DB_URL="postgresql://lgd-db:5432/lgd" ./create-properties.sh | sed 's|:|\\:|g' > input/lgd.properties
-
 RUN env
-#RUN cat input/lgd.properties
 
 EXPOSE 8080