Skip to content

3.6/alpine3.7: Build nis module now that 3.6.5 is patched #274

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Mar 30, 2018
Merged

3.6/alpine3.7: Build nis module now that 3.6.5 is patched #274

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions 3.6/alpine3.7/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,8 @@ RUN set -ex \
gdbm-dev \
libc-dev \
libffi-dev \
libnsl-dev \
libtirpc-dev \
linux-headers \
make \
ncurses-dev \
Expand Down
3 changes: 1 addition & 2 deletions update.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -160,8 +160,7 @@ for version in "${versions[@]}"; do

# Libraries to build the nis module available in Alpine 3.7, but also require this patch:
# https://bugs.python.org/issue32521
# TODO: Remove Python version check once 2.7 and 3.6 have the patch
if [[ "$variant" == alpine* ]] && [[ "$variant" != alpine3.7 || "$version" != 3.7* ]]; then
if [[ "$variant" == alpine* ]] && [[ "$variant" != alpine3.7 ]]; then
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Won't this also leave the libraries on python:2.7-alpine3.7? Is that version fixed too?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I did think so when I wrote this the first time, but the Python 2.7 Dockerfiles actually aren’t templated.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You are correct; I forgot about these lines

python/update.sh

Lines 135 to 136 in 33b16b4

if [[ "$version" == 2.* ]]; then
echo " TODO: vimdiff 3.6/$v/Dockerfile $version/$v/Dockerfile"

sed -ri -e '/libnsl-dev/d' -e '/libtirpc-dev/d' "$dir/Dockerfile"
fi

Expand Down