Skip to content
This repository was archived by the owner on Mar 28, 2019. It is now read-only.

Upstream changes #131 #8

Merged
JayH5 merged 3 commits into from
Aug 1, 2016
Merged

Upstream changes #131 #8

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
118e2a4
Don't remove python package, rather rename contents
JayH5 Jul 29, 2016
6793ebb
Try just delete the package files
JayH5 Jul 29, 2016
b37f55d
Rework explanation of python package file removal
JayH5 Aug 1, 2016
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
9 changes: 7 additions & 2 deletions 2.7/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,12 @@
FROM praekeltfoundation/alpine-buildpack-deps:3.4

# remove several traces of alpine python
RUN apk del --purge -r $(apk info | grep '^python')
# delete many traces of Alpine Python (so that they are not used by mistake)
# We can't just uninstall the Python package as we still want things that depend
# on it (e.g. libevent, pcre). We replace this Python with our version built
# from source. In the upstream Debian-based images, the package files are
# dpkg-divert'ed, but Alpine's package manager doesn't have this (obscure)
# functionality so instead we just delete the files.
RUN rm $(apk info -q --contents python)
Copy link
Member

@jerith jerith Aug 1, 2016

Choose a reason for hiding this comment

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

Why don't we want to remove the package?


# http://bugs.python.org/issue19846
# > At the moment, setting "LANG=C" on a Linux system *fundamentally breaks Python 3*, and that's not OK.
Expand Down
9 changes: 7 additions & 2 deletions 3.5/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,12 @@
FROM praekeltfoundation/alpine-buildpack-deps:3.4

# remove several traces of alpine python
RUN apk del --purge -r $(apk info | grep '^python')
# delete many traces of Alpine Python (so that they are not used by mistake)
# We can't just uninstall the Python package as we still want things that depend
# on it (e.g. libevent, pcre). We replace this Python with our version built
# from source. In the upstream Debian-based images, the package files are
# dpkg-divert'ed, but Alpine's package manager doesn't have this (obscure)
# functionality so instead we just delete the files.
RUN rm $(apk info -q --contents python)

# http://bugs.python.org/issue19846
# > At the moment, setting "LANG=C" on a Linux system *fundamentally breaks Python 3*, and that's not OK.
Expand Down