Skip to content

Commit 9824011

Browse files
committed
New version of qgis and conda.
1 parent 0c6a962 commit 9824011

File tree

2 files changed

+24
-16
lines changed

2 files changed

+24
-16
lines changed

Dockerfile

Lines changed: 17 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -27,19 +27,26 @@ COPY --chown=onyxia:users ./resources/*.parquet /home/onyxia/
2727
ENV HOME=/home/onyxia
2828

2929
# Create the directories
30-
RUN chown -R onyxia:users /home/onyxia /usr/share/novnc
30+
RUN mkdir -p /home/onyxia/.cache/dconf && \
31+
mkdir -p /home/onyxia/.local/share/QGIS/QGIS3/profiles/default/python && \
32+
mkdir -p /home/onyxia/.local/share/QGIS/QGIS3/profiles/default && \
33+
touch /home/onyxia/.local/share/QGIS/QGIS3/profiles/default/qgis.db && \
34+
chown -R onyxia:users /home/onyxia /usr/share/novnc
3135

3236
COPY --chown=onyxia:users ./resources/init.sh /home/onyxia
3337

3438
# Install conda and install qgis using conda, as the support is better for GeoParquet.
35-
ADD https://repo.anaconda.com/miniconda/Miniconda3-latest-Linux-x86_64.sh /tmp/miniconda.sh
36-
RUN chmod +x /tmp/miniconda.sh && \
37-
mkdir -p ~/.miniconda3 && \
38-
bash /tmp/miniconda.sh -b -u -p ~/.miniconda3 && \
39-
rm -rf /tmp/miniconda.sh && \
40-
~/.miniconda3/bin/conda init bash && \
41-
~/.miniconda3/bin/conda install -c conda-forge pyqt qgis gdal libgdal-arrow-parquet && \
42-
mkdir -p /home/onyxia/.local/share/QGIS/QGIS3/profiles/default/QGIS/
39+
ADD https://github.com/conda-forge/miniforge/releases/download/24.11.3-2/Miniforge3-24.11.3-2-Linux-aarch64.sh /tmp/mambaforge.sh
40+
RUN chmod +x /tmp/mambaforge.sh && \
41+
mkdir -p /opt/conda && \
42+
bash /tmp/mambaforge.sh -b -u -p /opt/conda && \
43+
rm -rf /tmp/mambaforge.sh && \
44+
/opt/conda/bin/conda init bash && \
45+
/opt/conda/bin/conda install -c conda-forge pyqt qgis gdal libgdal-arrow-parquet && \
46+
mkdir -p /home/onyxia/.local/share/QGIS/QGIS3/profiles/default/QGIS/
47+
48+
# Set environment path
49+
ENV PATH="/opt/conda/bin:$PATH"
4350

4451
# Switch to the new user
4552
USER onyxia
@@ -71,4 +78,4 @@ ENV DISPLAY=:1
7178
EXPOSE 6080
7279

7380
# Start the application using the startup script
74-
CMD ["/home/onyxia/init.sh"]
81+
CMD ["/home/onyxia/init.sh"]

resources/init.sh

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -12,14 +12,15 @@ export X11_XFT_ANTIALIAS=1
1212
export X11_XFT_RGBA=rgb
1313
export X11_XFT_HINTING=1
1414
export X11_XFT_HINTSTYLE=hintmedium
15-
16-
export PYTHONPATH=/home/dapla/.miniconda3/lib/python3.12/site-packages:$PYTHONPATH
17-
export PATH="~/.miniconda3/bin:$PATH"
15+
16+
# Update PYTHONPATH and PATH to use /opt/conda
17+
export PYTHONPATH=/opt/conda/lib/python3.12/site-packages:$PYTHONPATH
18+
export PATH="/opt/conda/bin:$PATH"
1819

1920
# Source the Conda setup script to set up the shell for Conda
20-
source ~/.miniconda3/etc/profile.d/conda.sh
21+
source /opt/conda/etc/profile.d/conda.sh
2122

22-
# Activate your environment
23+
# Activate the base Conda environment
2324
conda activate base
2425

2526
# Disable access control for X11
@@ -35,4 +36,4 @@ x11vnc -forever -nopw -create -display :1 &
3536
/usr/share/novnc/utils/novnc_proxy --vnc localhost:5900 --listen 6080 &
3637

3738
# Start QGis from the conda installation
38-
conda run -n base --no-capture-output ~/.miniconda3/bin/qgis
39+
conda run -n base --no-capture-output /opt/conda/bin/qgis

0 commit comments

Comments
 (0)