From 8389b8f436910686d024a6d085eb35561d32b59f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bal=C3=A1zs=20Dukai?= Date: Tue, 3 Dec 2024 13:29:30 +0100 Subject: [PATCH 1/2] Update docker images --- base.dockerfile | 8 ++++---- builder.dockerfile | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/base.dockerfile b/base.dockerfile index 48a8e18..be0c9cc 100644 --- a/base.dockerfile +++ b/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 " 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 && \ diff --git a/builder.dockerfile b/builder.dockerfile index c9968de..bd8494d 100644 --- a/builder.dockerfile +++ b/builder.dockerfile @@ -1,4 +1,4 @@ -FROM 3dgi/geoflow-bundle-base:2023.03.15 +FROM 3dgi/geoflow-bundle-base:2024.12.03 ARG VERSION LABEL org.opencontainers.image.authors="Balázs Dukai " LABEL org.opencontainers.image.vendor="3DGI" From b8eb0566d85e15c864b3b0313e6893321c442fd2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bal=C3=A1zs=20Dukai?= Date: Wed, 4 Dec 2024 14:23:32 +0100 Subject: [PATCH 2/2] Update docker images with cgal 5.6 --- base.dockerfile | 2 +- builder.dockerfile | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/base.dockerfile b/base.dockerfile index be0c9cc..b1e61cd 100644 --- a/base.dockerfile +++ b/base.dockerfile @@ -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 && \ diff --git a/builder.dockerfile b/builder.dockerfile index bd8494d..83fd6c2 100644 --- a/builder.dockerfile +++ b/builder.dockerfile @@ -1,4 +1,4 @@ -FROM 3dgi/geoflow-bundle-base:2024.12.03 +FROM 3dgi/geoflow-bundle-base:2024.12.04 ARG VERSION LABEL org.opencontainers.image.authors="Balázs Dukai " LABEL org.opencontainers.image.vendor="3DGI"