Update ports and Docker image

Author: geographika

workshop/content/docs/introduction/docker.md

@@ -10,15 +10,15 @@ MapServer runs on the Apache web server - see the [Apache page](../advanced/apac
 
 It uses the Apache [mod_fcgid module](https://httpd.apache.org/mod_fcgid/), module that provides FastCGI support.
 
-MapServer runs on port 80 on the Docker container, which is mapped to port 5002 on the local machine, as can be seen in the Docker compose file
+MapServer runs on port 80 on the Docker container, which is mapped to port 7000 on the local machine, as can be seen in the Docker compose file
 located at `workshop\exercises\docker-compose.yml`:
 
 ```yaml
   mapserver:
-    image: camptocamp/mapserver:8.4-gdal3.10
+    image: geographika/mapserver-workshop:latest
     container_name: mapserver
     ports:
-      - 5002:80
+      - 7000:80
     environment:
       MAPSERVER_CONFIG_FILE: "/etc/mapserver/mapserver.conf"
     volumes:
@@ -30,14 +30,14 @@ located at `workshop\exercises\docker-compose.yml`:
 
 ## JavaScript Application
 
-A second container that serves the JavaScript example pages is also run using Docker. This uses node and runs on port 5001 on both the container and the host machine.
+A second container that serves the JavaScript example pages is also run using Docker. This uses node and runs on port 7001 on both the container and the host machine.
 
 ```yaml
   node:
     image: node:lts-slim
     container_name: node
     ports:
-      - 5001:7001
+      - 7001:7001
     working_dir: /home/node/app
     volumes:
       - ./app:/home/node/app

workshop/exercises/app/.env

@@ -1,4 +1,4 @@
-VITE_MAPSERVER_BASE_URL=http://localhost:5002/?
-VITE_MAPSERVER_OGC_BASE_URL=http://localhost:5002/
+VITE_MAPSERVER_BASE_URL=http://localhost:7000/?
+VITE_MAPSERVER_OGC_BASE_URL=http://localhost:7000/
 VITE_MAPFILES_PATH=map=/etc/mapserver/
-VITE_APP_URL=http://node:5001/
+VITE_APP_URL=http://node:7001/

workshop/exercises/app/vite.config.js

@@ -14,7 +14,7 @@ export default {
     server: {
         host: true, // allow connections from other Docker containers
         allowedHosts: ['node', 'geographika.github.io'], // allow access using http://node:7001 from the mapserver container
-        port: 5001,
+        port: 7001,
         watch: {
             // fix for Windows on WSL - https://github.com/vitejs/vite/issues/1153
             usePolling: true

workshop/exercises/docker-compose.yml

@@ -29,10 +29,10 @@
 
 services:
   mapserver:
-    image: camptocamp/mapserver:8.4-gdal3.10
+    image: geographika/mapserver-workshop:latest
     container_name: mapserver
     ports:
-      - 7000:80
+      - 7000:8080
     environment:
       MAPSERVER_CONFIG_FILE: "/etc/mapserver/mapserver.conf"
     volumes:

workshop/exercises/mapfiles/mapserver.conf

@@ -52,6 +52,7 @@ CONFIG
     # OGC API
     #
     OGCAPI_HTML_TEMPLATE_DIRECTORY "/usr/local/share/mapserver/ogcapi/templates/html-bootstrap4/"
+    MS_MAP_PATTERN "."
   END
 
   #