From 585de7808143ca36dfc97b819c956ffbff23ce33 Mon Sep 17 00:00:00 2001 From: Arthur Meyre Date: Fri, 10 Sep 2021 15:35:05 +0200 Subject: [PATCH] fix(docker): update and fix release docker --- docker/Dockerfile.release | 13 ++++++------- docker/Dockerfile.release.dockerignore | 3 ++- docker/release_resources/entry_point.sh | 3 +++ .../release_requirements.txt | 0 4 files changed, 11 insertions(+), 8 deletions(-) create mode 100644 docker/release_resources/entry_point.sh rename docker/{ => release_resources}/release_requirements.txt (100%) diff --git a/docker/Dockerfile.release b/docker/Dockerfile.release index 5b9577060..dfe518670 100644 --- a/docker/Dockerfile.release +++ b/docker/Dockerfile.release @@ -1,4 +1,4 @@ -FROM ghcr.io/zama-ai/zamalang-compiler:bb0126a86a36b9062760c97b7e2f9d7008549899 as builder +FROM ghcr.io/zama-ai/zamalang-compiler:967fda07a05b6a410fee2027514a7114bdf781e9 as builder RUN apt-get update && apt-get upgrade --no-install-recommends -y && \ apt-get install --no-install-recommends -y \ @@ -14,12 +14,12 @@ COPY pyproject.toml ./pyproject.toml RUN poetry build --format wheel -FROM ghcr.io/zama-ai/zamalang-compiler:bb0126a86a36b9062760c97b7e2f9d7008549899 +FROM ghcr.io/zama-ai/zamalang-compiler:967fda07a05b6a410fee2027514a7114bdf781e9 RUN mkdir /pkg && mkdir /app WORKDIR /pkg COPY --from=builder /build/dist/*.whl . -COPY docker/release_requirements.txt . +COPY docker/release_resources/release_requirements.txt . COPY torch_requirements.txt . RUN apt-get update && apt-get upgrade --no-install-recommends -y && \ @@ -38,11 +38,10 @@ RUN apt-get update && apt-get upgrade --no-install-recommends -y && \ python3 -m pip install --no-cache-dir -r release_requirements.txt WORKDIR /app -RUN printf "#!/bin/bash\npython3 -m jupyter notebook --ip=0.0.0.0 --allow-root --no-browser\n" \ - > entry_point.sh && \ - mkdir /data +COPY docker/release_resources/entry_point.sh ./entry_point.sh +RUN mkdir /data WORKDIR /data VOLUME [ "/data" ] -CMD ["/bin/bash", "-l", "/app/entry_point.sh"] +CMD ["/bin/bash", "-i", "/app/entry_point.sh"] diff --git a/docker/Dockerfile.release.dockerignore b/docker/Dockerfile.release.dockerignore index deffd550c..0108b388a 100644 --- a/docker/Dockerfile.release.dockerignore +++ b/docker/Dockerfile.release.dockerignore @@ -4,7 +4,8 @@ # Not our sources !concrete !pyproject.toml -!docker/release_requirements.txt +!docker/release_resources/entry_point.sh +!docker/release_resources/release_requirements.txt !torch_requirements.txt # But still ignore pycache diff --git a/docker/release_resources/entry_point.sh b/docker/release_resources/entry_point.sh new file mode 100644 index 000000000..33d5beffb --- /dev/null +++ b/docker/release_resources/entry_point.sh @@ -0,0 +1,3 @@ +#!/bin/bash + +python3 -m jupyter notebook --ip=0.0.0.0 --allow-root --no-browser diff --git a/docker/release_requirements.txt b/docker/release_resources/release_requirements.txt similarity index 100% rename from docker/release_requirements.txt rename to docker/release_resources/release_requirements.txt