debian-bookworm/sim: use /opt/venv instead of --break-system-packages

hdl · Jul 18, 2023 · 7cf45bf · 7cf45bf
1 parent a7185ff
commit 7cf45bf
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 2 deletions.
diff --git a/debian-bookworm/osvb.dockerfile b/debian-bookworm/osvb.dockerfile
@@ -66,7 +66,7 @@ RUN apt-get update -qq \
  && rm -rf /var/lib/apt/lists/*
 
 RUN --mount=type=cache,from=pkg-osvb,src=/osvb/,target=/tmp/osvb/ \
- pip3 install -U /tmp/osvb/*.whl pytest --progress-bar off --break-system-packages \
+ pip3 install -U /tmp/osvb/*.whl pytest --progress-bar off \
  && rm -rf ~/.cache \
  && mkdir /opt/osvb \
  && cp -vr /tmp/osvb/osvvmlibs/ /opt/osvb/osvvmlibs/

diff --git a/debian-bookworm/scipy.dockerfile b/debian-bookworm/scipy.dockerfile
@@ -29,4 +29,4 @@ RUN apt update -qq \
  && apt install -y imagemagick libssl-dev \
  && apt-get autoclean && apt-get clean && apt-get -y autoremove \
  && rm -rf /var/lib/apt/lists/* \
- && python3 -m pip install matplotlib numpy --progress-bar off --break-system-packages
+ && python3 -m pip install matplotlib numpy --progress-bar off
diff --git a/debian-bookworm/sim.dockerfile b/debian-bookworm/sim.dockerfile
@@ -42,6 +42,11 @@ RUN apt-get update -qq \
     libzstd1 \
     perl \
     python3-pip \
+    python3-venv \
     make \
  && apt-get autoclean && apt-get clean && apt-get -y autoremove \
  && rm -rf /var/lib/apt/lists/*
+
+ENV VIRTUAL_ENV=/opt/venv
+RUN python3 -m venv $VIRTUAL_ENV
+ENV PATH="$VIRTUAL_ENV/bin:$PATH"