Font fixes and updates to posgis example

Author: geographika

workshop/content/docs/credits.md

@@ -10,6 +10,7 @@ title: Credits
 
 Thanks to the following for helping this workshop to be created:
 
+- Colleagues at [Compass Informatics](https://compass.ie/) for attending the workshop and providing valuable feedback 
 - The [pygeoapi](https://pygeoapi.io/) team - this workshop is based on the technology and approach used in the excellent
   [Diving into pygeoapi workshop](https://dive.pygeoapi.io/).
 - [Stéphane Brunner](https://github.com/sbrunner) from [Camptocamp](https://www.camptocamp.com/)

workshop/content/docs/inputs/databases.md

@@ -14,7 +14,15 @@ databases.
 To avoid having to install and setup a database we'll be using the [PostGIS Docker image](https://hub.docker.com/r/kartoza/postgis/) provided
 by [Kartoza](https://kartoza.com/).
 
-We will use a different Docker Compose file, which includes a PostGIS container for this exercise.
+!!! info
+
+  We will use a different Docker Compose file, which includes a PostGIS container for this exercise. We can stop the current Docker containers, and run the alternate Docker containers with the following commands:
+
+  ```bash
+  cd ./getting-started-with-mapserver/workshop/exercises
+  docker compose down
+  docker compose -f docker-db-compose.yml up -d 
+  ```
 
 
 ## Checking the Database Connection with QGIS
@@ -46,7 +54,7 @@ We can use the OGR tool [ogr2ogr](https://gdal.org/programs/ogr2ogr.html) instal
 
 ```bash
 # connect to the MapServer Docker image which includes OGR tools for importing data
-docker exec -it mapserver bash
+docker exec -it mapserver2 bash
 # navigate to the folder containing the OSM FlatGeobuf files
 cd /etc/mapserver/data/osm
 # import the water polygons dataset to the Postgres database in the Postgres Docker image

workshop/content/docs/inputs/raster.md

@@ -103,5 +103,5 @@ A [COMPOSITE](https://mapserver.org/mapfile/composite.html) block is used on the
 
 ## Exercises
 
-1. Try different settings for layer `OPACITY` to see its effect on the output.
+1. Try different settings for layer `OPACITY` to see its effect on the output in `raster.map`.
 2. Change the `COLOR` of the first `CLASS` in `terrain.include` to highlight which pixels have values in this range.

workshop/content/docs/introduction/docker.md

@@ -45,4 +45,32 @@ A second container that serves the JavaScript example pages is also run using Do
       - mynetwork
     command: >
       sh -c "npm install && npm start"
+```
+
+## Stopping and Starting Docker
+
+```bash
+
+  cd ./getting-started-with-mapserver/workshop/exercises
+  # start docker in detached mode
+  docker compose up -d
+  # the following URLs should now be available
+  # http://localhost:5000
+  # http://localhost:5001
+
+  # stop docker
+  docker compose down
+
+  # for help
+  docker compose help
+  # for a specific command
+  docker compose up --help
+```
+
+
+## Removing a Container
+
+```bash
+# to remove a container named db
+docker rm db
 ```

workshop/content/docs/mapfile/labels.md

@@ -58,7 +58,7 @@ GEOMTRANSFORM (centerline(densify([shape], 0.1)))
 
 ## Exercises
 
-1. Use a different font for the label by adding the following to the `LABEL` block: `FONT LiberationMono`.
+1. Use a different font for the label by adding the following to the `LABEL` block: `FONT MonsieurLaDoulaise` and increasing the `SIZE` to `28`.
 2. Comment out the `GEOMTRANSFORM (centerline([shape]))` and `ANGLE FOLLOW` lines (using `#`) to see its effect on the map.
 
 <!--

workshop/exercises/docker-db-compose.yml

@@ -30,7 +30,7 @@
 services:
   mapserver:
     image: camptocamp/mapserver:8.0
-    container_name: mapserver
+    container_name: mapserver2
     ports:
       - 5000:80
     environment:
@@ -43,7 +43,7 @@ services:
 
   node:
     image: node:lts-slim
-    container_name: node
+    container_name: node2
     ports:
       - 5001:5001
     working_dir: /home/node/app

workshop/exercises/mapfiles/data/fonts/MonsieurLaDoulaise-Regular.ttf

@@ -3,3 +3,4 @@ MaterialIcons          MaterialIcons-Regular.ttf
 MaterialIconsRound     MaterialIconsRound-Regular.otf
 LiberationMono         LiberationMono-Regular.ttf
 LiberationSans         LiberationSans-Regular.ttf
+MonsieurLaDoulaise     MonsieurLaDoulaise-Regular.ttf