Skip to content

Commit 7988bda

Browse files
committed
Revert breaking changes to rocker_rpy
1 parent c9ae0d1 commit 7988bda

File tree

1 file changed

+12
-4
lines changed

1 file changed

+12
-4
lines changed

rocker-rpy/Dockerfile

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,16 @@
11
FROM ghcr.io/geocompx/minimal
22

3+
# Use Python already provisioned by the base image virtualenv (/opt/venv).
4+
# Do not reinstall Python; ensure the venv python is preferred and 'python' exists.
5+
RUN /rocker_scripts/install_python.sh
6+
7+
# Prefer the venv python and put its bin on PATH so reticulate picks it up.
8+
ENV RETICULATE_PYTHON=/opt/venv/bin/python
9+
ENV PATH=/opt/venv/bin:${PATH}
10+
311
# Small helper so the 'python' command exists (doesn't reinstall python itself).
4-
RUN apt-get update && apt-get install -y --no-install-recommends python-is-python3 python3-pip \
5-
&& rm -rf /var/lib/apt/lists/*
12+
RUN apt-get update && apt-get install -y --no-install-recommends python-is-python3 \
13+
&& rm -rf /var/lib/apt/lists/*
614

7-
# Install project requirements into the existing venv if desired:
8-
RUN python3 -m pip install -r https://github.com/geocompx/geocompy/raw/refs/heads/main/requirements.txt --break-system-packages
15+
# Optionally install project requirements into the existing venv if desired:
16+
RUN /opt/venv/bin/pip install -r https://github.com/geocompx/geocompy/raw/refs/heads/main/requirements.txt

0 commit comments

Comments
 (0)