From 2e526830478d876a314bb131b06c8782d91791f6 Mon Sep 17 00:00:00 2001 From: David Gauldie Date: Fri, 14 Jun 2024 15:29:57 -0400 Subject: [PATCH 1/2] pin netCDF to version 1.6.5 --- docker/Dockerfile.api | 9 +++++++-- docker/Dockerfile.worker | 15 ++++++++------- 2 files changed, 15 insertions(+), 9 deletions(-) diff --git a/docker/Dockerfile.api b/docker/Dockerfile.api index 8796e61..4957b56 100644 --- a/docker/Dockerfile.api +++ b/docker/Dockerfile.api @@ -1,15 +1,20 @@ FROM python:3.10 WORKDIR / -RUN pip install --no-cache-dir poetry==1.5.1 + +RUN pip install --upgrade pip && \ + pip install --no-cache-dir poetry==1.5.1 COPY pyproject.toml pyproject.toml COPY poetry.lock poetry.lock RUN poetry config virtualenvs.create false && \ poetry install --no-root --no-cache +# Pin netCDF4 to version 1.6.5 +RUN pip install netCDF4==1.6.5 + # We have to install PyCIEMSS now since the interface uses Torch # TODO: Do not use Torch in PyCIEMSS Library interface -RUN poetry run poe install-pyciemss +RUN poetry run poe install-pyciemss COPY service service COPY tests tests diff --git a/docker/Dockerfile.worker b/docker/Dockerfile.worker index 72fb05d..ac882f1 100644 --- a/docker/Dockerfile.worker +++ b/docker/Dockerfile.worker @@ -1,20 +1,21 @@ FROM python:3.10 -# RUN wget --no-verbose -O julia.tar.gz "https://julialang-s3.julialang.org/bin/linux/$(uname -m|sed 's/86_//')/1.9/julia-1.9.2-linux-$(uname -m).tar.gz" -# RUN tar -xzf "julia.tar.gz" && mv julia-1.9.2 /opt/julia && \ -# ln -s /opt/julia/bin/julia /usr/local/bin/julia && rm "julia.tar.gz" - WORKDIR / -# RUN julia -e 'using Pkg; Pkg.add(url="https://github.com/jataware/SciMLIntegration.jl", rev="main"); Pkg.precompile()' - -RUN pip install --no-cache-dir poetry==1.5.1 +RUN pip install --upgrade pip && \ + pip install --no-cache-dir poetry==1.5.1 COPY pyproject.toml pyproject.toml COPY poetry.lock poetry.lock RUN poetry config virtualenvs.create false && \ poetry install --no-root --no-cache +# Pin netCDF4 to version 1.6.5 +RUN pip install netCDF4==1.6.5 + +# We have to install PyCIEMSS now since the interface uses Torch +# TODO: Do not use Torch in PyCIEMSS Library interface RUN poetry run poe install-pyciemss + COPY service service COPY tests tests COPY README.md README.md From 2d9444272ae8bdb974d28e72be0a7002bde01741 Mon Sep 17 00:00:00 2001 From: David Gauldie Date: Fri, 14 Jun 2024 15:35:38 -0400 Subject: [PATCH 2/2] update comment --- docker/Dockerfile.api | 3 +-- docker/Dockerfile.worker | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/docker/Dockerfile.api b/docker/Dockerfile.api index 4957b56..51f38ca 100644 --- a/docker/Dockerfile.api +++ b/docker/Dockerfile.api @@ -12,8 +12,7 @@ RUN poetry config virtualenvs.create false && \ # Pin netCDF4 to version 1.6.5 RUN pip install netCDF4==1.6.5 -# We have to install PyCIEMSS now since the interface uses Torch -# TODO: Do not use Torch in PyCIEMSS Library interface +# Install PyCIEMSS RUN poetry run poe install-pyciemss COPY service service diff --git a/docker/Dockerfile.worker b/docker/Dockerfile.worker index ac882f1..80e01cf 100644 --- a/docker/Dockerfile.worker +++ b/docker/Dockerfile.worker @@ -12,8 +12,7 @@ RUN poetry config virtualenvs.create false && \ # Pin netCDF4 to version 1.6.5 RUN pip install netCDF4==1.6.5 -# We have to install PyCIEMSS now since the interface uses Torch -# TODO: Do not use Torch in PyCIEMSS Library interface +# Install PyCIEMSS RUN poetry run poe install-pyciemss COPY service service