From 9cd2853e49eea9ed984206bf8d49a6c751bc019b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sybren=20A=2E=20St=C3=BCvel?= <sybren@stuvel.eu>
Date: Thu, 30 Aug 2018 12:31:31 +0200
Subject: [PATCH] Upgrade pip after building Python

---
 docker/2_buildpy/build.sh         | 3 +++
 docker/2_buildpy/includepy.docker | 3 +--
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/docker/2_buildpy/build.sh b/docker/2_buildpy/build.sh
index 61dd5f0..a44b802 100755
--- a/docker/2_buildpy/build.sh
+++ b/docker/2_buildpy/build.sh
@@ -34,6 +34,9 @@ make -j8 install
 # Make sure we can run Python
 ldconfig
 
+# Upgrade pip
+/opt/python/bin/python3 -m pip install -U pip
+
 # Build mod-wsgi-py3 for Python 3.6
 cd /dpkg/mod-wsgi-*
 ./configure --with-python=/opt/python/bin/python3
diff --git a/docker/2_buildpy/includepy.docker b/docker/2_buildpy/includepy.docker
index 78591b3..09716dd 100644
--- a/docker/2_buildpy/includepy.docker
+++ b/docker/2_buildpy/includepy.docker
@@ -10,5 +10,4 @@ RUN echo Python is installed in /opt/python/ > README.python
 ENV PATH=/opt/python/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin
 
 RUN cd /opt/python/bin && \
-    ln -s python3 python && \
-    ln -s pip3 pip
+    ln -s python3 python