Merge pull request #9 from geographika/docker

Update notes on Docker

Author: geographika

docker/Dockerfile

@@ -1,4 +1,4 @@
-FROM ghcr.io/osgeo/gdal:ubuntu-full-3.11.4 AS gdal
+FROM ghcr.io/osgeo/gdal:ubuntu-full-3.12.2 AS gdal
 # see https://github.com/OSGeo/gdal/tree/master/docker#ubuntu-based
 
 FROM gdal AS builder
@@ -9,13 +9,43 @@ RUN --mount=type=cache,target=/var/cache,sharing=locked \
     --mount=type=cache,target=/root/.cache \
     apt-get update \
     && apt-get upgrade --assume-yes \
-    && DEBIAN_FRONTEND=noninteractive apt-get install --assume-yes --no-install-recommends bison \
-        flex python3-lxml libfribidi-dev swig \
-        cmake librsvg2-dev colordiff libpq-dev libpng-dev libjpeg-dev libgif-dev libgeos-dev libgd-dev \
-        libfreetype6-dev libfcgi-dev libcurl4-gnutls-dev libcairo2-dev libxml2-dev \
-        libxslt1-dev python3-dev python3-pip python3-setuptools python3-venv php-dev libexempi-dev lcov lftp ninja-build git curl \
-        clang libprotobuf-c-dev protobuf-c-compiler libharfbuzz-dev libcairo2-dev librsvg2-dev \
-        unixodbc-dev \
+    && DEBIAN_FRONTEND=noninteractive apt-get install --assume-yes --no-install-recommends \
+    bison \
+    flex \
+    python3-lxml \
+    libfribidi-dev \
+    swig \
+    cmake \
+    librsvg2-dev \
+    colordiff \
+    libpq-dev \
+    libpng-dev \
+    libjpeg-dev \
+    libgif-dev \
+    libgeos-dev \
+    libgd-dev \
+    libfreetype6-dev \
+    libfcgi-dev \
+    libcurl4-gnutls-dev \
+    libcairo2-dev \
+    libxml2-dev \
+    libxslt1-dev \
+    python3-dev \
+    php-dev \
+    libexempi-dev \
+    lcov \
+    lftp \
+    ninja-build \
+    git \
+    curl \
+    clang \
+    libprotobuf-c-dev \
+    protobuf-c-compiler \
+    libharfbuzz-dev \
+    python3-pip \
+    python3-setuptools \
+    python3-venv \
+    unixodbc-dev \
     && ln -s /usr/lib/*-linux-gnu/libproj.so.*[0] $(echo /usr/lib/*-linux-gnu)/libproj.so
 
 ARG MAPSERVER_BRANCH
@@ -37,7 +67,7 @@ RUN cmake .. \
     -DWITH_CLIENT_WMS=1 \
     -DWITH_CLIENT_WFS=1 \
     -DWITH_OGCAPI=1 \
-    -DWITH_KML=0 \
+    -DWITH_KML=1 \
     -DWITH_SOS=0 \
     -DWITH_XMLMAPFILE=0 \
     -DWITH_CAIRO=1 \
@@ -87,7 +117,7 @@ RUN a2enmod fcgid headers status \
     s!^(\s*ErrorLog)\s+\S+!\1 /proc/self/fd/2!g; \
     ' '{}' ';' \
     && sed -ri 's!LogFormat "(.*)" combined!LogFormat "%{us}T %{X-Request-Id}i \1" combined!g' /etc/apache2/apache2.conf \
-    && echo 'ErrorLogFormat "%{X-Request-Id}i [%l] [pid %P] %M"' >> /etc/apache2/apache2.conf \
+    && echo 'ErrorLogFormat "%{X-Request-Id}i [%l] [pid %P] %M"' > /etc/apache2/conf-enabled/000-error-log-format.conf \
     && sed -i -e 's/<VirtualHost \*:80>/<VirtualHost *:8080>/' /etc/apache2/sites-available/000-default.conf \
     && sed -i -e 's/Listen 80$/Listen 8080/' /etc/apache2/ports.conf \
     && rm -rf /etc/apache2/conf-enabled/other-vhosts-access-log.conf

docker/ReadMe.md

@@ -9,7 +9,6 @@ Workshop attendees don't need to build these images themselves, they can simply
 ```
 start "C:\Program Files\Docker\Docker\Docker Desktop.exe"
 
-# add --no-cache to the command below to force getting the latest code
 # can also test other repos / branches
 
 cd D:\GitHub\getting-started-with-mapserver\docker
@@ -21,6 +20,15 @@ docker build `
     --build-arg=MAPSERVER_REPO=https://github.com/mapserver/mapserver `
     .
 
+# add --no-cache to the command below to force getting the latest code
+docker build `
+    --tag "mapserver-workshop" `
+    --target=runner `
+    --build-arg=MAPSERVER_BRANCH=main `
+    --build-arg=MAPSERVER_REPO=https://github.com/mapserver/mapserver `
+    --no-cache `
+    .
+
 # docker run -it --name mapserver-workshop -p 8080:8080 mapserver-workshop
 
 docker tag mapserver-workshop geographika/mapserver-workshop
@@ -30,6 +38,14 @@ docker tag mapserver-workshop geographika/mapserver-workshop
 docker push geographika/mapserver-workshop
 ```
 
+If there are connection issues, try running the following test from the host, and check proxy/DNS settings:
+
+```
+ping archive.ubuntu.com
+```
+
+Also check https://status.canonical.com/
+
 ## Testing
 
 ```
@@ -61,9 +77,12 @@ docker tag mapserver-workshop-demo geographika/mapserver-workshop-demo
 # docker push geographika/mapserver-workshop-demo
 
 # DigitalOcean
-doctl auth init
+# https://mapserver-workshop-k8hvw.ondigitalocean.app/
+# used for https://mapserver.github.io/getting-started-with-mapserver-demo/
+# Login and get a new API token with permissions for "registry"
+
+doctl auth init -t dop_v1_XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
 doctl registry login
 docker tag mapserver-workshop-demo registry.digitalocean.com/geographika/mapserver-workshop-demo:latest
 docker push registry.digitalocean.com/geographika/mapserver-workshop-demo:latest
-
 ```

workshop/exercises/README.md

@@ -30,4 +30,10 @@ To view live logs:
 
 ```bash
 docker logs --follow mapserver
+```
+
+To force getting the latest Docker images:
+
+```bash
+docker compose up -d --pull always
 ```