From fcf05a38c945b37db2b35d9aee0bbe59a09ee2f2 Mon Sep 17 00:00:00 2001 From: wlorenzetti Date: Thu, 7 Nov 2024 14:49:38 +0100 Subject: [PATCH 1/3] Refactoring fro Ubuntu 24.04 --- Dockerfile.g3wsuite-deps.ltr.dockerfile | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/Dockerfile.g3wsuite-deps.ltr.dockerfile b/Dockerfile.g3wsuite-deps.ltr.dockerfile index b94f49d60..0e7486b1b 100644 --- a/Dockerfile.g3wsuite-deps.ltr.dockerfile +++ b/Dockerfile.g3wsuite-deps.ltr.dockerfile @@ -4,7 +4,7 @@ # This image extends UBUNTU and ships latest QGIS LTR version ## -FROM ubuntu:jammy +FROM ubuntu:noble LABEL maintainer="Gis3w" \ Description="Image used to prepare build requirements for g3w-suite docker images" \ @@ -18,10 +18,9 @@ RUN chown root:root /tmp && chmod ugo+rwXt /tmp RUN apt-get update && apt install -y \ libxml2-dev \ libxslt-dev \ - postgresql-server-dev-all \ libgdal-dev \ python3-dev \ - libgdal30 \ + libgdal34t64 \ python3-gdal \ python3-pip \ curl \ @@ -33,7 +32,7 @@ RUN apt-get update && apt install -y \ # PyQGIS 3.34 RUN curl -sS https://download.qgis.org/downloads/qgis-archive-keyring.gpg > /etc/apt/keyrings/qgis-archive-keyring.gpg && \ - echo "deb [signed-by=/etc/apt/keyrings/qgis-archive-keyring.gpg] https://qgis.org/ubuntu-ltr jammy main" | \ + echo "deb [signed-by=/etc/apt/keyrings/qgis-archive-keyring.gpg] https://qgis.org/ubuntu-ltr noble main" | \ tee /etc/apt/sources.list.d/qgis.list && \ apt-get update && apt-get install -y python3-qgis qgis-server From ef93cf10396c00f3be84dc94c62c0ce8e3f80db8 Mon Sep 17 00:00:00 2001 From: wlorenzetti Date: Thu, 7 Nov 2024 14:49:56 +0100 Subject: [PATCH 2/3] Fix for Python 3.12 --- scripts/setup.sh | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/scripts/setup.sh b/scripts/setup.sh index 6bbee55b4..be17598d6 100644 --- a/scripts/setup.sh +++ b/scripts/setup.sh @@ -10,8 +10,8 @@ fi cp /requirements_rl.txt . # Override settings -pip3 install -r requirements_rl.txt -pip3 install -r requirements_huey.txt +pip3 install -r requirements_rl.txt --break-system-packages +pip3 install -r requirements_huey.txt --break-system-packages # Front end #TODO make this as generic so that we can install as many plugins as possible @@ -19,14 +19,14 @@ git submodule add -f https://github.com/g3w-suite/g3w-admin-frontend.git g3w-ad # Caching -pip3 install -r /code/g3w-admin/caching/requirements.txt +pip3 install -r /code/g3w-admin/caching/requirements.txt --break-system-packages # File manager -pip3 install -r /code/g3w-admin/filemanager/requirements.txt +pip3 install -r /code/g3w-admin/filemanager/requirements.txt --break-system-packages # Qplotly -pip3 install -r /code/g3w-admin/qplotly/requirements.txt +pip3 install -r /code/g3w-admin/qplotly/requirements.txt --break-system-packages # Openrouteservice -pip3 install -r /code/g3w-admin/openrouteservice/requirements.txt +pip3 install -r /code/g3w-admin/openrouteservice/requirements.txt --break-system-packages From 684376cd425388055b1e76f17de0f4b858c63dc8 Mon Sep 17 00:00:00 2001 From: wlorenzetti Date: Mon, 11 Nov 2024 12:46:18 +0100 Subject: [PATCH 3/3] Update paths and libraries. --- Dockerfile.g3wsuite-deps.dockerfile | 14 +++++++------- Dockerfile.g3wsuite-deps.ltr.dockerfile | 5 +++-- Dockerfile.g3wsuite-deps.ltr.mssql.dockerfile | 9 ++++----- 3 files changed, 14 insertions(+), 14 deletions(-) diff --git a/Dockerfile.g3wsuite-deps.dockerfile b/Dockerfile.g3wsuite-deps.dockerfile index b2e6eec48..fe349f82f 100644 --- a/Dockerfile.g3wsuite-deps.dockerfile +++ b/Dockerfile.g3wsuite-deps.dockerfile @@ -4,12 +4,12 @@ # This image extends UBUNTU and ships latest QGIS version ## -FROM ubuntu:jammy +FROM ubuntu:noble LABEL maintainer="Gis3w" \ Description="Image used to prepare build requirements for g3w-suite docker images" \ Vendor="Gis3w" \ - Version="1.2" + Version="dev" ENV DEBIAN_FRONTEND=noninteractive @@ -18,10 +18,9 @@ RUN chown root:root /tmp && chmod ugo+rwXt /tmp RUN apt-get update && apt install -y \ libxml2-dev \ libxslt-dev \ - postgresql-server-dev-all \ libgdal-dev \ python3-dev \ - libgdal30 \ + libgdal34t64 \ python3-gdal \ python3-pip \ curl \ @@ -29,11 +28,12 @@ RUN apt-get update && apt install -y \ gdal-bin \ libsqlite3-mod-spatialite \ dirmngr \ - xvfb + xvfb \ + postgresql-client -# PyQGIS 3.34 +# PyQGIS RUN curl -sS https://download.qgis.org/downloads/qgis-archive-keyring.gpg > /etc/apt/keyrings/qgis-archive-keyring.gpg && \ - echo "deb [signed-by=/etc/apt/keyrings/qgis-archive-keyring.gpg] https://qgis.org/ubuntu jammy main" | \ + echo "deb [signed-by=/etc/apt/keyrings/qgis-archive-keyring.gpg] https://qgis.org/ubuntu noble main" | \ tee /etc/apt/sources.list.d/qgis.list && \ apt-get update && apt-get install -y python3-qgis qgis-server diff --git a/Dockerfile.g3wsuite-deps.ltr.dockerfile b/Dockerfile.g3wsuite-deps.ltr.dockerfile index 0e7486b1b..9883e883d 100644 --- a/Dockerfile.g3wsuite-deps.ltr.dockerfile +++ b/Dockerfile.g3wsuite-deps.ltr.dockerfile @@ -28,9 +28,10 @@ RUN apt-get update && apt install -y \ gdal-bin \ libsqlite3-mod-spatialite \ dirmngr \ - xvfb + xvfb \ + postgresql-client -# PyQGIS 3.34 +# PyQGIS Last LTR RUN curl -sS https://download.qgis.org/downloads/qgis-archive-keyring.gpg > /etc/apt/keyrings/qgis-archive-keyring.gpg && \ echo "deb [signed-by=/etc/apt/keyrings/qgis-archive-keyring.gpg] https://qgis.org/ubuntu-ltr noble main" | \ tee /etc/apt/sources.list.d/qgis.list && \ diff --git a/Dockerfile.g3wsuite-deps.ltr.mssql.dockerfile b/Dockerfile.g3wsuite-deps.ltr.mssql.dockerfile index 4d78f6bb1..27d93bb07 100644 --- a/Dockerfile.g3wsuite-deps.ltr.mssql.dockerfile +++ b/Dockerfile.g3wsuite-deps.ltr.mssql.dockerfile @@ -20,10 +20,9 @@ RUN chown root:root /tmp && chmod ugo+rwXt /tmp RUN apt-get update && apt install -y \ libxml2-dev \ libxslt-dev \ - postgresql-server-dev-all \ libgdal-dev \ python3-dev \ - libgdal30 \ + libgdal34t64 \ python3-gdal \ python3-pip \ curl \ @@ -35,15 +34,15 @@ RUN apt-get update && apt install -y \ libqt5sql5-tds \ xvfb -# PyQGIS 3.22 +# PyQGIS LTR RUN curl -sS https://download.qgis.org/downloads/qgis-archive-keyring.gpg > /etc/apt/keyrings/qgis-archive-keyring.gpg && \ - echo "deb [signed-by=/etc/apt/keyrings/qgis-archive-keyring.gpg] https://qgis.org/ubuntu-ltr jammy main" | \ + echo "deb [signed-by=/etc/apt/keyrings/qgis-archive-keyring.gpg] https://qgis.org/ubuntu-ltr noble main" | \ tee /etc/apt/sources.list.d/qgis.list && \ apt-get update && apt-get install -y python3-qgis qgis-server # MSSQL RUN curl https://packages.microsoft.com/keys/microsoft.asc | apt-key add && \ - echo "deb https://packages.microsoft.com/ubuntu/22.04/prod jammy main" >> /etc/apt/sources.list && \ + echo "deb https://packages.microsoft.com/ubuntu/24.04/prod jammy main" >> /etc/apt/sources.list && \ apt update && ACCEPT_EULA=Y apt install -y msodbcsql18 mssql-tools # Yarn