Merge pull request #285 from hotosm/hotfix/docker-old-build

Docker HOT FIX : Fixes setup tools
hotosm · Oct 4, 2024 · 3412739 · 3412739
2 parents f2755a1 + c7524fc
commit 3412739
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 10 deletions.
diff --git a/backend/Dockerfile b/backend/Dockerfile
@@ -17,15 +17,19 @@ 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 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
@@ -18,12 +18,18 @@ 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 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 && \