Skip to content

Commit d11557f

Browse files
committed
base: Update Python to v3.11.8
1 parent d12847a commit d11557f

File tree

2 files changed

+11
-10
lines changed

2 files changed

+11
-10
lines changed

base/.gitlab-ci.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
.env:
22
variables:
33
OTB_VERSION: "8.1.2"
4-
PYTHON_VERSION: "3.11.7"
4+
PYTHON_VERSION: "3.11.8"
55
GIT_VERSION: "2.43.0"
66

77
.before-script-build: &before-script-build

base/Dockerfile

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ COPY conf/xfce /files
3434
COPY scripts /files
3535

3636
RUN if [ "$(uname -m)" = "x86_64" ]; then \
37-
## QGIS Desktop: Set OTB application folder and OTB folder
37+
## QGIS: Set OTB application folder and OTB folder
3838
qgis3Ini="/files/var/backups/skel/.local/share/QGIS/QGIS3/profiles/default/QGIS/QGIS3.ini"; \
3939
echo "\n[Processing]" >> ${qgis3Ini}; \
4040
if [ -z "${OTB_VERSION}" ]; then \
@@ -102,7 +102,7 @@ ENV BASE_IMAGE=${BASE_IMAGE}:${BASE_IMAGE_TAG} \
102102
BUILD_DATE=${BUILD_START}
103103

104104
ENV NB_GID=100 \
105-
## Make sure grass uses the distro's python
105+
## GRASS GIS: Make sure the distro's python is used
106106
GRASS_PYTHON=/usr/bin/python3 \
107107
LANG=en_US.UTF-8 \
108108
TERM=xterm \
@@ -185,7 +185,7 @@ RUN dpkgArch="$(dpkg --print-architecture)" \
185185
## Git: Additional runtime recommendations
186186
less \
187187
ssh-client \
188-
## QGIS Desktop: Additional runtime dependencies
188+
## QGIS: Additional runtime dependencies
189189
'^libexiv2-[0-9]+$' \
190190
'^libgdal[0-9]+$' \
191191
libgeos-c1v5 \
@@ -215,7 +215,7 @@ RUN dpkgArch="$(dpkg --print-architecture)" \
215215
qt3d-gltfsceneio-plugin \
216216
qt3d-scene2d-plugin \
217217
qt5-image-formats-plugins \
218-
## QGIS Desktop: Python 3 Support
218+
## QGIS: Python 3 Support
219219
gdal-bin \
220220
libfcgi0ldbl \
221221
libsqlite3-mod-spatialite \
@@ -238,9 +238,9 @@ RUN dpkgArch="$(dpkg --print-architecture)" \
238238
python3-sip \
239239
python3-yaml \
240240
qttools5-dev-tools \
241-
## QGIS Desktop: Additional runtime recommendations
241+
## QGIS: Additional runtime recommendations
242242
grass \
243-
## QGIS Desktop: Additional runtime suggestions
243+
## QGIS: Additional runtime suggestions
244244
gpsbabel \
245245
## Xfce Lightweight Desktop Environment
246246
adwaita-icon-theme* \
@@ -316,7 +316,7 @@ RUN dpkgArch="$(dpkg --print-architecture)" \
316316
&& if [ ! -f "/usr/lib/websockify/rebind.so" ]; then \
317317
ln -rs /usr/lib/websockify/rebind*.so /usr/lib/websockify/rebind.so; \
318318
fi \
319-
## Dynamic linker run time bindings for grass
319+
## GRASS GIS: Configure dynamic linker run time bindings
320320
&& echo "$(grass --config path)/lib" | tee /etc/ld.so.conf.d/libgrass.conf \
321321
&& ldconfig \
322322
## Xfce: Remove 'Log Out' from Applications
@@ -476,18 +476,19 @@ RUN sh -c "$(curl -fsSL https://raw.githubusercontent.com/ohmyzsh/ohmyzsh/master
476476
COPY --from=files /files /
477477
COPY --from=files /files/var/backups/skel ${HOME}
478478

479-
## QGIS Desktop: Install plugin 'Processing Saga NextGen Provider'
479+
## QGIS: Install plugin 'Processing Saga NextGen Provider'
480480
RUN export QT_QPA_PLATFORM=offscreen \
481481
&& mkdir -p ${HOME}/.local/share/QGIS/QGIS3/profiles/default/python/plugins \
482482
&& cd ${HOME}/.local/share/QGIS/QGIS3/profiles/default/python/plugins \
483483
&& qgis-plugin-manager init \
484484
&& qgis-plugin-manager update \
485485
&& qgis-plugin-manager install 'Processing Saga NextGen Provider'=="${PROC_SAGA_NG_VERSION:-0.0.7}" \
486486
&& rm -rf .cache_qgis_plugin_manager \
487-
## Enable QGIS plugins
487+
## QGIS: Enable plugins
488488
&& qgis_process plugins enable processing_saga_nextgen \
489489
&& qgis_process plugins enable grassprovider \
490490
&& if [ "$(uname -m)" = "x86_64" ]; then \
491+
## QGIS: Enable OTB plugin
491492
qgis_process plugins enable otbprovider; \
492493
fi \
493494
## Clean up

0 commit comments

Comments
 (0)