[kudu] 03/03: [docker] Update pip install

[gr...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

granthenke pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/kudu.git

commit b5e7362e69a5d7a9c9e88fa144e0366a2b22a83a
Author: Grant Henke <gr...@apache.org>
AuthorDate: Wed Jan 27 08:25:59 2021 -0600

    [docker] Update pip install
    
    It looks like Python has adjusted the get-pip.py URL to no longer
    support Python 2.7. This patch updates the Docker scripts to
    use the 2.7 specific URL and drop the old 2.6 speicific url now
    that no supported images use Python 2.6.
    
    Change-Id: Ia9a22e5084f8a5973d26372372f2ead4c46dcda9
    Reviewed-on: http://gerrit.cloudera.org:8080/16984
    Tested-by: Kudu Jenkins
    Reviewed-by: Alexey Serbin <as...@cloudera.com>
---
 docker/bootstrap-dev-env.sh    |  2 +-
 docker/bootstrap-python-env.sh | 13 ++++++-------
 2 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/docker/bootstrap-dev-env.sh b/docker/bootstrap-dev-env.sh
index 3fb7a1e..1c47735 100755
--- a/docker/bootstrap-dev-env.sh
+++ b/docker/bootstrap-dev-env.sh
@@ -77,7 +77,7 @@ if [[ -f "/usr/bin/yum" ]]; then
   # to install the ninja-build package.
   if [[ "$OS_MAJOR_VERSION" -gt "7" ]]; then
     yum install -y 'dnf-command(config-manager)'
-    yum config-manager --set-enabled PowerTools
+    yum config-manager --set-enabled powertools
   fi
 
   # Install libraries often used for Kudu development and build performance.
diff --git a/docker/bootstrap-python-env.sh b/docker/bootstrap-python-env.sh
index f4b91a0..570d3e6 100755
--- a/docker/bootstrap-python-env.sh
+++ b/docker/bootstrap-python-env.sh
@@ -34,14 +34,13 @@ function install_python_packages() {
   # We use get-pip.py to bootstrap pip outside of system packages.
   # This prevents issues with the platform package manager knowing
   # about only some of the python packages.
-  if [[ "$PYTHON_MAJOR" == "2" && "$PYTHON_MINOR" == "6" ]]; then
-    # Beginning with pip 10, Python 2.6 is no longer supported.
-    curl https://bootstrap.pypa.io/2.6/get-pip.py | python
+  if [[ "$PYTHON_MAJOR" == "2" && "$PYTHON_MINOR" == "7" ]]; then
+    # The standard get-pip.py URL no longer supports Python 2.7,
+    # so we need to use the version specific one.
+    curl https://bootstrap.pypa.io/2.7/get-pip.py | python
   else
-    # Use a stable version of pip that works with the remaining
-    # versions of Python 2 and 3. pip 19.1 doesn't support Python 3.4,
-    # which is the version of Python 3 shipped with Ubuntu 14.04.
-    curl https://bootstrap.pypa.io/get-pip.py | python - "pip < 19.0"
+    # Use a stable version of pip that works with Python 2 and 3.
+    curl https://bootstrap.pypa.io/get-pip.py | python - "pip < 20.3.4"
   fi
   pip install --upgrade \
     cython \