Skip to content
This repository was archived by the owner on Jan 6, 2021. It is now read-only.

Commit d6cc6a3

Browse files
authored
Merge pull request #380 from linuxserver/cryptography
fix cryptography version mismatch
2 parents d6e57aa + a87297d commit d6cc6a3

File tree

5 files changed

+32
-0
lines changed

5 files changed

+32
-0
lines changed

Dockerfile

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,13 @@ ENV DHLEVEL=2048 ONLY_SUBDOMAINS=false AWS_CONFIG_FILE=/config/dns-conf/route53.
1212
ENV S6_BEHAVIOUR_IF_STAGE2_FAILS=2
1313

1414
RUN \
15+
echo "**** install build packages ****" && \
16+
apk add --no-cache --virtual=build-dependencies \
17+
g++ \
18+
gcc \
19+
libffi-dev \
20+
openssl-dev \
21+
python3-dev && \
1522
echo "**** install runtime packages ****" && \
1623
apk add --no-cache --upgrade \
1724
curl \
@@ -98,6 +105,7 @@ RUN \
98105
certbot-dns-rfc2136 \
99106
certbot-dns-route53 \
100107
certbot-dns-transip \
108+
cryptography \
101109
requests && \
102110
echo "**** remove unnecessary fail2ban filters ****" && \
103111
rm \
@@ -117,6 +125,8 @@ RUN \
117125
echo "**** configure nginx ****" && \
118126
rm -f /etc/nginx/conf.d/default.conf && \
119127
echo "**** cleanup ****" && \
128+
apk del --purge \
129+
build-dependencies && \
120130
for cleanfiles in *.pyc *.pyo; \
121131
do \
122132
find /usr/lib/python3.* -iname "${cleanfiles}" -exec rm -f '{}' + \

Dockerfile.aarch64

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,13 @@ ENV DHLEVEL=2048 ONLY_SUBDOMAINS=false AWS_CONFIG_FILE=/config/dns-conf/route53.
1212
ENV S6_BEHAVIOUR_IF_STAGE2_FAILS=2
1313

1414
RUN \
15+
echo "**** install build packages ****" && \
16+
apk add --no-cache --virtual=build-dependencies \
17+
g++ \
18+
gcc \
19+
libffi-dev \
20+
openssl-dev \
21+
python3-dev && \
1522
echo "**** install runtime packages ****" && \
1623
apk add --no-cache --upgrade \
1724
curl \
@@ -98,6 +105,7 @@ RUN \
98105
certbot-dns-rfc2136 \
99106
certbot-dns-route53 \
100107
certbot-dns-transip \
108+
cryptography \
101109
requests && \
102110
echo "**** remove unnecessary fail2ban filters ****" && \
103111
rm \
@@ -117,6 +125,8 @@ RUN \
117125
echo "**** configure nginx ****" && \
118126
rm -f /etc/nginx/conf.d/default.conf && \
119127
echo "**** cleanup ****" && \
128+
apk del --purge \
129+
build-dependencies && \
120130
for cleanfiles in *.pyc *.pyo; \
121131
do \
122132
find /usr/lib/python3.* -iname "${cleanfiles}" -exec rm -f '{}' + \

Dockerfile.armhf

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,13 @@ ENV DHLEVEL=2048 ONLY_SUBDOMAINS=false AWS_CONFIG_FILE=/config/dns-conf/route53.
1212
ENV S6_BEHAVIOUR_IF_STAGE2_FAILS=2
1313

1414
RUN \
15+
echo "**** install build packages ****" && \
16+
apk add --no-cache --virtual=build-dependencies \
17+
g++ \
18+
gcc \
19+
libffi-dev \
20+
openssl-dev \
21+
python3-dev && \
1522
echo "**** install runtime packages ****" && \
1623
apk add --no-cache --upgrade \
1724
curl \
@@ -98,6 +105,7 @@ RUN \
98105
certbot-dns-rfc2136 \
99106
certbot-dns-route53 \
100107
certbot-dns-transip \
108+
cryptography \
101109
requests && \
102110
echo "**** remove unnecessary fail2ban filters ****" && \
103111
rm \
@@ -117,6 +125,8 @@ RUN \
117125
echo "**** configure nginx ****" && \
118126
rm -f /etc/nginx/conf.d/default.conf && \
119127
echo "**** cleanup ****" && \
128+
apk del --purge \
129+
build-dependencies && \
120130
for cleanfiles in *.pyc *.pyo; \
121131
do \
122132
find /usr/lib/python3.* -iname "${cleanfiles}" -exec rm -f '{}' + \

README.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -273,6 +273,7 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64
273273

274274
## Versions
275275

276+
* **20.11.19:** - Fix cryptography version mismatch due to pip issue.
276277
* **17.11.19:** - Add php7-pdo_odbc.
277278
* **17.11.19:** - Add transip dns validation plugin.
278279
* **27.10.19:** - Turn off lua resty core to get rid of error message in the log (existing users will have to delete `/config/nginx/nginx.conf` and restart the container).

readme-vars.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -126,6 +126,7 @@ app_setup_nginx_reverse_proxy_block: ""
126126

127127
# changelog
128128
changelogs:
129+
- { date: "20.11.19:", desc: "Fix cryptography version mismatch due to pip issue." }
129130
- { date: "17.11.19:", desc: "Add php7-pdo_odbc." }
130131
- { date: "17.11.19:", desc: "Add transip dns validation plugin." }
131132
- { date: "27.10.19:", desc: "Turn off lua resty core to get rid of error message in the log (existing users will have to delete `/config/nginx/nginx.conf` and restart the container)." }

0 commit comments

Comments
 (0)