Skip to content

Commit 4534831

Browse files
pip: use old legacy resolver (#3379)
1 parent f64f12f commit 4534831

File tree

2 files changed

+9
-4
lines changed

2 files changed

+9
-4
lines changed

Dockerfile.django

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,8 @@ RUN \
2323
rm -rf /var/lib/apt/lists && \
2424
true
2525
COPY requirements.txt ./
26-
RUN pip3 wheel --wheel-dir=/tmp/wheels -r ./requirements.txt
26+
RUN pip3 install --no-cache-dir --upgrade pip
27+
RUN pip3 wheel --wheel-dir=/tmp/wheels -r ./requirements.txt --use-deprecated=legacy-resolver
2728

2829
FROM python:3.6.12-slim-buster@sha256:e5259113df5a7c4dae16ad37c2ca53b1cf722e051cfd5f624e7b76aa72389e0c
2930
WORKDIR /app
@@ -59,7 +60,8 @@ RUN pip3 install \
5960
--no-cache-dir \
6061
--no-index \
6162
--find-links=/tmp/wheels \
62-
-r ./requirements.txt
63+
-r ./requirements.txt \
64+
--use-deprecated=legacy-resolver
6365
COPY \
6466
docker/entrypoint-celery-beat.sh \
6567
docker/entrypoint-celery-worker.sh \

Dockerfile.nginx

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,8 @@ RUN \
2020
rm -rf /var/lib/apt/lists && \
2121
true
2222
COPY requirements.txt ./
23-
RUN pip3 wheel --wheel-dir=/tmp/wheels -r ./requirements.txt
23+
RUN pip3 install --no-cache-dir --upgrade pip
24+
RUN pip3 wheel --wheel-dir=/tmp/wheels -r ./requirements.txt --use-deprecated=legacy-resolver
2425

2526
FROM build AS collectstatic
2627

@@ -46,11 +47,13 @@ RUN \
4647
rm -rf /var/lib/apt/lists && \
4748
true
4849

50+
RUN pip3 install --no-cache-dir --upgrade pip
4951
RUN pip3 install \
5052
--no-cache-dir \
5153
--no-index \
5254
--find-links=/tmp/wheels \
53-
-r ./requirements.txt
55+
-r ./requirements.txt \
56+
--use-deprecated=legacy-resolver
5457

5558
COPY components/ ./components/
5659
COPY manage.py ./

0 commit comments

Comments
 (0)