From 63e24da29c5b64a29368aa8cd7c464dad3f05a2b Mon Sep 17 00:00:00 2001 From: Yuan Zhou Date: Wed, 15 Jan 2025 09:32:03 +0800 Subject: [PATCH 1/3] [VL] adding JDK17 based docker image Signed-off-by: Yuan Zhou --- .github/workflows/docker_image.yml | 8 ++++++++ dev/docker/Dockerfile.centos8-dynamic-build-jdk17 | 12 ++++++++++++ 2 files changed, 20 insertions(+) create mode 100644 dev/docker/Dockerfile.centos8-dynamic-build-jdk17 diff --git a/.github/workflows/docker_image.yml b/.github/workflows/docker_image.yml index 58b7549adb70..aed8d3ee7430 100644 --- a/.github/workflows/docker_image.yml +++ b/.github/workflows/docker_image.yml @@ -84,3 +84,11 @@ jobs: file: dev/docker/Dockerfile.centos8-dynamic-build-jdk11 push: true tags: apache/gluten:centos-8-jdk11 + + - name: Build and push Docker image Centos8 + JDK17 + uses: docker/build-push-action@v2 + with: + context: . + file: dev/docker/Dockerfile.centos8-dynamic-build-jdk17 + push: true + tags: apache/gluten:centos-8-jdk17 \ No newline at end of file diff --git a/dev/docker/Dockerfile.centos8-dynamic-build-jdk17 b/dev/docker/Dockerfile.centos8-dynamic-build-jdk17 new file mode 100644 index 000000000000..058556ad5f42 --- /dev/null +++ b/dev/docker/Dockerfile.centos8-dynamic-build-jdk17 @@ -0,0 +1,12 @@ +FROM apache/gluten:centos-8 + + +RUN yum install -y java-17-openjdk-devel patch wget git perl +ENV JAVA_HOME=/usr/lib/jvm/java-17-openjdk +ENV PATH=$JAVA_HOME/bin:$PATH + +ENV PATH=${PATH}:/usr/lib/maven/bin + +RUN git clone --depth=1 https://github.com/apache/incubator-gluten /opt/gluten + +RUN cd /opt/gluten && source /opt/rh/gcc-toolset-11/enable && ./dev/builddeps-veloxbe.sh --run_setup_script=ON build_arrow && rm -rf /opt/gluten From 431e9cda6dc8a96109561dbb34345f8bfe132cf1 Mon Sep 17 00:00:00 2001 From: Yuan Zhou Date: Wed, 15 Jan 2025 10:21:16 +0800 Subject: [PATCH 2/3] fix path Signed-off-by: Yuan Zhou --- .github/workflows/docker_image.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/docker_image.yml b/.github/workflows/docker_image.yml index aed8d3ee7430..43c43e5fc5f7 100644 --- a/.github/workflows/docker_image.yml +++ b/.github/workflows/docker_image.yml @@ -23,6 +23,8 @@ on: - '.github/workflows/docker_image.yml' - 'dev/docker/Dockerfile.centos7-static-build' - 'dev/docker/Dockerfile.centos8-dynamic-build' + - 'dev/docker/Dockerfile.centos8-dynamic-build-jdk11' + - 'dev/docker/Dockerfile.centos8-dynamic-build-jdk17' schedule: - cron: '0 20 * * 0' From b66304e11b81562842f35b97e35846837b0fdcc1 Mon Sep 17 00:00:00 2001 From: Yuan Zhou Date: Wed, 15 Jan 2025 11:00:29 +0800 Subject: [PATCH 3/3] adding blank line Signed-off-by: Yuan Zhou --- .github/workflows/docker_image.yml | 3 ++- dev/docker/Dockerfile.centos8-dynamic-build-jdk17 | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/docker_image.yml b/.github/workflows/docker_image.yml index 43c43e5fc5f7..727dc3cd057b 100644 --- a/.github/workflows/docker_image.yml +++ b/.github/workflows/docker_image.yml @@ -93,4 +93,5 @@ jobs: context: . file: dev/docker/Dockerfile.centos8-dynamic-build-jdk17 push: true - tags: apache/gluten:centos-8-jdk17 \ No newline at end of file + tags: apache/gluten:centos-8-jdk17 + diff --git a/dev/docker/Dockerfile.centos8-dynamic-build-jdk17 b/dev/docker/Dockerfile.centos8-dynamic-build-jdk17 index 058556ad5f42..e6817a8d605c 100644 --- a/dev/docker/Dockerfile.centos8-dynamic-build-jdk17 +++ b/dev/docker/Dockerfile.centos8-dynamic-build-jdk17 @@ -10,3 +10,4 @@ ENV PATH=${PATH}:/usr/lib/maven/bin RUN git clone --depth=1 https://github.com/apache/incubator-gluten /opt/gluten RUN cd /opt/gluten && source /opt/rh/gcc-toolset-11/enable && ./dev/builddeps-veloxbe.sh --run_setup_script=ON build_arrow && rm -rf /opt/gluten +