diff --git a/Project.toml b/Project.toml index 7578ac2fb8e7b080fbc9d0f1b7a426f38e8ff1a3..115c84b1db4d403ba75f00adc5a0e23cbed88330 100644 --- a/Project.toml +++ b/Project.toml @@ -1,7 +1,7 @@ name = "LarvaTagger" uuid = "8b3b36f1-dfed-446e-8561-ea19fe966a4d" authors = ["François Laurent", "Institut Pasteur"] -version = "0.18.4" +version = "0.18.5" [deps] Colors = "5ae59095-9a9b-59fe-a467-6f913c188581" diff --git a/recipes/Dockerfile b/recipes/Dockerfile index d32d5f099714a92d387127d8cbc3d50fc81f8674..6458645ee8906595750c6c149e6f113bb2988f77 100644 --- a/recipes/Dockerfile +++ b/recipes/Dockerfile @@ -28,7 +28,7 @@ FROM base AS prebuild ENV PIP_DISABLE_PIP_VERSION_CHECK=1 \ PIP_NO_CACHE_DIR=1 \ POETRY_VIRTUALENVS_IN_PROJECT=1 \ - POETRY_VERSION=1.2.0 + POETRY_VERSION=1.8.3 RUN apt-get update \ && apt-get install --no-install-recommends -y python3-dev python3-pip \ diff --git a/recipes/Dockerfile.pasteurjanelia b/recipes/Dockerfile.pasteurjanelia new file mode 100644 index 0000000000000000000000000000000000000000..43f0edbb406b8ff5fabaa648a4bfc42d6fce7911 --- /dev/null +++ b/recipes/Dockerfile.pasteurjanelia @@ -0,0 +1,29 @@ +ARG BASE=latest + +FROM flaur/larvatagger:${BASE} AS prebuild + +ENV PIP_DISABLE_PIP_VERSION_CHECK=1 \ + PIP_NO_CACHE_DIR=1 \ + POETRY_VIRTUALENVS_IN_PROJECT=1 \ + POETRY_VERSION=1.8.3 + +RUN apt-get update \ + && apt-get install --no-install-recommends -y wget \ + && if ! command -v poetry; then \ + apt-get install --no-install-recommends -y python3-dev python3-pip \ + && pip install "poetry==$POETRY_VERSION"; \ + fi \ + && rm -rf /var/lib/apt/lists/* + + +FROM prebuild AS backend + +ARG PROJECT_DIR=/app +ARG BACKEND_BRANCH=main + +RUN cd $PROJECT_DIR \ + && git clone --depth 1 --no-tags --single-branch -b $BACKEND_BRANCH https://gitlab.pasteur.fr/nyx/PasteurJanelia-adapter PasteurJanelia \ + && cd PasteurJanelia \ + && make package \ + && rm -rf .git ~/.cache +