From 899cd329ab5b5d7bea04396e523f2d6b1b50d647 Mon Sep 17 00:00:00 2001 From: Dave Fisher Date: Fri, 7 Jul 2023 13:41:16 -0700 Subject: [PATCH 1/7] Force Wheel to 3.8 --- docker/pulsar/scripts/install-pulsar-client.sh | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/docker/pulsar/scripts/install-pulsar-client.sh b/docker/pulsar/scripts/install-pulsar-client.sh index 56702b10db3d8..973ce2daee944 100755 --- a/docker/pulsar/scripts/install-pulsar-client.sh +++ b/docker/pulsar/scripts/install-pulsar-client.sh @@ -20,6 +20,8 @@ set -x -PYTHON_MAJOR_MINOR=$(python3 -V | sed -E 's/.* ([[:digit:]]+)\.([[:digit:]]+).*/\1\2/') +#PYTHON_MAJOR_MINOR=$(python3 -V | sed -E 's/.* ([[:digit:]]+)\.([[:digit:]]+).*/\1\2/') +# force to python 3.8 +PYTHON_MAJOR_MINOR=38 WHEEL_FILE=$(ls /pulsar/pulsar-client | grep "cp${PYTHON_MAJOR_MINOR}") pip3 install /pulsar/pulsar-client/${WHEEL_FILE}[all] From 984df79e8e615d27c4f773f93e66c685cb6c3f52 Mon Sep 17 00:00:00 2001 From: Dave Fisher Date: Fri, 7 Jul 2023 14:58:39 -0700 Subject: [PATCH 2/7] force wheel to 3.9 --- docker/pulsar/scripts/install-pulsar-client.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docker/pulsar/scripts/install-pulsar-client.sh b/docker/pulsar/scripts/install-pulsar-client.sh index 973ce2daee944..59ca501858e1a 100755 --- a/docker/pulsar/scripts/install-pulsar-client.sh +++ b/docker/pulsar/scripts/install-pulsar-client.sh @@ -21,7 +21,7 @@ set -x #PYTHON_MAJOR_MINOR=$(python3 -V | sed -E 's/.* ([[:digit:]]+)\.([[:digit:]]+).*/\1\2/') -# force to python 3.8 -PYTHON_MAJOR_MINOR=38 +# force to python 3.9 +PYTHON_MAJOR_MINOR=39 WHEEL_FILE=$(ls /pulsar/pulsar-client | grep "cp${PYTHON_MAJOR_MINOR}") pip3 install /pulsar/pulsar-client/${WHEEL_FILE}[all] From b986baa31ced8d6abe3c601ab30569a45a0809d1 Mon Sep 17 00:00:00 2001 From: Dave Fisher Date: Fri, 7 Jul 2023 15:43:53 -0700 Subject: [PATCH 3/7] Update install-pulsar-client.sh --- docker/pulsar/scripts/install-pulsar-client.sh | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/docker/pulsar/scripts/install-pulsar-client.sh b/docker/pulsar/scripts/install-pulsar-client.sh index 59ca501858e1a..a2501cf783746 100755 --- a/docker/pulsar/scripts/install-pulsar-client.sh +++ b/docker/pulsar/scripts/install-pulsar-client.sh @@ -20,8 +20,11 @@ set -x -#PYTHON_MAJOR_MINOR=$(python3 -V | sed -E 's/.* ([[:digit:]]+)\.([[:digit:]]+).*/\1\2/') +PYTHON_MAJOR_MINOR=$(python3 -V | sed -E 's/.* ([[:digit:]]+)\.([[:digit:]]+).*/\1\2/') +echo $PYTHON_MAJOR_MINOR +ls /pulsar/pulsar-client # force to python 3.9 -PYTHON_MAJOR_MINOR=39 +PYTHON_MAJOR_MINOR=38 WHEEL_FILE=$(ls /pulsar/pulsar-client | grep "cp${PYTHON_MAJOR_MINOR}") +echo $WHEEL_FILE pip3 install /pulsar/pulsar-client/${WHEEL_FILE}[all] From 5dbbab3993afe3e15d18f34842b2f8cc6aaffb00 Mon Sep 17 00:00:00 2001 From: Dave Fisher Date: Fri, 7 Jul 2023 16:16:14 -0700 Subject: [PATCH 4/7] Update install-pulsar-client.sh --- docker/pulsar/scripts/install-pulsar-client.sh | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/docker/pulsar/scripts/install-pulsar-client.sh b/docker/pulsar/scripts/install-pulsar-client.sh index a2501cf783746..b4b2ec8ac2d43 100755 --- a/docker/pulsar/scripts/install-pulsar-client.sh +++ b/docker/pulsar/scripts/install-pulsar-client.sh @@ -23,8 +23,7 @@ set -x PYTHON_MAJOR_MINOR=$(python3 -V | sed -E 's/.* ([[:digit:]]+)\.([[:digit:]]+).*/\1\2/') echo $PYTHON_MAJOR_MINOR ls /pulsar/pulsar-client -# force to python 3.9 -PYTHON_MAJOR_MINOR=38 +uname -a WHEEL_FILE=$(ls /pulsar/pulsar-client | grep "cp${PYTHON_MAJOR_MINOR}") -echo $WHEEL_FILE +echo WHEEL_FILE=$WHEEL_FILE pip3 install /pulsar/pulsar-client/${WHEEL_FILE}[all] From 94ebb97c3e044c316a78eeaa77301506801dff8a Mon Sep 17 00:00:00 2001 From: Dave Fisher Date: Fri, 7 Jul 2023 16:47:30 -0700 Subject: [PATCH 5/7] Update Dockerfile --- docker/pulsar/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker/pulsar/Dockerfile b/docker/pulsar/Dockerfile index 1f543111201aa..6450668ccd2be 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 From 803cf04b5ae0c3ecc4f902af67a91ac3da43ff89 Mon Sep 17 00:00:00 2001 From: Dave Fisher Date: Fri, 7 Jul 2023 16:48:40 -0700 Subject: [PATCH 6/7] Update Dockerfile --- tests/docker-images/java-test-image/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/docker-images/java-test-image/Dockerfile b/tests/docker-images/java-test-image/Dockerfile index d712c83a425b6..b7f12b75968a1 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 From 776b2285513cf8f1cb860f6448f0466ae7b9b40a Mon Sep 17 00:00:00 2001 From: Dave Fisher Date: Fri, 7 Jul 2023 16:50:24 -0700 Subject: [PATCH 7/7] Update Dockerfile --- build/docker/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/docker/Dockerfile b/build/docker/Dockerfile index eab3d9da737ba..21868cc8b15c9 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