Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update base image docker to Ubuntu 24.04 #127

Open
wants to merge 3 commits into
base: dev
Choose a base branch
from
Open

Update base image docker to Ubuntu 24.04 #127

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
fcf05a3
Refactoring fro Ubuntu 24.04
Nov 7, 2024
ef93cf1
Fix for Python 3.12
Nov 7, 2024
684376c
Update paths and libraries.
Nov 11, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 7 additions & 7 deletions Dockerfile.g3wsuite-deps.dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand All @@ -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
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Maybe you could also think about specifying the exact versions to install of: python3-qgis qgis-server

If I pull an old g3w-suite image (today), wouldn't it always install the latest available?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

With no 'LTR' by apt repository is installed last version of QGIS and QGIS server, is not possibile set the verssion to install. I replay to your question?


Expand Down
12 changes: 6 additions & 6 deletions Dockerfile.g3wsuite-deps.ltr.dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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" \
Expand All @@ -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

Expand Down
9 changes: 4 additions & 5 deletions Dockerfile.g3wsuite-deps.ltr.mssql.dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand All @@ -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
Expand Down
12 changes: 6 additions & 6 deletions scripts/setup.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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