Merge pull request #76 from UM-Bridge/CI-fix

Ci fix for gs2 and achlys
UM-Bridge · May 19, 2024 · eaadd3b · eaadd3b
2 parents 54a9ff8 + 85dacd7
commit eaadd3b
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 9 deletions.
diff --git a/models/achlys/Dockerfile b/models/achlys/Dockerfile
@@ -1,13 +1,10 @@
 FROM linusseelinger/achlys-ubuntu
 
-RUN apt update && apt install -y inotify-tools && \
+RUN apt update && apt install -y inotify-tools python3-pip python3-venv && \
+    python3 -m venv venv && . venv/bin/activate && \
+    pip3 install umbridge && \
     rm -rf /var/lib/apt/lists/*
 
-RUN apt install -y python3-pip python3-virtualenv && \
-    python3 -m venv venv && \
-    . venv/bin/activate && \
-    pip install umbridge
-
 COPY server.py /server.py
 
 COPY modify_input_file /opt/modify_input_file

diff --git a/models/gs2/Dockerfile b/models/gs2/Dockerfile
@@ -36,9 +36,6 @@ RUN echo 'alias pip=pip3' >> $HOME/.bashrc
 
 RUN echo 'export GK_SYSTEM=gnu_ubuntu' >> $HOME/.bashrc
 
-RUN python -m venv venv && . venv/bin/activate && \
-    pip install ford netCDF4==1.6.2 umbridge pyrokinetics 
-
 RUN git clone https://[email protected]/gyrokinetics/gs2.git /usr/gs2
 
 WORKDIR /usr/gs2
@@ -54,6 +51,9 @@ RUN make -IMakefiles depend
 RUN make -IMakefiles gs2
 #RUN make -IMakefiles tests
 
+RUN python -m venv venv && . venv/bin/activate && \
+    pip install ford netCDF4==1.6.2 umbridge pyrokinetics 
+
 COPY server.py fast.in .
 
 CMD . venv/bin/activate && python server.py