Updated for release

- Updated Docker containers to use Debian 12 (Bookworm)
- Updated changelog

CHANGELOG.md

@@ -2,6 +2,14 @@
 
 # Changelog
 
+## 2.2.2
+
+- Update versions of Bootstrap and Proj4js
+- Bug fix - invalid SQL
+
+	Version 13 of PostgreSQL is tolerant of a missing space after a parameter,
+	but not PostgreSQL 15.
+
 ## 2.2.1
 
 - Bug Fix - use session defaults for location search when setting `date from`

Dockerfile-postgis.in

@@ -1,14 +1,15 @@
 # -*- mode: dockerfile; -*- vim: set ft=dockerfile:
-FROM postgres:13.12-bullseye
+FROM postgres:15.4-bookworm
 LABEL uk.co.fdsd.tripserver.postgis.version="@PACKAGE_VERSION@"
 
 ENV POSTGIS_MAJOR 3
-ENV POSTGIS_VERSION 3.1.1+dfsg-1+deb11u1
+ENV POSTGIS_VERSION 3.3.2+dfsg-1+b1
+ENV POSTGIS_SCRIPTS_VERSION 3.3.2+dfsg-1
 RUN apt-get update \
     && apt-cache showpkg postgresql-$PG_MAJOR-postgis-$POSTGIS_MAJOR \
     && apt-get install -y --no-install-recommends \
     postgresql-$PG_MAJOR-postgis-$POSTGIS_MAJOR=$POSTGIS_VERSION \
-    postgresql-$PG_MAJOR-postgis-$POSTGIS_MAJOR-scripts=$POSTGIS_VERSION \
+    postgresql-$PG_MAJOR-postgis-$POSTGIS_MAJOR-scripts=$POSTGIS_SCRIPTS_VERSION \
     && rm -rf /var/lib/apt/lists/*
 RUN localedef -i en_GB -c -f UTF-8 -A /usr/share/locale/locale.alias en_GB.UTF-8
 ENV LANG en_GB.utf8

Dockerfile.in

@@ -1,5 +1,5 @@
 # -*- mode: dockerfile; -*- vim: set ft=dockerfile:
-FROM  debian:11.7-slim AS build
+FROM  debian:12.2-slim AS build
 RUN groupadd --gid 1000 trip \
     && useradd --uid 1000 --gid trip --shell /bin/bash --create-home trip
 RUN apt-get update \
@@ -45,7 +45,7 @@ RUN make install install-html install-pdf
 
 WORKDIR /usr/local/etc
 
-FROM  debian:11.7-slim
+FROM  debian:12.2-slim
 LABEL uk.co.fdsd.tripserver.version="@PACKAGE_VERSION@"
 
 RUN groupadd --gid 1000 trip \
@@ -54,8 +54,8 @@ RUN groupadd --gid 1000 trip \
 RUN apt-get update \
     && apt-get install -y --no-install-recommends \
     locales tzdata \
-    libboost-locale1.74.0 libpugixml1v5 libyaml-cpp0.6 \
-    uuid libpqxx-6.4 libcairomm-1.0-1v5 libcmark0.29.0 \
+    libboost-locale1.74.0 libpugixml1v5 libyaml-cpp0.7 \
+    uuid libpqxx-6.4 libcairomm-1.0-1v5 libcmark0.30.2 \
     postgresql postgresql-contrib postgis
 
 RUN sed -i -e 's/# en_GB.UTF-8 UTF-8/en_GB.UTF-8 UTF-8/' /etc/locale.gen && \

RELEASE_PROCEDURE.md

@@ -34,6 +34,13 @@
 
 ## Docker
 
+1.  Check the `Dockerfile` has been updated to the use the correct release
+	version number.  The version information is updated by `configure`
+	when `Dockerfile` is created from `Dockerfile.in`.
+
+		$ grep 'ARG TRIP_SERVER_VERSION' Dockerfile
+		$ grep LABEL Dockerfile Dockerfile-postgis
+
 1.  Optionally, build the database image.  This only needs updating if
     there have been any database schema changes.
 
@@ -45,13 +52,6 @@
 
 1.  Build the `trip-server-2` image:
 
-	1.  Check the `Dockerfile` has been updated to the use the correct release
-        version number.  The version information is updated by `configure`
-        when `Dockerfile` is created from `Dockerfile.in`.
-
-            $ grep 'ARG TRIP_SERVER_VERSION' Dockerfile
-            $ grep LABEL Dockerfile Dockerfile-postgis
-
     1.  If necessary, copy the `trip server` distribution tarball to the root
         source folder to build the Docker image. E.g.
 

configure.ac

@@ -2,7 +2,7 @@
 # Process this file with autoconf to produce a configure script.
 
 AC_PREREQ([2.69])
-AC_INIT([trip],[2.2.2-rc.1],[frank.dean@fdsd.co.uk])
+AC_INIT([trip],[2.2.2],[frank.dean@fdsd.co.uk])
 BOOTSTRAP_VERSION='5.3.2'
 OPENLAYERS_VERSION='7.5.2'
 PROJ4JS_VERSION='2.9.1'

po/en_GB.po

@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: trip 2.0.0\n"
 "Report-Msgid-Bugs-To: Frank Dean <frank.dean@fdsd.co.uk>\n"
-"POT-Creation-Date: 2023-09-21 12:25+0100\n"
+"POT-Creation-Date: 2023-10-14 15:36+0100\n"
 "PO-Revision-Date: 2023-09-18 17:18+0100\n"
 "Last-Translator: Frank Dean <frank@fdsd.co.uk>\n"
 "Language-Team: English (British) <(nothing)>\n"

po/es.po

@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: trip 2.0.0\n"
 "Report-Msgid-Bugs-To: Frank Dean <frank.dean@fdsd.co.uk>\n"
-"POT-Creation-Date: 2023-09-21 12:25+0100\n"
+"POT-Creation-Date: 2023-10-14 15:36+0100\n"
 "PO-Revision-Date: 2023-06-02 11:29+0100\n"
 "Last-Translator: Frank Dean <frank@fdsd.co.uk>\n"
 "Language-Team: Spanish <es@tp.org.es>\n"

po/fr.po

@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: trip 2.0.0\n"
 "Report-Msgid-Bugs-To: Frank Dean <frank.dean@fdsd.co.uk>\n"
-"POT-Creation-Date: 2023-09-21 12:25+0100\n"
+"POT-Creation-Date: 2023-10-14 15:36+0100\n"
 "PO-Revision-Date: 2023-06-02 11:30+0100\n"
 "Last-Translator: Frank Dean <frank@fdsd.co.uk>\n"
 "Language-Team: French <traduc@traduc.org>\n"