From faa6dd4403bed3bc675f99cd0b069f4f38883d36 Mon Sep 17 00:00:00 2001 From: Arthur Meyre Date: Tue, 30 Nov 2021 18:25:08 +0100 Subject: [PATCH] chore: fix missed changes for docker update --- docker/Dockerfile.concretefhe-env | 14 -------------- .../benchmark_and_publish_findings_in_docker.sh | 6 +++--- 2 files changed, 3 insertions(+), 17 deletions(-) diff --git a/docker/Dockerfile.concretefhe-env b/docker/Dockerfile.concretefhe-env index 83f17375f..6b6bfdeaf 100644 --- a/docker/Dockerfile.concretefhe-env +++ b/docker/Dockerfile.concretefhe-env @@ -30,17 +30,3 @@ RUN apt-get update && apt-get upgrade --no-install-recommends -y && \ # Remove once compiler is on PyPi https://github.com/zama-ai/concretefhe-internal/issues/809 WORKDIR /pkg COPY pkg/${WHEEL} . - -ENV SRC_DIR_NAME=src - -RUN echo "source /${SRC_DIR_NAME}/.docker_venv/bin/activate" >> /root/.bashrc && \ - echo "if [[ \"\$?\" != \"0\" ]]; then" >> /root/.bashrc && \ - echo " python3 -m venv /${SRC_DIR_NAME}/.docker_venv" >> /root/.bashrc && \ - echo " source /${SRC_DIR_NAME}/.docker_venv/bin/activate" >> /root/.bashrc && \ - echo " cd /${SRC_DIR_NAME}/ && make setup_env" >> /root/.bashrc && \ - echo "fi" >> /root/.bashrc && \ - echo "export MPLBACKEND=TkAgg" >> /root/.bashrc - -WORKDIR /${SRC_DIR_NAME} - -CMD ["/bin/bash"] diff --git a/script/progress_tracker_utils/benchmark_and_publish_findings_in_docker.sh b/script/progress_tracker_utils/benchmark_and_publish_findings_in_docker.sh index 44ffdce4f..0bc430da7 100755 --- a/script/progress_tracker_utils/benchmark_and_publish_findings_in_docker.sh +++ b/script/progress_tracker_utils/benchmark_and_publish_findings_in_docker.sh @@ -6,10 +6,10 @@ set +e # shellcheck disable=SC1091 -if ! source /src/.docker_venv/bin/activate; then - python3 -m venv /src/.docker_venv +if ! source /root/dev_venv/bin/activate; then + python3 -m venv /root/dev_venv # shellcheck disable=SC1091 - source /src/.docker_venv/bin/activate + source /root/dev_venv/bin/activate cd /src/ && make setup_env fi