[bookkeeper] branch branch-4.10 updated: ISSUE #2557: Bookkeeper docker image build fails because of deprecated Python version for pip

[eo...@apache.org]

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

eolivelli pushed a commit to branch branch-4.10
in repository https://gitbox.apache.org/repos/asf/bookkeeper.git


The following commit(s) were added to refs/heads/branch-4.10 by this push:
     new d69c6ea  ISSUE #2557: Bookkeeper docker image build fails because of deprecated Python version for pip
d69c6ea is described below

commit d69c6ea30864f174784cb2582c855196dc5fcb66
Author: Raúl Gracia <ra...@gmail.com>
AuthorDate: Wed Jan 27 13:56:32 2021 +0100

    ISSUE #2557: Bookkeeper docker image build fails because of deprecated Python version for pip
    
    Descriptions of the changes in this PR:
    
    ### Motivation
    
    Fix Docker image build for Bookkeeper.
    
    ### Changes
    
    This PR just makes sure that the `pip` version used in the Dockerfile is compatible with Python 2.7. We may need to consider cherry-picking this PR to branches of Bookkeeper that are not end-of-life.
    
    Master Issue: #2557
    
    Signed-off-by: Raúl Gracia <raul.graciaemc.com>
    
    Reviewers: Enrico Olivelli <eo...@gmail.com>
    
    This closes #2558 from RaulGracia/issue-2557-fix-docker-image-build, closes #2557
    
    (cherry picked from commit 0a4a5577de00aeaca7cafaf2bd8fee1abe0030d3)
    Signed-off-by: Enrico Olivelli <eo...@apache.org>
---
 docker/Dockerfile                                    | 2 +-
 tests/docker-images/current-version-image/Dockerfile | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/docker/Dockerfile b/docker/Dockerfile
index f7ed4b1..9f5a85f 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -47,7 +47,7 @@ RUN set -x \
     && mv bookkeeper-server-${BK_VERSION}/ /opt/bookkeeper/ \
     && rm -rf "$DISTRO_NAME.tar.gz" "$DISTRO_NAME.tar.gz.asc" "$DISTRO_NAME.tar.gz.sha512" \
     # install zookeeper shell
-    && wget -q https://bootstrap.pypa.io/get-pip.py \
+    && wget -q https://bootstrap.pypa.io/2.7/get-pip.py \
     && python get-pip.py \
     && pip install zk-shell \
     && rm -rf get-pip.py \
diff --git a/tests/docker-images/current-version-image/Dockerfile b/tests/docker-images/current-version-image/Dockerfile
index 7a14cc4..2b86c08 100644
--- a/tests/docker-images/current-version-image/Dockerfile
+++ b/tests/docker-images/current-version-image/Dockerfile
@@ -40,7 +40,7 @@ RUN set -x \
     && mkdir -pv /opt \
     && cd /opt \
     # install zookeeper shell
-    && wget -q https://bootstrap.pypa.io/get-pip.py \
+    && wget -q https://bootstrap.pypa.io/2.7/get-pip.py \
     && python get-pip.py \
     && pip install zk-shell \
     && rm -rf get-pip.py \