Skip to content

Commit 79ceb74

Browse files
authored
Merge pull request #203 from skwashd/libressl
Switch from OpenSSL to LibreSSL
2 parents 1ca4a57 + e81758e commit 79ceb74

File tree

3 files changed

+9
-8
lines changed

3 files changed

+9
-8
lines changed

2.7/alpine3.6/Dockerfile

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ ENV PYTHON_VERSION 2.7.13
1717
RUN set -ex \
1818
&& apk add --no-cache --virtual .fetch-deps \
1919
gnupg \
20-
openssl \
20+
libressl \
2121
tar \
2222
xz \
2323
\
@@ -41,8 +41,8 @@ RUN set -ex \
4141
linux-headers \
4242
make \
4343
ncurses-dev \
44-
openssl \
45-
openssl-dev \
44+
libressl \
45+
libressl-dev \
4646
pax-utils \
4747
readline-dev \
4848
sqlite-dev \
@@ -85,7 +85,7 @@ ENV PYTHON_PIP_VERSION 9.0.1
8585

8686
RUN set -ex; \
8787
\
88-
apk add --no-cache --virtual .fetch-deps openssl; \
88+
apk add --no-cache --virtual .fetch-deps libressl; \
8989
\
9090
wget -O get-pip.py 'https://bootstrap.pypa.io/get-pip.py'; \
9191
\

3.6/alpine3.6/Dockerfile

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ ENV PYTHON_VERSION 3.6.1
2323
RUN set -ex \
2424
&& apk add --no-cache --virtual .fetch-deps \
2525
gnupg \
26-
openssl \
26+
libressl \
2727
tar \
2828
xz \
2929
\
@@ -47,8 +47,8 @@ RUN set -ex \
4747
linux-headers \
4848
make \
4949
ncurses-dev \
50-
openssl \
51-
openssl-dev \
50+
libressl \
51+
libressl-dev \
5252
pax-utils \
5353
readline-dev \
5454
sqlite-dev \
@@ -100,7 +100,7 @@ ENV PYTHON_PIP_VERSION 9.0.1
100100

101101
RUN set -ex; \
102102
\
103-
apk add --no-cache --virtual .fetch-deps openssl; \
103+
apk add --no-cache --virtual .fetch-deps libressl; \
104104
\
105105
wget -O get-pip.py 'https://bootstrap.pypa.io/get-pip.py'; \
106106
\

update.sh

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -116,6 +116,7 @@ for version in "${versions[@]}"; do
116116
cp "$version/alpine/Dockerfile" "$version/alpine3.6/Dockerfile"
117117
sed -ri \
118118
-e 's/(alpine):3.4/\1:3.6/g' \
119+
-e 's/openssl/libressl/g' \
119120
"$version/alpine3.6/Dockerfile"
120121
fi
121122
for variant in wheezy alpine3.6 alpine slim ''; do

0 commit comments

Comments
 (0)