Skip to content

Commit 9c51693

Browse files
committed
updated docker djanog layer 01 with more dependabot updates, added pip3 legacy-resolver to fix pip problems
1 parent e19ac4a commit 9c51693

File tree

2 files changed

+22
-8
lines changed

2 files changed

+22
-8
lines changed

django/docker/django/Dockerfile

Lines changed: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,21 @@ RUN apk add --no-cache \
6767

6868
# python requirements 01 layer, depandabot updates
6969
COPY ./requirements/01/requirements.txt /tmp/requirements.txt
70-
RUN cd /opt && pip3 install -r /tmp/requirements.txt \
70+
RUN apk add --no-cache \
71+
libjpeg-turbo-dev \
72+
freetype-dev \
73+
lcms2-dev \
74+
openjpeg-dev \
75+
tiff-dev \
76+
zlib-dev \
77+
&& cd /opt && pip3 install --use-deprecated=legacy-resolver -r /tmp/requirements.txt \
78+
&& apk del \
79+
libjpeg-turbo-dev \
80+
freetype-dev \
81+
lcms2-dev \
82+
openjpeg-dev \
83+
tiff-dev \
84+
zlib-dev \
7185
&& pip3 cache purge
7286

7387
COPY s6/etc/services.d /etc/services.d

django/docker/django/requirements/01/requirements.txt

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,20 +2,20 @@ aniso8601==7.0.0
22
appdirs==1.4.4
33
APScheduler==3.6.3
44
asgiref==3.4.1
5-
astroid==2.4.2
5+
astroid==2.6.2
66
attrs==20.3.0
77
beautifulsoup4==4.9.3
88
blessings==1.7
99
bpython==0.20.1
10-
certifi==2020.12.5
10+
certifi==2021.5.30
1111
chardet==4.0.0
1212
click==8.0.1
1313
curtsies==0.3.4
1414
Django==3.1.12
1515
django-apscheduler==0.5.1
1616
django-cors-headers==3.7.0
1717
django-filter==2.4.0
18-
django-json-widget==1.0.1
18+
django-json-widget==1.1.1
1919
django-solo==1.1.5
2020
django-sortedm2m==3.0.2
2121
-e git+https://github.com/svleeuwen/sortedm2m-filter-horizontal-widget.git@4ce03f6b7e6022014838afb4a8aa4691fceb9e94#egg=django_sortedm2m_filter_horizontal_widget
@@ -27,7 +27,7 @@ graphql-core==2.3.2
2727
graphql-relay==2.0.1
2828
greenlet==0.4.17
2929
gunicorn==20.1.0
30-
h11==0.11.0
30+
h11==0.12.0
3131
httptools==0.1.1
3232
idna==2.10
3333
iniconfig==1.1.1
@@ -39,7 +39,7 @@ more-itertools==8.6.0
3939
olefile==0.46
4040
ordered-set==4.0.1
4141
packaging==20.9
42-
Pillow==8.2.0
42+
Pillow==8.3.1
4343
pluggy==0.13.1
4444
promise==2.3
4545
psycopg2==2.8.6
@@ -51,13 +51,13 @@ pylint-plugin-utils==0.6
5151
pyparsing==2.4.7
5252
pytest==6.2.1
5353
pytest-django==4.1.0
54-
pytz==2020.5
54+
pytz==2021.1
5555
requests==2.25.1
5656
Rx==1.6.1
5757
singledispatch==3.6.2
5858
six==1.15.0
5959
sorl-thumbnail==12.7.0
60-
soupsieve==2.1
60+
soupsieve==2.2.1
6161
sqlparse==0.4.1
6262
text-unidecode==1.3
6363
toml==0.10.2

0 commit comments

Comments
 (0)