Skip to content

Commit dfef396

Browse files
committed
Alpine: Add libs for nis module (Alpine 3.7/Python 3.7 only)
* Bump Python 3.7 to 3.7.0b2
1 parent fb93f41 commit dfef396

File tree

7 files changed

+16
-5
lines changed

7 files changed

+16
-5
lines changed

3.7-rc/alpine3.7/Dockerfile

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ ENV LANG C.UTF-8
1818
RUN apk add --no-cache ca-certificates
1919

2020
ENV GPG_KEY 0D96DF4D4110E5C43FBFB17F2D347EA6AA65421D
21-
ENV PYTHON_VERSION 3.7.0b1
21+
ENV PYTHON_VERSION 3.7.0b2
2222

2323
RUN set -ex \
2424
&& apk add --no-cache --virtual .fetch-deps \
@@ -46,6 +46,8 @@ RUN set -ex \
4646
gdbm-dev \
4747
libc-dev \
4848
libffi-dev \
49+
libnsl-dev \
50+
libtirpc-dev \
4951
linux-headers \
5052
make \
5153
ncurses-dev \

3.7-rc/stretch/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
2020
&& rm -rf /var/lib/apt/lists/*
2121

2222
ENV GPG_KEY 0D96DF4D4110E5C43FBFB17F2D347EA6AA65421D
23-
ENV PYTHON_VERSION 3.7.0b1
23+
ENV PYTHON_VERSION 3.7.0b2
2424

2525
RUN set -ex \
2626
&& buildDeps=' \

3.7-rc/stretch/slim/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
2525
&& rm -rf /var/lib/apt/lists/*
2626

2727
ENV GPG_KEY 0D96DF4D4110E5C43FBFB17F2D347EA6AA65421D
28-
ENV PYTHON_VERSION 3.7.0b1
28+
ENV PYTHON_VERSION 3.7.0b2
2929

3030
RUN set -ex \
3131
&& buildDeps=" \

3.7-rc/windows/windowsservercore-1709/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ FROM microsoft/windowsservercore:1709
88

99
SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"]
1010

11-
ENV PYTHON_VERSION 3.7.0b1
11+
ENV PYTHON_VERSION 3.7.0b2
1212
ENV PYTHON_RELEASE 3.7.0
1313

1414
RUN $url = ('https://www.python.org/ftp/python/{0}/python-{1}-amd64.exe' -f $env:PYTHON_RELEASE, $env:PYTHON_VERSION); \

3.7-rc/windows/windowsservercore-ltsc2016/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ FROM microsoft/windowsservercore:ltsc2016
88

99
SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"]
1010

11-
ENV PYTHON_VERSION 3.7.0b1
11+
ENV PYTHON_VERSION 3.7.0b2
1212
ENV PYTHON_RELEASE 3.7.0
1313

1414
RUN $url = ('https://www.python.org/ftp/python/{0}/python-{1}-amd64.exe' -f $env:PYTHON_RELEASE, $env:PYTHON_VERSION); \

Dockerfile-alpine.template

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,8 @@ RUN set -ex \
4040
gdbm-dev \
4141
libc-dev \
4242
libffi-dev \
43+
libnsl-dev \
44+
libtirpc-dev \
4345
linux-headers \
4446
make \
4547
ncurses-dev \

update.sh

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -158,6 +158,13 @@ for version in "${versions[@]}"; do
158158
sed -ri -e 's/libressl/openssl/g' "$dir/Dockerfile"
159159
fi
160160

161+
# Libraries to build the nis module available in Alpine 3.7, but also require this patch:
162+
# https://bugs.python.org/issue32521
163+
# TODO: Remove Python version check once 2.7 and 3.6 have the patch
164+
if [[ "$variant" == alpine* ]] && [[ "$variant" != alpine3.7 || "$version" != 3.7* ]]; then
165+
sed -ri -e '/libnsl-dev/d' -e '/libtirpc-dev/d' "$dir/Dockerfile"
166+
fi
167+
161168
case "$v" in
162169
wheezy/slim|jessie/slim)
163170
sed -ri \

0 commit comments

Comments
 (0)