From 9d9ef1bd212b383f175b77b701504b0855e4eed0 Mon Sep 17 00:00:00 2001 From: kshitijrajsharma Date: Fri, 4 Oct 2024 13:42:01 +0200 Subject: [PATCH 1/2] fixes setup and wheel to build libs --- backend/Dockerfile | 13 ++++++++----- backend/Dockerfile_CPU | 19 ++++++++++++++----- 2 files changed, 22 insertions(+), 10 deletions(-) diff --git a/backend/Dockerfile b/backend/Dockerfile index cac5f5ed..539118fa 100644 --- a/backend/Dockerfile +++ b/backend/Dockerfile @@ -17,13 +17,16 @@ RUN pip install --global-option=build_ext --global-option="-I/usr/include/gdal" COPY docker/ramp/docker-requirements.txt /tmp/docker-requirements.txt RUN pip install -r /tmp/docker-requirements.txt -# RUN pip install --upgrade pip -# RUN pip install --upgrade setuptools -COPY requirements.txt /tmp/requirements.txt -COPY api-requirements.txt /tmp/api-requirements.txt +COPY requirements.txt requirements.txt +COPY api-requirements.txt api-requirements.txt # Don't use legacy resolver , TODO : fix this dependencies -RUN pip install --use-deprecated=legacy-resolver -r /tmp/requirements.txt +RUN pip install --use-deprecated=legacy-resolver -r api-requirements.txt + +RUN pip install setuptools==68.2.2 +RUN pip install build==0.41.3 + +RUN pip install --use-deprecated=legacy-resolver -r requirements.txt COPY docker/ramp/solaris /tmp/solaris diff --git a/backend/Dockerfile_CPU b/backend/Dockerfile_CPU index 164f9b3f..97498a8c 100644 --- a/backend/Dockerfile_CPU +++ b/backend/Dockerfile_CPU @@ -18,12 +18,21 @@ COPY docker/ramp/docker-requirements.txt /tmp/docker-requirements.txt RUN pip install -r /tmp/docker-requirements.txt -# RUN pip install --upgrade setuptools - -COPY requirements.txt /tmp/requirements.txt -COPY api-requirements.txt /tmp/api-requirements.txt +COPY requirements.txt requirements.txt +COPY api-requirements.txt api-requirements.txt # Don't use legacy resolver , TODO : fix this dependencies -RUN pip install --use-deprecated=legacy-resolver -r /tmp/requirements.txt +# RUN pip install --use-deprecated=legacy-resolver -r api-requirements.txt + +RUN pip install setuptools==68.2.2 +RUN pip install wheel==0.41.3 +RUN pip install build==1.0.0 + +RUN pip install -r api-requirements.txt + + +RUN pip install -r requirements.txt + +# RUN pip install --use-deprecated=legacy-resolver -r requirements.txt COPY docker/ramp/solaris /tmp/solaris RUN pip install /tmp/solaris --use-feature=in-tree-build && \ From c7524fcf0cff869b27a6dd03716d53dc20eae57f Mon Sep 17 00:00:00 2001 From: kshitijrajsharma Date: Fri, 4 Oct 2024 13:44:17 +0200 Subject: [PATCH 2/2] consistency install in dockerfile --- backend/Dockerfile | 9 +++++---- backend/Dockerfile_CPU | 3 --- 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/backend/Dockerfile b/backend/Dockerfile index 539118fa..783c3b06 100644 --- a/backend/Dockerfile +++ b/backend/Dockerfile @@ -21,14 +21,15 @@ RUN pip install -r /tmp/docker-requirements.txt COPY requirements.txt requirements.txt COPY api-requirements.txt api-requirements.txt # Don't use legacy resolver , TODO : fix this dependencies -RUN pip install --use-deprecated=legacy-resolver -r api-requirements.txt +# RUN pip install --use-deprecated=legacy-resolver -r api-requirements.txt RUN pip install setuptools==68.2.2 -RUN pip install build==0.41.3 - -RUN pip install --use-deprecated=legacy-resolver -r requirements.txt +RUN pip install wheel==0.41.3 +RUN pip install build==1.0.0 +RUN pip install -r requirements.txt +# RUN pip install --use-deprecated=legacy-resolver -r requirements.txt COPY docker/ramp/solaris /tmp/solaris RUN pip install /tmp/solaris --use-feature=in-tree-build && \ pip install scikit-fmm --use-feature=in-tree-build diff --git a/backend/Dockerfile_CPU b/backend/Dockerfile_CPU index 97498a8c..d98f2a25 100644 --- a/backend/Dockerfile_CPU +++ b/backend/Dockerfile_CPU @@ -27,9 +27,6 @@ RUN pip install setuptools==68.2.2 RUN pip install wheel==0.41.3 RUN pip install build==1.0.0 -RUN pip install -r api-requirements.txt - - RUN pip install -r requirements.txt # RUN pip install --use-deprecated=legacy-resolver -r requirements.txt