Add venv's to a number of dockerfiles

UM-Bridge · May 17, 2024 · ae02ff8 · ae02ff8
1 parent 3e0e1dd
commit ae02ff8
Show file tree

Hide file tree

Showing 10 changed files with 56 additions and 39 deletions.
diff --git a/.github/workflows/test-readmes.yml b/.github/workflows/test-readmes.yml
@@ -14,8 +14,12 @@ jobs:
        -
         name: Dependencies
         run: |
-          apt update; apt install -y python3-pip; pip3 install marko
+          apt update && DEBIAN_FRONTEND="noninteractive" apt install -y python3-pip python3-venv
+          python3 -m venv venv
+          . venv/bin/activate
+          pip3 install marko
        -
         name: Validate
         run: |
+          . venv/bin/activate
           cd docs && python3 test_benchmark_readmes.py
diff --git a/benchmarks/analytic-banana/Dockerfile b/benchmarks/analytic-banana/Dockerfile
@@ -3,8 +3,9 @@ FROM ubuntu:latest
 COPY . /server
 
 RUN apt update && \
-    DEBIAN_FRONTEND="noninteractive" apt install -y python3-pip
+    DEBIAN_FRONTEND="noninteractive" apt install -y python3-pip python3-venv && \
+    python3 -m venv venv && \
+    . venv/bin/activate && \
+    pip install umbridge umbridge numpy scipy
 
-RUN pip3 install umbridge numpy scipy
-
-CMD python3 /server/server.py
+CMD . venv/bin/activate && python3 /server/server.py
diff --git a/benchmarks/analytic-donut/Dockerfile b/benchmarks/analytic-donut/Dockerfile
@@ -3,8 +3,9 @@ FROM ubuntu:latest
 COPY . /server
 
 RUN apt update && \
-    DEBIAN_FRONTEND="noninteractive" apt install -y python3-pip
+    DEBIAN_FRONTEND="noninteractive" apt install -y python3-venv && \
+    python3 -m venv venv && \
+    . venv/bin/activate && \
+    pip install install umbridge numpy
 
-RUN pip3 install umbridge numpy
-
-CMD python3 /server/server.py
+CMD . venv/bin/activate && python3 /server/server.py
diff --git a/benchmarks/analytic-funnel/Dockerfile b/benchmarks/analytic-funnel/Dockerfile
@@ -3,8 +3,9 @@ FROM ubuntu:latest
 COPY . /server
 
 RUN apt update && \
-    DEBIAN_FRONTEND="noninteractive" apt install -y python3-pip
+    DEBIAN_FRONTEND="noninteractive" apt install -y python3-pip python3-venv && \
+    python3 -m venv venv && \
+    . venv/bin/activate && \
+    pip install umbridge numpy
 
-RUN pip3 install umbridge numpy
-
-CMD python3 /server/server.py
+CMD . venv/bin/activate && python3 /server/server.py
diff --git a/benchmarks/analytic-gaussian-mixture/Dockerfile b/benchmarks/analytic-gaussian-mixture/Dockerfile
@@ -3,8 +3,9 @@ FROM ubuntu:latest
 COPY . /server
 
 RUN apt update && \
-    DEBIAN_FRONTEND="noninteractive" apt install -y python3-pip
+    DEBIAN_FRONTEND="noninteractive" apt install -y python3-pip python3-venv && \
+    python3 -m venv venv && \
+    . venv/bin/activate && \
+    pip install umbridge numpy scipy
 
-RUN pip3 install umbridge numpy scipy
-
-CMD python3 /server/server.py
+CMD . venv/bin/activate && python3 /server/server.py
diff --git a/benchmarks/cuqi-ct/Dockerfile b/benchmarks/cuqi-ct/Dockerfile
@@ -1,12 +1,13 @@
 FROM ubuntu:latest
 
-RUN apt update && \
-    DEBIAN_FRONTEND="noninteractive" apt install -y python3-pip
-
-RUN pip3 install umbridge cuqipy
-
 COPY . /server
 
 WORKDIR /server
 
-CMD python3 server.py
+RUN apt update && \
+    DEBIAN_FRONTEND="noninteractive" apt install -y python3-pip python3-venv && \
+    python3 -m venv venv && \
+    . venv/bin/activate && \
+    pip install umbridge cuqipy
+
+CMD . venv/bin/activate && python3 server.py
diff --git a/benchmarks/deconvolution-1d/Dockerfile b/benchmarks/deconvolution-1d/Dockerfile
@@ -1,12 +1,13 @@
 FROM ubuntu:latest
 
-RUN apt update && \
-    DEBIAN_FRONTEND="noninteractive" apt install -y python3-pip
-
-RUN pip3 install umbridge cuqipy
-
 COPY . /server
 
 WORKDIR /server
 
-CMD python3 server.py
+RUN apt update && \
+    DEBIAN_FRONTEND="noninteractive" apt install -y python3-pip python3-venv && \
+    python3 -m venv venv && \
+    . venv/bin/activate && \
+    pip install umbridge cuqipy
+
+CMD . venv/bin/activate && python3 server.py
diff --git a/benchmarks/heat-1d/Dockerfile b/benchmarks/heat-1d/Dockerfile
@@ -1,12 +1,13 @@
 FROM ubuntu:latest
 
-RUN apt update && \
-    DEBIAN_FRONTEND="noninteractive" apt install -y python3-pip
-
-RUN pip3 install umbridge cuqipy
-
 COPY . /server
 
 WORKDIR /server
 
-CMD python3 server.py
+RUN apt update && \
+    DEBIAN_FRONTEND="noninteractive" apt install -y python3-pip python3-venv && \
+    python3 -m venv venv && \
+    . venv/bin/activate && \
+    pip install umbridge cuqipy
+
+CMD . venv/bin/activate && python3 server.py
diff --git a/models/achlys/Dockerfile b/models/achlys/Dockerfile
@@ -3,10 +3,13 @@ FROM linusseelinger/achlys-ubuntu
 RUN apt update && apt install -y inotify-tools && \
     rm -rf /var/lib/apt/lists/*
 
-RUN apt install -y python3-pip && pip3 install umbridge
+RUN apt install -y python3-pip python3-venv && \
+    python3 -m venv venv && \
+    . venv/bin/activate && \
+    pip install umbridge
 
 COPY server.py /server.py
 
 COPY modify_input_file /opt/modify_input_file
 
-CMD python3 /server.py
+CMD . venv/bin/activate && python3 /server.py
diff --git a/models/dune-composites/Dockerfile b/models/dune-composites/Dockerfile
@@ -27,8 +27,11 @@ WORKDIR /dune/build/dune-composites/src
 
 ENV OMP_NUM_THREADS=1
 
-RUN apt install -y python3-pip && pip3 install umbridge
+RUN apt install -y python3-pip python3-venv && \
+    python3 -m venv venv && \
+    . venv/bin/activate && \
+    pip install umbridge
 
 COPY server.py server.py
 
-CMD python3 server.py
+CMD . venv/bin/activate && python3 server.py