From aa02a407c2159a1eba980580e815ab3cb7e9c001 Mon Sep 17 00:00:00 2001
From: Hylke van der Schaaf <hylke.vds@gmail.com>
Date: Wed, 8 Nov 2023 20:24:50 +0100
Subject: [PATCH] Updated docker-compose and Docker files

---
 FROST-Server.HTTP/Dockerfile                    | 5 +++--
 FROST-Server.MQTTP/Dockerfile                   | 5 +++--
 docs/sensorthingsapi/deploy/docker-compose.yaml | 6 +++---
 scripts/docker-compose.yaml                     | 5 +++--
 4 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/FROST-Server.HTTP/Dockerfile b/FROST-Server.HTTP/Dockerfile
index 3553728ad..0d771a9f5 100644
--- a/FROST-Server.HTTP/Dockerfile
+++ b/FROST-Server.HTTP/Dockerfile
@@ -1,13 +1,14 @@
 From tomcat:9-jdk17
 
+RUN apt-get update && apt-get install unzip && apt-get clean
+
 COPY target/docker_deps/ ${CATALINA_HOME}/lib/
 
 # Copy to images tomcat path
 ARG ARTIFACT_FILE
 COPY target/${ARTIFACT_FILE} /tmp/FROST-Server.war
 
-RUN apt-get update && apt-get install unzip && apt-get clean \
-    && unzip -d ${CATALINA_HOME}/webapps/FROST-Server /tmp/FROST-Server.war \
+RUN unzip -d ${CATALINA_HOME}/webapps/FROST-Server /tmp/FROST-Server.war \
     && rm /tmp/FROST-Server.war \
     && addgroup --system --gid 1000 tomcat \
     && adduser --system --uid 1000 --gid 1000 tomcat \
diff --git a/FROST-Server.MQTTP/Dockerfile b/FROST-Server.MQTTP/Dockerfile
index 3553728ad..0d771a9f5 100644
--- a/FROST-Server.MQTTP/Dockerfile
+++ b/FROST-Server.MQTTP/Dockerfile
@@ -1,13 +1,14 @@
 From tomcat:9-jdk17
 
+RUN apt-get update && apt-get install unzip && apt-get clean
+
 COPY target/docker_deps/ ${CATALINA_HOME}/lib/
 
 # Copy to images tomcat path
 ARG ARTIFACT_FILE
 COPY target/${ARTIFACT_FILE} /tmp/FROST-Server.war
 
-RUN apt-get update && apt-get install unzip && apt-get clean \
-    && unzip -d ${CATALINA_HOME}/webapps/FROST-Server /tmp/FROST-Server.war \
+RUN unzip -d ${CATALINA_HOME}/webapps/FROST-Server /tmp/FROST-Server.war \
     && rm /tmp/FROST-Server.war \
     && addgroup --system --gid 1000 tomcat \
     && adduser --system --uid 1000 --gid 1000 tomcat \
diff --git a/docs/sensorthingsapi/deploy/docker-compose.yaml b/docs/sensorthingsapi/deploy/docker-compose.yaml
index 79ca60cb6..6f8f83495 100644
--- a/docs/sensorthingsapi/deploy/docker-compose.yaml
+++ b/docs/sensorthingsapi/deploy/docker-compose.yaml
@@ -1,4 +1,4 @@
-version: '2'
+version: '3'
 
 services:
   web:
@@ -6,7 +6,7 @@ services:
     environment:
       - serviceRootUrl=http://localhost:8080/FROST-Server
       - http_cors_enable=true
-      - http_cors_allowed.origins=*
+      - http_cors_allowed_origins=*
       - persistence_db_driver=org.postgresql.Driver
       - persistence_db_url=jdbc:postgresql://database:5432/sensorthings
       - persistence_db_username=sensorthings
@@ -19,7 +19,7 @@ services:
       - database
 
   database:
-    image: postgis/postgis:11-2.5-alpine
+    image: postgis/postgis:14-3.2-alpine
     environment:
       - POSTGRES_DB=sensorthings
       - POSTGRES_USER=sensorthings
diff --git a/scripts/docker-compose.yaml b/scripts/docker-compose.yaml
index b78b4e8f4..994bbf19b 100644
--- a/scripts/docker-compose.yaml
+++ b/scripts/docker-compose.yaml
@@ -2,10 +2,10 @@ version: '3'
 
 services:
   web:
-    image: fraunhoferiosb/frost-server:2.0
+    image: fraunhoferiosb/frost-server:2.2
     environment:
       - serviceRootUrl=http://localhost:8080/FROST-Server
-      - plugins.multiDatastream.enable=true
+      - plugins_multiDatastream.enable=false
       - http_cors_enable=true
       - http_cors_allowed_origins=*
       - persistence_db_driver=org.postgresql.Driver
@@ -29,3 +29,4 @@ services:
       - postgis_volume:/var/lib/postgresql/data
 volumes:
     postgis_volume:
+