Merge branch 'master' into develop

base.dockerfile

@@ -1,4 +1,4 @@
-FROM ubuntu:lunar-20230301
+FROM ubuntu:noble-20241118.1
 ARG VERSION
 LABEL org.opencontainers.image.authors="Balázs Dukai <[email protected]>"
 LABEL org.opencontainers.image.vendor="3DGI"
@@ -22,9 +22,9 @@ RUN apt-get update && apt-get -y install \
     cmake
 
 RUN cd /tmp && \
-    wget https://download.osgeo.org/proj/proj-9.1.0.tar.gz && \
-    tar -zxvf proj-9.1.0.tar.gz  && \
-    cd proj-9.1.0 && \
+    wget https://download.osgeo.org/proj/proj-9.5.1.tar.gz && \
+    tar -zxvf proj-9.5.1.tar.gz  && \
+    cd proj-9.5.1 && \
     mkdir build && \
     cd build/ && \
     cmake .. -DCMAKE_BUILD_TYPE=Release -DBUILD_TESTING=OFF && \
@@ -45,7 +45,7 @@ RUN cd /tmp && \
     rm -rf /tmp/* && \
     mkdir /tmp/geoflow-bundle
 
-ARG CGAL_VERSION=5.5
+ARG CGAL_VERSION=5.6.2
 RUN cd /tmp && \
     apt-get install -y libboost-system-dev libboost-thread-dev libgmp-dev libmpfr-dev zlib1g-dev && \
     wget https://github.com/CGAL/cgal/releases/download/v${CGAL_VERSION}/CGAL-${CGAL_VERSION}.tar.xz && \

builder.dockerfile

@@ -1,4 +1,4 @@
-FROM 3dgi/geoflow-bundle-base:2023.03.15
+FROM 3dgi/geoflow-bundle-base:2024.12.04
 ARG VERSION
 LABEL org.opencontainers.image.authors="Balázs Dukai <[email protected]>"
 LABEL org.opencontainers.image.vendor="3DGI"