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

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


The following commit(s) were added to refs/heads/master by this push:
     new 88493b0bc3 [KYUUBI #7295] Upgrade components of play ground to recent 
versions
88493b0bc3 is described below

commit 88493b0bc32c3ed0e9d21e1b810cc5dede958825
Author: Cheng Pan <[email protected]>
AuthorDate: Mon Jan 5 14:18:14 2026 +0800

    [KYUUBI #7295] Upgrade components of play ground to recent versions
    
    ### Why are the changes needed?
    
    Upgrade components of play ground to recent versions, in addition, Kyuubi 
and Spark switch to JDK 17, while other components like Hadoop and Hive, 
remamin using JDK 8.
    
    ### How was this patch tested?
    
    Tested locally by building images and run demo, the updated docker images 
will be available on DockerHub soon, reviewer can test it too.
    
    ### Was this patch authored or co-authored using generative AI tooling?
    
    No.
    
    Closes #7295 from pan3793/playground.
    
    Closes #7295
    
    43ba4f97b [Cheng Pan] chmod
    093468915 [Cheng Pan] ca-certificates-java
    a4b643d34 [Cheng Pan] docs
    bb7de285a [Cheng Pan] docs
    be24b2a34 [Cheng Pan] nit
    3e9bd6822 [Cheng Pan] nit
    30e0abc9e [Cheng Pan] docs
    73a01e40e [Cheng Pan] fix
    883d27c84 [Cheng Pan] playground
    
    Authored-by: Cheng Pan <[email protected]>
    Signed-off-by: Cheng Pan <[email protected]>
---
 docker/playground/.env                              | 10 +++++-----
 docker/playground/README.md                         | 21 ++++++++++++++++-----
 docker/playground/build-image.sh                    |  3 +--
 docker/playground/compose.yml                       |  6 ++++++
 docker/playground/{.env => conf/hadoop-env.sh}      | 16 +---------------
 docker/playground/{.env => conf/hive-env.sh}        | 16 +---------------
 docker/playground/{.env => conf/kyuubi-env.sh}      | 16 +---------------
 docker/playground/{.env => conf/spark-env.sh}       | 16 +---------------
 .../image/kyuubi-playground-base.Dockerfile         | 16 ++++++++++++++--
 .../image/kyuubi-playground-hadoop.Dockerfile       |  7 ++-----
 .../image/kyuubi-playground-kyuubi.Dockerfile       |  2 --
 .../image/kyuubi-playground-spark.Dockerfile        |  2 --
 12 files changed, 48 insertions(+), 83 deletions(-)

diff --git a/docker/playground/.env b/docker/playground/.env
index 28a97a0d24..435e585392 100644
--- a/docker/playground/.env
+++ b/docker/playground/.env
@@ -18,15 +18,15 @@
 AWS_JAVA_SDK_VERSION=1.12.367
 HADOOP_VERSION=3.3.6
 HIVE_VERSION=2.3.9
-ICEBERG_VERSION=1.6.1
-KYUUBI_VERSION=1.9.0
+ICEBERG_VERSION=1.10.1
+KYUUBI_VERSION=1.11.0
 KYUUBI_HADOOP_VERSION=3.3.6
 POSTGRES_VERSION=12
 POSTGRES_JDBC_VERSION=42.3.4
 SCALA_BINARY_VERSION=2.12
-SPARK_VERSION=3.4.4
-SPARK_BINARY_VERSION=3.4
+SPARK_VERSION=3.5.7
+SPARK_BINARY_VERSION=3.5
 SPARK_HADOOP_VERSION=3.3.4
 ZOOKEEPER_VERSION=3.6.3
-PROMETHEUS_VERSION=2.53.3
+PROMETHEUS_VERSION=2.53.5
 GRAFANA_VERSION=11.4.0
diff --git a/docker/playground/README.md b/docker/playground/README.md
index 2c6befd76f..5178caf85d 100644
--- a/docker/playground/README.md
+++ b/docker/playground/README.md
@@ -10,15 +10,17 @@ Playground
 
 ### Play
 
-1. Connect using `beeline`
+1. Connect using `kyuubi-beeline`
 
-`docker exec -it kyuubi /opt/kyuubi/bin/beeline -u 
'jdbc:hive2://0.0.0.0:10009/tpcds/tiny'`;
+```
+docker exec -it kyuubi /opt/kyuubi/bin/kyuubi-beeline -u 
'jdbc:kyuubi://0.0.0.0:10009/tpcds/tiny'
+```
 
 2. Connect using DBeaver
 
 Add a Kyuubi datasource with
 
-- connection url `jdbc:hive2://0.0.0.0:10009/tpcds/tiny`
+- connection url `jdbc:kyuubi://0.0.0.0:10009/tpcds/tiny`
 - username: `anonymous`
 - password: `<empty>`
 
@@ -26,8 +28,17 @@ Add a Kyuubi datasource with
 
 Kyuubi supply some built-in dataset, after Kyuubi started, you can run the 
following command to load the different datasets:
 
-- For loading TPC-DS tiny dataset to `spark_catalog.tpcds_tiny`, run `docker 
exec -it kyuubi /opt/kyuubi/bin/beeline -u 'jdbc:hive2://0.0.0.0:10009/' -f 
/opt/load_data/load-dataset-tpcds-tiny.sql`
-- For loading TPC-H  tiny dataset to `spark_catalog.tpch_tiny`,  run `docker 
exec -it kyuubi /opt/kyuubi/bin/beeline -u 'jdbc:hive2://0.0.0.0:10009/' -f 
/opt/load_data/load-dataset-tpch-tiny.sql`
+- For loading TPC-DS tiny dataset to `spark_catalog.tpcds_tiny`, run
+
+```
+docker exec -it kyuubi /opt/kyuubi/bin/kyuubi-beeline -u 
'jdbc:kyuubi://0.0.0.0:10009/' -f /opt/load_data/load-dataset-tpcds-tiny.sql
+```
+
+- For loading TPC-H tiny dataset to `spark_catalog.tpch_tiny`, run
+
+```
+docker exec -it kyuubi /opt/kyuubi/bin/kyuubi-beeline -u 
'jdbc:kyuubi://0.0.0.0:10009/' -f /opt/load_data/load-dataset-tpch-tiny.sql
+```
 
 ### Access Service
 
diff --git a/docker/playground/build-image.sh b/docker/playground/build-image.sh
index 98b16fd039..befa743f78 100755
--- a/docker/playground/build-image.sh
+++ b/docker/playground/build-image.sh
@@ -19,7 +19,7 @@
 
 set -e
 
-APACHE_MIRROR=${APACHE_MIRROR:-https://dlcdn.apache.org}
+APACHE_MIRROR=${APACHE_MIRROR:-https://archive.apache.org/dist}
 
MAVEN_MIRROR=${MAVEN_MIRROR:-https://maven-central-asia.storage-download.googleapis.com/maven2}
 BUILD_CMD="docker build"
 
@@ -44,7 +44,6 @@ ${BUILD_CMD} \
   --build-arg APACHE_MIRROR=${APACHE_MIRROR} \
   --build-arg MAVEN_MIRROR=${MAVEN_MIRROR} \
   --build-arg KYUUBI_VERSION=${KYUUBI_VERSION} \
-  --build-arg AWS_JAVA_SDK_VERSION=${AWS_JAVA_SDK_VERSION} \
   --build-arg HADOOP_VERSION=${HADOOP_VERSION} \
   --file "${SELF_DIR}/image/kyuubi-playground-hadoop.Dockerfile" \
   --tag nekyuubi/kyuubi-playground-hadoop:${KYUUBI_VERSION} \
diff --git a/docker/playground/compose.yml b/docker/playground/compose.yml
index f188b52904..3c60056ba3 100644
--- a/docker/playground/compose.yml
+++ b/docker/playground/compose.yml
@@ -75,6 +75,8 @@ services:
       - 9083
     volumes:
       - ./conf/core-site.xml:/etc/hadoop/conf/core-site.xml
+      - ./conf/hadoop-env.sh:/etc/hadoop/conf/hadoop-env.sh
+      - ./conf/hive-env.sh:/etc/hive/conf/hive-env.sh
       - ./conf/hive-site.xml:/etc/hive/conf/hive-site.xml
     depends_on:
       - postgres
@@ -89,9 +91,13 @@ services:
       - 10099:10099
     volumes:
       - ./conf/core-site.xml:/etc/hadoop/conf/core-site.xml
+      - ./conf/hadoop-env.sh:/etc/hadoop/conf/hadoop-env.sh
+      - ./conf/hive-env.sh:/etc/hive/conf/hive-env.sh
       - ./conf/hive-site.xml:/etc/hive/conf/hive-site.xml
       - ./conf/spark-defaults.conf:/etc/spark/conf/spark-defaults.conf
+      - ./conf/spark-env.sh:/etc/spark/conf/spark-env.sh
       - ./conf/kyuubi-defaults.conf:/etc/kyuubi/conf/kyuubi-defaults.conf
+      - ./conf/kyuubi-env.sh:/etc/kyuubi/conf/kyuubi-env.sh
       - ./conf/kyuubi-log4j2.xml:/etc/kyuubi/conf/log4j2.xml
       - 
./script/load-dataset-tpcds-tiny.sql:/opt/load_data/load-dataset-tpcds-tiny.sql
       - 
./script/load-dataset-tpch-tiny.sql:/opt/load_data/load-dataset-tpch-tiny.sql
diff --git a/docker/playground/.env b/docker/playground/conf/hadoop-env.sh
old mode 100644
new mode 100755
similarity index 68%
copy from docker/playground/.env
copy to docker/playground/conf/hadoop-env.sh
index 28a97a0d24..9469140937
--- a/docker/playground/.env
+++ b/docker/playground/conf/hadoop-env.sh
@@ -15,18 +15,4 @@
 # limitations under the License.
 #
 
-AWS_JAVA_SDK_VERSION=1.12.367
-HADOOP_VERSION=3.3.6
-HIVE_VERSION=2.3.9
-ICEBERG_VERSION=1.6.1
-KYUUBI_VERSION=1.9.0
-KYUUBI_HADOOP_VERSION=3.3.6
-POSTGRES_VERSION=12
-POSTGRES_JDBC_VERSION=42.3.4
-SCALA_BINARY_VERSION=2.12
-SPARK_VERSION=3.4.4
-SPARK_BINARY_VERSION=3.4
-SPARK_HADOOP_VERSION=3.3.4
-ZOOKEEPER_VERSION=3.6.3
-PROMETHEUS_VERSION=2.53.3
-GRAFANA_VERSION=11.4.0
+export JAVA_HOME=$(update-java-alternatives --list | grep java-1.8.0-openjdk | 
awk '{print $NF}')
diff --git a/docker/playground/.env b/docker/playground/conf/hive-env.sh
old mode 100644
new mode 100755
similarity index 68%
copy from docker/playground/.env
copy to docker/playground/conf/hive-env.sh
index 28a97a0d24..9469140937
--- a/docker/playground/.env
+++ b/docker/playground/conf/hive-env.sh
@@ -15,18 +15,4 @@
 # limitations under the License.
 #
 
-AWS_JAVA_SDK_VERSION=1.12.367
-HADOOP_VERSION=3.3.6
-HIVE_VERSION=2.3.9
-ICEBERG_VERSION=1.6.1
-KYUUBI_VERSION=1.9.0
-KYUUBI_HADOOP_VERSION=3.3.6
-POSTGRES_VERSION=12
-POSTGRES_JDBC_VERSION=42.3.4
-SCALA_BINARY_VERSION=2.12
-SPARK_VERSION=3.4.4
-SPARK_BINARY_VERSION=3.4
-SPARK_HADOOP_VERSION=3.3.4
-ZOOKEEPER_VERSION=3.6.3
-PROMETHEUS_VERSION=2.53.3
-GRAFANA_VERSION=11.4.0
+export JAVA_HOME=$(update-java-alternatives --list | grep java-1.8.0-openjdk | 
awk '{print $NF}')
diff --git a/docker/playground/.env b/docker/playground/conf/kyuubi-env.sh
old mode 100644
new mode 100755
similarity index 68%
copy from docker/playground/.env
copy to docker/playground/conf/kyuubi-env.sh
index 28a97a0d24..3bb68142a7
--- a/docker/playground/.env
+++ b/docker/playground/conf/kyuubi-env.sh
@@ -15,18 +15,4 @@
 # limitations under the License.
 #
 
-AWS_JAVA_SDK_VERSION=1.12.367
-HADOOP_VERSION=3.3.6
-HIVE_VERSION=2.3.9
-ICEBERG_VERSION=1.6.1
-KYUUBI_VERSION=1.9.0
-KYUUBI_HADOOP_VERSION=3.3.6
-POSTGRES_VERSION=12
-POSTGRES_JDBC_VERSION=42.3.4
-SCALA_BINARY_VERSION=2.12
-SPARK_VERSION=3.4.4
-SPARK_BINARY_VERSION=3.4
-SPARK_HADOOP_VERSION=3.3.4
-ZOOKEEPER_VERSION=3.6.3
-PROMETHEUS_VERSION=2.53.3
-GRAFANA_VERSION=11.4.0
+export JAVA_HOME=$(update-java-alternatives --list | grep java-1.17.0-openjdk 
| awk '{print $NF}')
diff --git a/docker/playground/.env b/docker/playground/conf/spark-env.sh
old mode 100644
new mode 100755
similarity index 68%
copy from docker/playground/.env
copy to docker/playground/conf/spark-env.sh
index 28a97a0d24..3bb68142a7
--- a/docker/playground/.env
+++ b/docker/playground/conf/spark-env.sh
@@ -15,18 +15,4 @@
 # limitations under the License.
 #
 
-AWS_JAVA_SDK_VERSION=1.12.367
-HADOOP_VERSION=3.3.6
-HIVE_VERSION=2.3.9
-ICEBERG_VERSION=1.6.1
-KYUUBI_VERSION=1.9.0
-KYUUBI_HADOOP_VERSION=3.3.6
-POSTGRES_VERSION=12
-POSTGRES_JDBC_VERSION=42.3.4
-SCALA_BINARY_VERSION=2.12
-SPARK_VERSION=3.4.4
-SPARK_BINARY_VERSION=3.4
-SPARK_HADOOP_VERSION=3.3.4
-ZOOKEEPER_VERSION=3.6.3
-PROMETHEUS_VERSION=2.53.3
-GRAFANA_VERSION=11.4.0
+export JAVA_HOME=$(update-java-alternatives --list | grep java-1.17.0-openjdk 
| awk '{print $NF}')
diff --git a/docker/playground/image/kyuubi-playground-base.Dockerfile 
b/docker/playground/image/kyuubi-playground-base.Dockerfile
index e8375eb68b..1099eadf07 100644
--- a/docker/playground/image/kyuubi-playground-base.Dockerfile
+++ b/docker/playground/image/kyuubi-playground-base.Dockerfile
@@ -10,13 +10,25 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-FROM eclipse-temurin:8-focal
+FROM ubuntu:focal
+
+ENV DEBIAN_FRONTEND=noninteractive
+ENV DEBCONF_TERSE=true
 
 RUN set -x && \
+    echo 'APT::Install-Recommends "0";' > /etc/apt/apt.conf.d/10disableextras 
&& \
+    echo 'APT::Install-Suggests "0";' >>  /etc/apt/apt.conf.d/10disableextras 
&& \
     ln -snf /usr/bin/bash /usr/bin/sh && \
     apt-get update -q && \
-    apt-get install -yq retry busybox && \
+    apt-get install -yq \
+      retry \
+      busybox \
+      ca-certificates-java \
+      openjdk-8-jdk-headless \
+      openjdk-17-jdk-headless && \
     rm -rf /var/lib/apt/lists/* && \
+    update-ca-certificates -f && \
+    update-java-alternatives --set $(update-java-alternatives --list | grep 
java-1.8.0-openjdk | awk '{print $NF}') || \
     mkdir /opt/busybox && \
     busybox --install /opt/busybox
 
diff --git a/docker/playground/image/kyuubi-playground-hadoop.Dockerfile 
b/docker/playground/image/kyuubi-playground-hadoop.Dockerfile
index 588ff8d80a..7d05120b1c 100644
--- a/docker/playground/image/kyuubi-playground-hadoop.Dockerfile
+++ b/docker/playground/image/kyuubi-playground-hadoop.Dockerfile
@@ -14,7 +14,6 @@ ARG KYUUBI_VERSION
 
 FROM nekyuubi/kyuubi-playground-base:${KYUUBI_VERSION}
 
-ARG AWS_JAVA_SDK_VERSION
 ARG HADOOP_VERSION
 
 ARG APACHE_MIRROR
@@ -29,9 +28,7 @@ RUN set -x && \
     tar -xzf ${HADOOP_TAR_NAME}.tar.gz -C /opt && \
     ln -s /opt/hadoop-${HADOOP_VERSION} ${HADOOP_HOME} && \
     rm ${HADOOP_TAR_NAME}.tar.gz && \
-    HADOOP_CLOUD_STORAGE_JAR_NAME=hadoop-cloud-storage && \
-    wget -q 
${MAVEN_MIRROR}/org/apache/hadoop/${HADOOP_CLOUD_STORAGE_JAR_NAME}/${HADOOP_VERSION}/${HADOOP_CLOUD_STORAGE_JAR_NAME}-${HADOOP_VERSION}.jar
 -P ${HADOOP_HOME}/share/hadoop/hdfs/lib && \
     HADOOP_AWS_JAR_NAME=hadoop-aws && \
-    wget -q 
${MAVEN_MIRROR}/org/apache/hadoop/${HADOOP_AWS_JAR_NAME}/${HADOOP_VERSION}/${HADOOP_AWS_JAR_NAME}-${HADOOP_VERSION}.jar
 -P ${HADOOP_HOME}/share/hadoop/hdfs/lib && \
+    ln -s 
${HADOOP_HOME}/share/hadoop/tools/lib/${HADOOP_AWS_JAR_NAME}-${HADOOP_VERSION}.jar
 ${HADOOP_HOME}/share/hadoop/hdfs/lib/ && \
     AWS_JAVA_SDK_BUNDLE_JAR_NAME=aws-java-sdk-bundle && \
-    wget -q 
${MAVEN_MIRROR}/com/amazonaws/${AWS_JAVA_SDK_BUNDLE_JAR_NAME}/${AWS_JAVA_SDK_VERSION}/${AWS_JAVA_SDK_BUNDLE_JAR_NAME}-${AWS_JAVA_SDK_VERSION}.jar
 -P ${HADOOP_HOME}/share/hadoop/hdfs/lib
+    ln -s $(find ${HADOOP_HOME}/share/hadoop/tools/lib/ -name 
"${AWS_JAVA_SDK_BUNDLE_JAR_NAME}-*.jar") ${HADOOP_HOME}/share/hadoop/hdfs/lib/ \
diff --git a/docker/playground/image/kyuubi-playground-kyuubi.Dockerfile 
b/docker/playground/image/kyuubi-playground-kyuubi.Dockerfile
index 7450c2f63c..9b41abf916 100644
--- a/docker/playground/image/kyuubi-playground-kyuubi.Dockerfile
+++ b/docker/playground/image/kyuubi-playground-kyuubi.Dockerfile
@@ -29,8 +29,6 @@ RUN set -x && \
     tar -xzf apache-kyuubi-${KYUUBI_VERSION}-bin.tgz -C /opt && \
     ln -s /opt/apache-kyuubi-${KYUUBI_VERSION}-bin ${KYUUBI_HOME} && \
     rm apache-kyuubi-${KYUUBI_VERSION}-bin.tgz && \
-    HADOOP_CLOUD_STORAGE_JAR_NAME=hadoop-cloud-storage && \
-    wget -q 
${MAVEN_MIRROR}/org/apache/hadoop/${HADOOP_CLOUD_STORAGE_JAR_NAME}/${KYUUBI_HADOOP_VERSION}/${HADOOP_CLOUD_STORAGE_JAR_NAME}-${KYUUBI_HADOOP_VERSION}.jar
 -P ${KYUUBI_HOME}/jars && \
     HADOOP_AWS_JAR_NAME=hadoop-aws && \
     wget -q 
${MAVEN_MIRROR}/org/apache/hadoop/${HADOOP_AWS_JAR_NAME}/${KYUUBI_HADOOP_VERSION}/${HADOOP_AWS_JAR_NAME}-${KYUUBI_HADOOP_VERSION}.jar
 -P ${KYUUBI_HOME}/jars && \
     AWS_JAVA_SDK_BUNDLE_JAR_NAME=aws-java-sdk-bundle && \
diff --git a/docker/playground/image/kyuubi-playground-spark.Dockerfile 
b/docker/playground/image/kyuubi-playground-spark.Dockerfile
index 4dd9df66c6..2e7ce22a1d 100644
--- a/docker/playground/image/kyuubi-playground-spark.Dockerfile
+++ b/docker/playground/image/kyuubi-playground-spark.Dockerfile
@@ -40,8 +40,6 @@ RUN set -x && \
     wget -q 
${MAVEN_MIRROR}/org/apache/iceberg/${ICEBERG_SPARK_JAR_NAME}/${ICEBERG_VERSION}/${ICEBERG_SPARK_JAR_NAME}-${ICEBERG_VERSION}.jar
 -P ${SPARK_HOME}/jars && \
     SPARK_HADOOP_CLOUD_JAR_NAME=spark-hadoop-cloud_${SCALA_BINARY_VERSION} && \
     wget -q 
${MAVEN_MIRROR}/org/apache/spark/${SPARK_HADOOP_CLOUD_JAR_NAME}/${SPARK_VERSION}/${SPARK_HADOOP_CLOUD_JAR_NAME}-${SPARK_VERSION}.jar
 -P ${SPARK_HOME}/jars && \
-    HADOOP_CLOUD_STORAGE_JAR_NAME=hadoop-cloud-storage && \
-    wget -q 
${MAVEN_MIRROR}/org/apache/hadoop/${HADOOP_CLOUD_STORAGE_JAR_NAME}/${SPARK_HADOOP_VERSION}/${HADOOP_CLOUD_STORAGE_JAR_NAME}-${SPARK_HADOOP_VERSION}.jar
 -P ${SPARK_HOME}/jars && \
     HADOOP_AWS_JAR_NAME=hadoop-aws && \
     wget -q 
${MAVEN_MIRROR}/org/apache/hadoop/${HADOOP_AWS_JAR_NAME}/${SPARK_HADOOP_VERSION}/${HADOOP_AWS_JAR_NAME}-${SPARK_HADOOP_VERSION}.jar
 -P ${SPARK_HOME}/jars && \
     AWS_JAVA_SDK_BUNDLE_JAR_NAME=aws-java-sdk-bundle && \

Reply via email to