This is an automated email from the ASF dual-hosted git repository.
zhouyuan pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/gluten.git
The following commit(s) were added to refs/heads/main by this push:
new c0fe36dc82 [GLUTEN-12313][VL] followup to cleanup CI image (#12384)
c0fe36dc82 is described below
commit c0fe36dc8272dcbc71ac73c622af8ff5815a6585
Author: Yuan <[email protected]>
AuthorDate: Mon Jun 29 20:21:35 2026 +0100
[GLUTEN-12313][VL] followup to cleanup CI image (#12384)
This patch removed the unused docker images. Also fixed the cmake issue in
vcpkg-centos-8/9 image
---------
Signed-off-by: Yuan <[email protected]>
---
.github/workflows/docker_image.yml | 78 +-----------------------
dev/docker/Dockerfile.centos8-gcc13-static-build | 6 +-
dev/docker/Dockerfile.centos9-static-build | 3 +-
dev/vcpkg/setup-build-depends.sh | 5 --
4 files changed, 6 insertions(+), 86 deletions(-)
diff --git a/.github/workflows/docker_image.yml
b/.github/workflows/docker_image.yml
index df3e00e1b7..4b8adfc8a2 100644
--- a/.github/workflows/docker_image.yml
+++ b/.github/workflows/docker_image.yml
@@ -33,31 +33,6 @@ env:
DOCKERHUB_REPO: apache/gluten
jobs:
- build-vcpkg-centos-7:
- if: ${{ startsWith(github.repository, 'apache/') }}
- runs-on: ubuntu-latest
-
- steps:
- - name: Checkout repository
- uses: actions/checkout@v6
-
- - name: Set up Docker Buildx
- uses:
docker/setup-buildx-action@4d04d5d9486b7bd6fa91e7baf45bbb4f8b9deedd
-
- - name: Login to Docker Hub
- uses: docker/login-action@650006c6eb7dba73a995cc03b0b2d7f5ca915bee
- with:
- username: ${{ secrets.DOCKERHUB_USER }}
- password: ${{ secrets.DOCKERHUB_TOKEN }}
-
- - name: Build and push Docker image
- uses: docker/build-push-action@f9f3042f7e2789586610d6e8b85c8f03e5195baf
- with:
- context: .
- file: dev/docker/Dockerfile.centos7-static-build
- push: true
- tags: ${{ env.DOCKERHUB_REPO }}:vcpkg-centos-7
-
build-vcpkg-centos-7-gcc13:
if: ${{ startsWith(github.repository, 'apache/') }}
runs-on: ubuntu-latest
@@ -170,56 +145,6 @@ jobs:
push: true
tags: ${{ env.DOCKERHUB_REPO }}:centos-9-jdk17-cuda12.9-cudf
- build-vcpkg-centos-8:
- if: ${{ startsWith(github.repository, 'apache/') }}
- runs-on: ${{ matrix.os }}
- strategy:
- matrix:
- os: [ ubuntu-latest, ubuntu-24.04-arm ]
-
- steps:
- - name: Checkout repository
- uses: actions/checkout@v6
-
- - name: Docker meta
- id: meta
- uses: docker/metadata-action@030e881283bb7a6894de51c315a6bfe6a94e05cf
- with:
- images: ${{ env.DOCKERHUB_REPO }}
- tags: vcpkg-centos-8
-
- - name: Set up Docker Buildx
- uses:
docker/setup-buildx-action@4d04d5d9486b7bd6fa91e7baf45bbb4f8b9deedd
-
- - name: Login to Docker Hub
- uses: docker/login-action@650006c6eb7dba73a995cc03b0b2d7f5ca915bee
- with:
- username: ${{ secrets.DOCKERHUB_USER }}
- password: ${{ secrets.DOCKERHUB_TOKEN }}
-
- - name: Build and push by digest
- id: build
- uses: docker/build-push-action@f9f3042f7e2789586610d6e8b85c8f03e5195baf
- with:
- context: .
- file: dev/docker/Dockerfile.centos8-static-build
- labels: ${{ steps.meta.outputs.labels }}
- outputs: type=image,"name=${{ env.DOCKERHUB_REPO
}}",push-by-digest=true,push=true
-
- - name: Export digest
- run: |
- mkdir -p ${{ runner.temp }}/digests
- digest="${{ steps.build.outputs.digest }}"
- touch "${{ runner.temp }}/digests/${digest#sha256:}"
-
- - name: Upload digest
- uses: actions/upload-artifact@v4
- with:
- name: digests-vcpkg-centos-8-${{ matrix.os }}
- path: ${{ runner.temp }}/digests/*
- if-no-files-found: error
- retention-days: 1
-
build-vcpkg-centos-8-gcc13:
if: ${{ startsWith(github.repository, 'apache/') }}
runs-on: ${{ matrix.os }}
@@ -451,9 +376,8 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
- digests: [ vcpkg-centos-8, vcpkg-centos-9 ]
+ digests: [ vcpkg-centos-9 ]
needs:
- - build-vcpkg-centos-8
- build-vcpkg-centos-9
steps:
diff --git a/dev/docker/Dockerfile.centos8-gcc13-static-build
b/dev/docker/Dockerfile.centos8-gcc13-static-build
index a2e5bdf040..37e609f64a 100644
--- a/dev/docker/Dockerfile.centos8-gcc13-static-build
+++ b/dev/docker/Dockerfile.centos8-gcc13-static-build
@@ -29,8 +29,10 @@ RUN set -ex; \
echo "check_certificate = off" >> ~/.wgetrc; \
yum install -y java-1.8.0-openjdk-devel patch git perl python3 automake
libtool flex; \
dnf -y --enablerepo=powertools install autoconf-archive ninja-build; \
- pip3 install --upgrade pip; \
- pip3 install cmake==3.31.4; \
+ wget
https://github.com/Kitware/CMake/releases/download/v3.31.12/cmake-3.31.12-linux-$(uname
-m).sh; \
+ chmod +x cmake-3.31.12-linux-$(uname -m).sh; \
+ ./cmake-3.31.12-linux-$(uname -m).sh --skip-license --prefix=/usr/local; \
+ rm -f cmake-3.31.12-linux-$(uname -m).sh; \
rpm -qa | grep tzdata; \
dnf clean all; \
git clone --depth=1 https://github.com/apache/gluten /opt/gluten; \
diff --git a/dev/docker/Dockerfile.centos9-static-build
b/dev/docker/Dockerfile.centos9-static-build
index 1fbda664f2..c83c99a465 100644
--- a/dev/docker/Dockerfile.centos9-static-build
+++ b/dev/docker/Dockerfile.centos9-static-build
@@ -26,8 +26,7 @@ ENV VCPKG_BINARY_SOURCES=clear;files,${VCPKG_PATH},readwrite
RUN set -ex; \
yum update -y && yum install -y epel-release sudo dnf && yum install -y
ccache; \
- dnf install -y --setopt=install_weak_deps=False gcc-toolset-12
gcc-toolset-13 perl-FindBin; \
- pip install cmake==3.31.4; \
+ dnf install -y --setopt=install_weak_deps=False gcc-toolset-12
gcc-toolset-13 perl-FindBin cmake; \
echo "check_certificate = off" >> ~/.wgetrc; \
yum install -y java-17-openjdk-devel patch git perl; \
dnf clean all; \
diff --git a/dev/vcpkg/setup-build-depends.sh b/dev/vcpkg/setup-build-depends.sh
index 1a5ed49013..473f8260aa 100755
--- a/dev/vcpkg/setup-build-depends.sh
+++ b/dev/vcpkg/setup-build-depends.sh
@@ -157,9 +157,6 @@ install_centos_8() {
pip3 install --upgrade pip
- # Requires cmake >= 3.28.3
- pip3 install cmake==3.28.3
-
dnf -y --enablerepo=powertools install autoconf-archive ninja-build
install_maven_from_source
@@ -175,8 +172,6 @@ install_centos_9() {
pip3 install --upgrade pip
- # Requires cmake >= 3.28.3
- pip3 install cmake==3.28.3
dnf -y --enablerepo=crb install autoconf-archive ninja-build
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
