From 5e54f394ef488523258bd7dd5148f63b0a04aed2 Mon Sep 17 00:00:00 2001
From: Julien Girard <julien.girard2@cea.fr>
Date: Wed, 21 Jun 2023 10:34:17 +0200
Subject: [PATCH] [release] Update docker image
---
docker/Dockerfile.template | 21 ++++++++++++++++++---
1 file changed, 18 insertions(+), 3 deletions(-)
diff --git a/docker/Dockerfile.template b/docker/Dockerfile.template
index 96aa0b3..c4f046d 100644
--- a/docker/Dockerfile.template
+++ b/docker/Dockerfile.template
@@ -34,13 +34,28 @@ opam-2.1 update -y
# System dependencies
RUN sudo apt update && \
- sudo apt install apt-utils && \
- sudo apt install -yy git wget gfortran cmake protobuf-compiler libprotobuf-dev libboost-all-dev libopenblas-dev zip python3-pip zip && \
+ sudo apt install apt-utils wget && \
+ sudo apt install -yy git wget gfortran cmake protobuf-compiler libprotobuf-dev libboost-all-dev libopenblas-dev zip && \
sudo apt clean && \
sudo rm -rf /var/lib/apt/lists/
ENV PATH "/home/opam/.local/bin:$PATH"
+# Python Conda
+
+ENV SHACONDA "1564571a6a06a9999a75a6c65d63cb82911fc647e96ba5b729f904bf00c177d3"
+
+RUN wget https://repo.anaconda.com/miniconda/Miniconda3-py39_23.3.1-0-Linux-x86_64.sh -O ~/miniconda.sh
+
+RUN SHAFILE=$(sha256sum ~/miniconda.sh | awk '{print $1}') && if [ "$SHAFILE" != "$SHACONDA" ]; then echo "Mismatch between SHA256SUM of downloaded script and expected script, aborting installation."; echo "The expected SHA256SUM is $SHACONDA, but the SHA256SUM of downloaded script is $SHAFILE."; exit 1; fi
+
+RUN /bin/bash ~/miniconda.sh -b && rm ~/miniconda.sh
+
+ENV PATH "/home/opam/miniconda3/bin:$PATH"
+
+RUN conda init bash && conda create -n python_caisar_env python=3.10.9
+
+SHELL ["conda", "run", "-n", "python_caisar_env", "/bin/bash", "-c"]
# External provers
@@ -53,7 +68,7 @@ RUN pip --default-timeout=1000 install -r pyrat/requirements.txt
ENV PATH "/home/opam/pyrat/:$PATH"
-RUN echo "#/usr/bin/sh\n exec /usr/bin/python3 /home/opam/pyrat/pyrat.pyc \"\$@\"" > /home/opam/pyrat/pyrat
+RUN echo "#/usr/bin/sh\n exec /home/opam/miniconda3/envs/python_caisar_env/bin/python /home/opam/pyrat/pyrat.pyc \"\$@\"" > /home/opam/pyrat/pyrat
RUN chmod u+x /home/opam/pyrat/pyrat
RUN pyrat -h
--
GitLab