Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Docker HOT FIX : Fixes setup tools #285

Merged
merged 2 commits into from
Oct 4, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 9 additions & 5 deletions backend/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
16 changes: 11 additions & 5 deletions backend/Dockerfile_CPU
Original file line number Diff line number Diff line change
Expand Up @@ -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 && \
Expand Down
Loading