[impala] 03/03: IMPALA-11585: Build quickstart_client with Ubuntu 20

[st...@apache.org]

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

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

commit f6151b0aa18cfcad50f8f63d5621f56db9fde6fe
Author: Michael Smith <mi...@cloudera.com>
AuthorDate: Wed Sep 14 11:30:15 2022 -0700

    IMPALA-11585: Build quickstart_client with Ubuntu 20
    
    Ubuntu 20.04 only provides the python3-pip package. Update building
    quickstart_client to use python3-pip on Ubuntu 20.04.
    
    Change-Id: Ife89b7db88dd58e96ba1b3e3972ca97204332dd4
    Reviewed-on: http://gerrit.cloudera.org:8080/18984
    Reviewed-by: Impala Public Jenkins <im...@cloudera.com>
    Tested-by: Impala Public Jenkins <im...@cloudera.com>
---
 docker/CMakeLists.txt               | 5 ++++-
 docker/publish_images_to_apache.sh  | 3 +--
 docker/quickstart_client/Dockerfile | 3 ++-
 3 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/docker/CMakeLists.txt b/docker/CMakeLists.txt
index 37396c67f..ad443e3f2 100644
--- a/docker/CMakeLists.txt
+++ b/docker/CMakeLists.txt
@@ -37,10 +37,13 @@ execute_process(COMMAND ${LSB_RELEASE_EXEC} -rs
 
 if(${LSB_RELEASE_ID} STREQUAL "Ubuntu" AND ${LSB_RELEASE_VERSION} STREQUAL "16.04")
   set(DISTRO_BASE_IMAGE "ubuntu:16.04")
+  set(PIP "python-pip")
 elseif(${LSB_RELEASE_ID} STREQUAL "Ubuntu" AND ${LSB_RELEASE_VERSION} STREQUAL "18.04")
   set(DISTRO_BASE_IMAGE "ubuntu:18.04")
+  set(PIP "python-pip")
 elseif(${LSB_RELEASE_ID} STREQUAL "Ubuntu" AND ${LSB_RELEASE_VERSION} STREQUAL "20.04")
   set(DISTRO_BASE_IMAGE "ubuntu:20.04")
+  set(PIP "python3-pip")
 else()
   set(DISTRO_BASE_IMAGE "UNSUPPORTED")
 endif()
@@ -158,7 +161,7 @@ if (NOT ${DISTRO_BASE_IMAGE} STREQUAL "UNSUPPORTED")
     # Supply the appropriate base image as an argument for the Dockerfile.
     # Use tar with -h flag to assemble a tarball including all the symlinked files and
     # directories in the build context.
-    COMMAND tar cvh . -C ${quickstart_client_build_dir} . | ${DOCKER_BUILD} ${COMMON_DOCKER_BUILD_ARGS} --build-arg BASE_IMAGE=${DISTRO_BASE_IMAGE} -t ${QUICKSTART_CLIENT_IMAGE} -
+    COMMAND tar cvh . -C ${quickstart_client_build_dir} . | ${DOCKER_BUILD} ${COMMON_DOCKER_BUILD_ARGS} --build-arg BASE_IMAGE=${DISTRO_BASE_IMAGE} --build-arg PIP=${PIP}  -t ${QUICKSTART_CLIENT_IMAGE} -
     DEPENDS ${quickstart_client_build_dir}/Dockerfile ${quickstart_client_build_dir}/data-load-entrypoint.sh
     COMMENT "Building quickstart client docker image."
     VERBATIM
diff --git a/docker/publish_images_to_apache.sh b/docker/publish_images_to_apache.sh
index f0a2e64bc..42892f33b 100755
--- a/docker/publish_images_to_apache.sh
+++ b/docker/publish_images_to_apache.sh
@@ -20,8 +20,7 @@
 set -euo pipefail
 
 usage() {
-  echo "publish_container_to_apache.sh -v <version string> [-d] [-r <repo>"
-  echo "  -d: if specified, upload debug images instead of release images"
+  echo "publish_container_to_apache.sh -v <version string> [-r <repo>]"
   echo "  -r: docker repository to upload to (defaults to apache/impala)"
   echo "  -v: version string to tag upload with, e.g. git hash or release version"
 }
diff --git a/docker/quickstart_client/Dockerfile b/docker/quickstart_client/Dockerfile
index 96554f2c3..1f8c597c7 100644
--- a/docker/quickstart_client/Dockerfile
+++ b/docker/quickstart_client/Dockerfile
@@ -27,6 +27,7 @@ ARG VCS_REF
 ARG VCS_TYPE
 ARG VCS_URL
 ARG VERSION
+ARG PIP=python-pip
 
 # Install useful utilities. Set to non-interactive to avoid issues when installing tzdata.
 ENV DEBIAN_FRONTEND=noninteractive
@@ -34,7 +35,7 @@ RUN apt-get update && \
   apt-get install -y \
   sudo netcat-openbsd less curl iproute2 vim iputils-ping \
   libsasl2-dev libsasl2-2 libsasl2-modules libsasl2-modules-gssapi-mit \
-  tzdata krb5-user python-pip && \
+  tzdata krb5-user ${PIP} && \
   apt-get clean && \
   rm -rf /var/lib/apt/lists/*