From 55dabe98e8c3452eff1df685bdd6040e4f2f74bb Mon Sep 17 00:00:00 2001 From: peterdudfield Date: Mon, 6 Nov 2023 21:14:25 +0000 Subject: [PATCH 1/4] add h5py to conda install --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 3f39349..6a91086 100644 --- a/Dockerfile +++ b/Dockerfile @@ -19,7 +19,7 @@ COPY data/ app/data/ # Install requirements RUN conda install python=3.10 -RUN conda install -c conda-forge xesmf esmpy -y +RUN conda install -c conda-forge xesmf esmpy h5py -y RUN echo "export ESMFMKFILE='/opt/conda/lib/esmf.mk'" >> ~/.bashrc RUN pip install torch --index-url https://download.pytorch.org/whl/cpu RUN pip install -r app/requirements.txt From fc9b12bc56eceb4353b983d2359fd9695ba1996f Mon Sep 17 00:00:00 2001 From: peterdudfield Date: Mon, 6 Nov 2023 21:23:52 +0000 Subject: [PATCH 2/4] try docker tidy up --- Dockerfile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Dockerfile b/Dockerfile index 6a91086..2f11b87 100644 --- a/Dockerfile +++ b/Dockerfile @@ -20,9 +20,9 @@ COPY data/ app/data/ # Install requirements RUN conda install python=3.10 RUN conda install -c conda-forge xesmf esmpy h5py -y -RUN echo "export ESMFMKFILE='/opt/conda/lib/esmf.mk'" >> ~/.bashrc -RUN pip install torch --index-url https://download.pytorch.org/whl/cpu -RUN pip install -r app/requirements.txt +# RUN echo "export ESMFMKFILE='/opt/conda/lib/esmf.mk'" >> ~/.bashrc +# RUN pip install torch --index-url https://download.pytorch.org/whl/cpu +# RUN pip install -r app/requirements.txt RUN pip install git+https://github.com/SheffieldSolar/PV_Live-API#pvlive_api # Change to app folder From f2c30cc47665e9953b2048e7e64401c3ca156f41 Mon Sep 17 00:00:00 2001 From: peterdudfield Date: Mon, 6 Nov 2023 21:24:34 +0000 Subject: [PATCH 3/4] keep torch cpu --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 2f11b87..d13249b 100644 --- a/Dockerfile +++ b/Dockerfile @@ -21,7 +21,7 @@ COPY data/ app/data/ RUN conda install python=3.10 RUN conda install -c conda-forge xesmf esmpy h5py -y # RUN echo "export ESMFMKFILE='/opt/conda/lib/esmf.mk'" >> ~/.bashrc -# RUN pip install torch --index-url https://download.pytorch.org/whl/cpu +RUN pip install torch --index-url https://download.pytorch.org/whl/cpu # RUN pip install -r app/requirements.txt RUN pip install git+https://github.com/SheffieldSolar/PV_Live-API#pvlive_api From aca66d2e521c1ea0a386dcde1f7d52eeb827c9ad Mon Sep 17 00:00:00 2001 From: peterdudfield Date: Mon, 6 Nov 2023 21:32:03 +0000 Subject: [PATCH 4/4] tidy --- Dockerfile | 2 -- 1 file changed, 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index d13249b..c555692 100644 --- a/Dockerfile +++ b/Dockerfile @@ -20,9 +20,7 @@ COPY data/ app/data/ # Install requirements RUN conda install python=3.10 RUN conda install -c conda-forge xesmf esmpy h5py -y -# RUN echo "export ESMFMKFILE='/opt/conda/lib/esmf.mk'" >> ~/.bashrc RUN pip install torch --index-url https://download.pytorch.org/whl/cpu -# RUN pip install -r app/requirements.txt RUN pip install git+https://github.com/SheffieldSolar/PV_Live-API#pvlive_api # Change to app folder