[pulsar] branch branch-2.11 updated: [Revert][Build] Ubuntu 22.04 was not compatible with Python Client Wheel (#20759)

[wa...@apache.org]

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

wave pushed a commit to branch branch-2.11
in repository https://gitbox.apache.org/repos/asf/pulsar.git


The following commit(s) were added to refs/heads/branch-2.11 by this push:
     new 5e3de72aa9f [Revert][Build] Ubuntu 22.04 was not compatible with Python Client Wheel (#20759)
5e3de72aa9f is described below

commit 5e3de72aa9f8b29743e90d2c0c68ebc9ada0a825
Author: Dave Fisher <da...@comcast.net>
AuthorDate: Sat Jul 8 10:56:26 2023 -0700

    [Revert][Build] Ubuntu 22.04 was not compatible with Python Client Wheel (#20759)
    
    There is a bad test in Pulsar IO with sqllite teardown
---
 build/docker/Dockerfile                        | 2 +-
 docker/pulsar/Dockerfile                       | 2 +-
 docker/pulsar/scripts/install-pulsar-client.sh | 4 ++++
 tests/docker-images/java-test-image/Dockerfile | 2 +-
 4 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/build/docker/Dockerfile b/build/docker/Dockerfile
index eab3d9da737..21868cc8b15 100644
--- a/build/docker/Dockerfile
+++ b/build/docker/Dockerfile
@@ -17,7 +17,7 @@
 # under the License.
 #
 
-FROM ubuntu:22.04
+FROM ubuntu:20.04
 
 # prepare the directory for pulsar related files
 RUN mkdir /pulsar
diff --git a/docker/pulsar/Dockerfile b/docker/pulsar/Dockerfile
index 1f543111201..6450668ccd2 100644
--- a/docker/pulsar/Dockerfile
+++ b/docker/pulsar/Dockerfile
@@ -49,7 +49,7 @@ RUN chmod g+w /pulsar/lib/presto
 ### Create 2nd stage from Ubuntu image
 ### and add OpenJDK and Python dependencies (for Pulsar functions)
 
-FROM ubuntu:22.04
+FROM ubuntu:20.04
 
 ARG DEBIAN_FRONTEND=noninteractive
 ARG UBUNTU_MIRROR=mirror://mirrors.ubuntu.com/mirrors.txt
diff --git a/docker/pulsar/scripts/install-pulsar-client.sh b/docker/pulsar/scripts/install-pulsar-client.sh
index 56702b10db3..b4b2ec8ac2d 100755
--- a/docker/pulsar/scripts/install-pulsar-client.sh
+++ b/docker/pulsar/scripts/install-pulsar-client.sh
@@ -21,5 +21,9 @@
 set -x
 
 PYTHON_MAJOR_MINOR=$(python3 -V | sed -E 's/.* ([[:digit:]]+)\.([[:digit:]]+).*/\1\2/')
+echo $PYTHON_MAJOR_MINOR
+ls /pulsar/pulsar-client
+uname -a
 WHEEL_FILE=$(ls /pulsar/pulsar-client | grep "cp${PYTHON_MAJOR_MINOR}")
+echo WHEEL_FILE=$WHEEL_FILE
 pip3 install /pulsar/pulsar-client/${WHEEL_FILE}[all]
diff --git a/tests/docker-images/java-test-image/Dockerfile b/tests/docker-images/java-test-image/Dockerfile
index d712c83a425..b7f12b75968 100644
--- a/tests/docker-images/java-test-image/Dockerfile
+++ b/tests/docker-images/java-test-image/Dockerfile
@@ -17,7 +17,7 @@
 # under the License.
 #
 
-FROM ubuntu:22.04
+FROM ubuntu:20.04
 
 RUN groupadd -g 10001 pulsar
 RUN adduser -u 10000 --gid 10001 --disabled-login --disabled-password --gecos '' pulsar