Fix Ubuntu update

custom/Dockerfile

@@ -5,15 +5,17 @@ FROM ghcr.io/osgeo/gdal:ubuntu-small-3.9.2 AS base-all
 # Print commands and their arguments as they are executed.
 SHELL ["/bin/bash", "-o", "pipefail", "-cux"]
 
-ENV SSL_CERT_FILE=/etc/ssl/certs/ca-certificates.crt \
-    SETUPTOOLS_USE_DISTUTILS=stdlib
+ENV SSL_CERT_FILE=/etc/ssl/certs/ca-certificates.crt
 
 RUN --mount=type=cache,target=/var/lib/apt/lists \
     apt-get update
 
 RUN --mount=type=cache,target=/var/lib/apt/lists \
     --mount=type=cache,target=/var/cache,sharing=locked \
-    apt-get install --assume-yes --no-install-recommends python3-pip python3-dev
+    apt-get install --assume-yes --no-install-recommends python3-pip python3-dev python3-venv \
+    && python3 -m venv /venv
+
+ENV PATH=/venv/bin:$PATH
 
 FROM base-all as poetry
 
@@ -40,7 +42,7 @@ RUN --mount=type=cache,target=/var/cache,sharing=locked \
 RUN --mount=type=cache,target=/root/.cache \
     --mount=type=bind,from=poetry,source=/tmp,target=/tmp \
     python3 -m pip install --disable-pip-version-check --no-deps --requirement=/tmp/requirements.txt \
-    && strip /usr/local/lib/python3.*/dist-packages/*/*.so \
+    && strip /usr/lib/python3/dist-packages/*/*.so \
     && python3 -m compileall -q /usr/local/lib/python3.* -x '/(ptvsd|.*pydev.*|networkx)/'
 
 # hadolint ignore=DL3059
@@ -71,7 +73,7 @@ RUN --mount=type=cache,target=/root/.cache \
     python3 -m pip install --disable-pip-version-check --no-deps --editable=. \
     && python3 -m compileall -q /app/custom
 
-CMD [ "/usr/local/bin/gunicorn", "--paste=production.ini" ]
+CMD [ "/venv/bin/gunicorn", "--paste=production.ini" ]
 
 ARG GIT_HASH
 ENV GIT_HASH=${GIT_HASH}

custom/pyproject.toml

@@ -6,7 +6,7 @@ description = 'Not used'
 authors = []
 
 [tool.poetry.dependencies]
-python = ">=3.10,<3.11"
+python = ">=3.12,<3.13"
 gunicorn = "23.0.0"
 plaster-pastedeploy = "1.0.1"
 pyramid = "2.0.2"

custom/requirements.txt

@@ -1,5 +1,4 @@
 poetry==1.8.3
-pip==24.2
 certifi>=2024.7.4 # not directly required, pinned by Snyk to avoid a vulnerability
 zipp>=3.19.1 # not directly required, pinned by Snyk to avoid a vulnerability
 cryptography>=43.0.1 # not directly required, pinned by Snyk to avoid a vulnerability

docker-compose.override.sample.yaml

@@ -22,7 +22,7 @@ services:
       # - ./../dogpile.cache/dogpile:/usr/local/lib/python3.8/dist-packages/dogpile
       # - ./../c2c.template/c2c/template:/usr/local/lib/python3.8/dist-packages/c2c/template
     command:
-      - /usr/local/bin/pserve
+      - /venv/bin/pserve
       - --reload
       - c2c:///app/development.ini
     environment:
@@ -97,7 +97,7 @@ services:
 
   custom:
     command:
-      - /usr/local/bin/pserve
+      - /venv/bin/pserve
       - --reload
       - c2c://development.ini
     volumes:

geoportal/geomapfish_geoportal/static/story-map.html

@@ -14,19 +14,19 @@
       src="https://openlayers.org/en/v6.1.1/build/ol.js"
     ></script>
 
+    <script
+      crossorigin="anonymous"
+      integrity="sha384-vP/z9aans6YI3BbsSTDsd8QAz2AZgddRu3zU/QGw/ojfZD6wMQdwgD8A0g81Cl5B"
+      referrerpolicy="no-referrer"
+      src="https://cdn.jsdelivr.net/npm/ol-ext@4.0.23/dist/ol-ext.min.js"
+    ></script>
     <link
       crossorigin="anonymous"
-      href="https://viglino.github.io/ol-ext/dist/ol-ext.css"
-      integrity="sha384-KSHvdI+T8Im0cBPfaf7gMjk8bMzKfUH700QOHVSA4W9OtLwuRXHSbxiJ9GnygY3i"
+      href="https://cdn.jsdelivr.net/npm/ol-ext@4.0.23/dist/ol-ext.min.css"
+      integrity="sha384-Whi7nF+7F+e1FpzL960zlMNB4nMpn7JRdxDRJuedzooO5XZbg+cN+Rp1kTq6nexh"
       referrerpolicy="no-referrer"
       rel="stylesheet"
     />
-    <script
-      crossorigin="anonymous"
-      integrity="sha384-wbWV6iwZJtEGfTzL0Zwh3uNF+p2PbKYWiqXSsHwCFk1iZmdIAr3SmI3N74qjFZK8"
-      referrerpolicy="no-referrer"
-      src="https://viglino.github.io/ol-ext/dist/ol-ext.js"
-    ></script>
 
     <style>
       #map {

pyproject.toml

@@ -5,3 +5,12 @@ target-version = ['py39']
 [tool.isort]
 profile = "black"
 line_length = 110
+
+[package]
+name = "custom"
+
+[project.entry-points."paste.app_factory"]
+main = "custom:main"
+
+[project.entry-points."console_scripts"]
+custom-initialize-db = "custom.scripts.initialize_db:main"