Update base image docker to Ubuntu 24.04 (#127)

* Refactoring fro Ubuntu 24.04 * Fix for Python 3.12 * Update paths and libraries. --------- Co-authored-by: wlorenzetti <[email protected]>
g3w-suite · Dec 10, 2024 · cd255bd · cd255bd
1 parent b596842
commit cd255bd
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 24 deletions.
diff --git 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,22 +18,22 @@ 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 \
     wait-for-it \
     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
@@ -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,22 +18,22 @@ 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 \
     wait-for-it \
     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 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
 

diff --git 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

diff --git a/scripts/setup.sh b/scripts/setup.sh
@@ -10,23 +10,23 @@ 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
 git submodule add -f https://github.com/g3w-suite/g3w-admin-frontend.git  g3w-admin/frontend
 
 
 # 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