Merge branch 'bilke-main-patch-96559' into 'main'

Fix devcontainer dockerfile

See merge request ogs/tools/ogstools!140

.devcontainer/Dockerfile

@@ -10,10 +10,10 @@ RUN apt-get update \
     && echo "deb [arch=amd64 signed-by=/usr/share/keyrings/feflow.gpg] https://download.feflow.com/download/FEFLOW/linux/apt-repo/$DIST_DIR stable main" | sudo tee /etc/apt/sources.list.d/feflow.stable.list \
     && apt-get update \
     && apt list | grep feflow  \
-    && apt-get install -yq --no-install-recommends feflow-ifm-devel feflow-python80 \
+    && apt-get install -yq --no-install-recommends feflow-ifm-devel feflow-python81 \
     && apt-get clean && rm -rf /var/lib/apt/lists/*
 
 ENV \
-    PYTHONPATH=/opt/feflow/8.0/python \
-    LD_LIBRARY_PATH=/opt/feflow/8.0/lib64:/opt/feflow/common/qt/lib64:/opt/feflow/common/lib64 \
-    FEFLOW80_ROOT=/opt/feflow/8.0
+    PYTHONPATH=/opt/feflow/8.1/python \
+    LD_LIBRARY_PATH=/opt/feflow/8.1/lib64:/opt/feflow/common/qt/lib64:/opt/feflow/common/lib64 \
+    FEFLOW81_ROOT=/opt/feflow/8.1

.gitlab-ci.yml

@@ -5,6 +5,7 @@ stages:
 variables:
   POETRY_CACHE_DIR: "$CI_PROJECT_DIR/.cache"
   DOCKER_IMAGE: registry.opengeosys.org/ogs/tools/ogstools/devcontainer-3.9
+  DOCKER_IMAGE_PINNED: registry.opengeosys.org/ogs/tools/ogstools/devcontainer-3.9:feflow-8.0
   DOCKER_USER_IMAGE: registry.opengeosys.org/ogs/tools/ogstools/main-3.9
 
 workflow:
@@ -18,7 +19,7 @@ workflow:
     - if: $CI_COMMIT_TAG
     - if: '$CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH && $CI_PROJECT_PATH == "ogs/tools/ogstools"'
 
-image: $DOCKER_IMAGE
+image: $DOCKER_IMAGE_PINNED
 
 cache:
   paths:

Dockerfile

@@ -1,4 +1,4 @@
-FROM registry.opengeosys.org/ogs/tools/ogstools/devcontainer-3.9
+FROM registry.opengeosys.org/ogs/tools/ogstools/devcontainer-3.9:feflow-8.0
 
 RUN --mount=target=/ogstools,type=bind,source=.,readwrite \
      pip install /ogstools[feflow] \