chore: use volumes in docker

- allows to have persistent data and much faster access times on non linux
OSes
This commit is contained in:
Arthur Meyre
2021-11-30 17:47:38 +01:00
parent edefde9189
commit 8425656d75
2 changed files with 15 additions and 3 deletions

View File

@@ -2,6 +2,8 @@ SHELL:=/bin/bash
DEV_DOCKER_IMG:=concretefhe-dev
DEV_DOCKERFILE:=docker/Dockerfile.concretefhe-dev
DEV_CONTAINER_VENV_VOLUME:=concretefhe-internal-venv
DEV_CONTAINER_CACHE_VOLUME:=concretefhe-internal-cache
SRC_DIR:=concrete
NOTEBOOKS_DIR:=docs/user/advanced_examples
@@ -161,6 +163,8 @@ docker_start:
-p 8888:8888 \
--env DISPLAY=host.docker.internal:0 \
--volume /"$$(pwd)":/src \
--volume $(DEV_CONTAINER_VENV_VOLUME):/root/dev_venv \
--volume $(DEV_CONTAINER_CACHE_VOLUME):/root/.cache \
$(DEV_DOCKER_IMG)
.PHONY: docker_start
@@ -170,6 +174,14 @@ docker_build_and_start: docker_build docker_start
docker_bas: docker_build_and_start
.PHONY: docker_bas
docker_clean_volumes:
docker volume rm -f $(DEV_CONTAINER_VENV_VOLUME)
docker volume rm -f $(DEV_CONTAINER_CACHE_VOLUME)
.PHONY: docker_clean_volumes
docker_cv: docker_clean_volumes
.PHONY: docker_cv
docker_publish_measurements: docker_build
mkdir -p .benchmarks
@# Poetry is not installed on the benchmark servers

View File

@@ -2,10 +2,10 @@ FROM ghcr.io/zama-ai/concretefhe-env
ENV SRC_DIR_NAME=src
RUN echo "source /${SRC_DIR_NAME}/.docker_venv/bin/activate" >> /root/.bashrc && \
RUN echo "source /root/dev_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 " python3 -m venv /root/dev_venv" >> /root/.bashrc && \
echo " source /root/dev_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