Update mapserver version

* WIP: Mapserver 8 update, config en dockerfile updates

* Update klaar voor testen

* Errors verwijderen en test toevoegen.

* Update bugfixes en meer

* Verwijderen test script

* WIP: Mapserver 8 update, config en dockerfile updates

* Update klaar voor testen

* Errors verwijderen en test toevoegen.

* Update bugfixes en meer

* Verwijderen test script

* Remove setuptools upgrade

* Making this ready for acc/prd, adding setuptools

* Dit moet er toch uit..

* Na overleg met ergu toch de setuptools laten zitten.

* Erin eruit erin eruit.

---------

Co-authored-by: Yashar Robert <y.robert@amsterdam.nl>

Author: Doldenburgamsterdam

Dockerfile

@@ -1,4 +1,4 @@
-FROM ubuntu:22.04
+FROM ubuntu:24.04
 LABEL maintainer="datapunt@amsterdam.nl"
 ARG DEBIAN_FRONTEND=noninteractive
 RUN apt-get update -y \
@@ -13,13 +13,17 @@ RUN apt-get update -y \
         wget \
     && apt-get clean
 
-RUN python3 -m pip install --upgrade pip setuptools
 
 # Enable these Apache modules
 RUN a2enmod actions cgid headers rewrite
 
 # Configure localhost in Apache
 RUN echo "ServerName localhost" >> /etc/apache2/apache2.conf
+
+#config file
+COPY mapserver.conf /usr/local/etc/
+RUN echo "SetEnv MAPSERVER_CONFIG_FILE \"/usr/local/etc/mapserver.conf\"" >> /etc/apache2/apache2.conf
+
 RUN rm /etc/apache2/mods-enabled/alias.conf
 COPY docker/000-default.conf /etc/apache2/sites-available/
 COPY docker/docker-entrypoint.sh /bin
@@ -28,7 +32,6 @@ COPY epsg /usr/share/proj
 # set apache user id matching ctr user id
 RUN usermod --non-unique --uid 999 www-data
 RUN groupmod -o -g 999 www-data
-
 RUN mkdir /var/lock/apache2 && mkdir /var/run/apache2
 RUN chown -R 999:999 /var/lock/apache2 && chown -R 999:999 /var/run/apache2 && chown -R 999:999 /var/log/apache2/
 RUN chown -R 999:999 /srv/ && chown -R 999:999 /etc/apache2/

bag.map

@@ -38,7 +38,6 @@ MAP
     TYPE            POLYGON
     MINSCALEDENOM   100
     MAXSCALEDENOM   40001
-    OPACITY         50
     TEMPLATE        "fooOnlyForWMSGetFeatureInfo.html"
     PROJECTION
     "init=epsg:28992"
@@ -61,6 +60,7 @@ MAP
         COLOR          200 200 200
         OUTLINECOLOR   172 172 172
         WIDTH          1
+        OPACITY         50    
       END
     END
 
@@ -72,6 +72,7 @@ MAP
         COLOR          100 200 255
         OUTLINECOLOR   172 172 172
         WIDTH          1
+        OPACITY         50
       END
     END
 
@@ -83,6 +84,7 @@ MAP
         COLOR          150 150 150
         OUTLINECOLOR   172 172 172
         WIDTH          1
+        OPACITY         50
       END
     END
 
@@ -94,6 +96,7 @@ MAP
         COLOR          100 255 100
         OUTLINECOLOR   172 172 172
         WIDTH          1
+        OPACITY         50
       END
     END
 
@@ -105,6 +108,7 @@ MAP
         COLOR          255 175 100
         OUTLINECOLOR   172 172 172
         WIDTH          1
+        OPACITY         50
       END
     END
 
@@ -116,6 +120,7 @@ MAP
         COLOR          200 100 255
         OUTLINECOLOR   172 172 172
         WIDTH          1
+        OPACITY         50
       END
     END
 
@@ -127,6 +132,7 @@ MAP
         COLOR          255 255 100
         OUTLINECOLOR   172 172 172
         WIDTH          1
+        OPACITY         50
       END
     END
 

gebieden.map

@@ -269,7 +269,6 @@ MAP
     TYPE            POLYGON
     MINSCALEDENOM   100
     MAXSCALEDENOM   20001
-    OPACITY         60
     TEMPLATE        "fooOnlyForWMSGetFeatureInfo.html"
     PROJECTION
     "init=epsg:28992"
@@ -292,6 +291,7 @@ MAP
         COLOR          255 140 40
         OUTLINECOLOR   172 172 172
         WIDTH          1
+        OPACITY         60
       END
     END
 
@@ -302,6 +302,7 @@ MAP
         COLOR          255 200 150
         OUTLINECOLOR   172 172 172
         WIDTH          1
+        OPACITY         60
       END
     END
 

mapserver.conf

@@ -0,0 +1,58 @@
+#
+# Sample MapServer 8.0 Config File
+#
+CONFIG
+
+  #
+  # Environment variables
+  #
+  ENV
+    #
+    # Limit Mapfile Access
+    #
+    # MS_MAP_NO_PATH "1"
+    MS_MAP_PATTERN "^/" ## required when referencing mapfiles by path
+    MS_MAP_BAD_PATTERN "[/\\]{2}|[/\\]?\\.+[/\\]|,"
+
+    #
+    # Global Log/Debug Setup
+    #
+    MS_DEBUGLEVEL "5"
+    # MS_ERRORFILE "/opt/mapserver/logs/mapserver.log"
+
+    #
+    # Proj Library
+    #
+    # PROJ_DATA "/usr/local/share/proj"
+
+    #
+    # Default Map
+    #
+    # MS_MAPFILE "/opt/mapserver/test/test.map"
+
+    # disable POST requests (allowed by default, any value will do)
+    # MS_NO_POST "1"
+
+    #
+    # Other Options
+    #
+    # MS_ENCRYPTION_KEY "/opt/mapserver/mykey.txt"
+    # MS_USE_GLOBAL_FT_CACHE 1 # use a global font cache
+    # MS_PDF_CREATION_DATE "01/02/2022" # PDF create date metadata
+    # MS_MAPFILE_PATTERN "\.map$"
+    # MS_XMLMAPFILE_XSLT "/path/to/mapfile.xsl"
+    # MS_MODE "BROWSE" # default mode for CGI calls
+    # MS_OPENLAYERS_JS_URL "http://openlayers.org/api/OpenLayers.js"
+    # MS_TEMPPATH "/tmp"
+    # MS_MAX_OPEN_FILES 200 # maximum number of open files allowed on Windows
+    # MS_WMS_ERROR_STATUS_CODE "ON"  # enable HTTP status code 4xx and 5xx in case of errors on WMS requests
+  END
+
+  #
+  # Map aliases
+  #
+  MAPS
+    TEST_MAPFILE "/opt/mapserver/water.map"
+  END
+
+END