From 3a79ad4ab6c52e58b59b05b798003efb536dcee4 Mon Sep 17 00:00:00 2001 From: PHILO-HE Date: Thu, 6 Nov 2025 15:37:58 +0800 Subject: [PATCH 1/3] Pick a fix --- .github/workflows/docker_image.yml | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/.github/workflows/docker_image.yml b/.github/workflows/docker_image.yml index 40aefa6c18b6..02b05e8d298f 100644 --- a/.github/workflows/docker_image.yml +++ b/.github/workflows/docker_image.yml @@ -18,7 +18,7 @@ name: Build and Push Docker Image on: push: branches: - - main + - branch-1.5 paths: - '.github/workflows/docker_image.yml' - '.github/workflows/util/install_spark_resources.sh' @@ -28,8 +28,6 @@ on: - 'dev/docker/Dockerfile.centos8-dynamic-build' - 'dev/docker/Dockerfile.centos9-dynamic-build' - 'dev/docker/cudf/Dockerfile' - schedule: - - cron: '0 20 * * 0' env: DOCKERHUB_REPO: apache/gluten @@ -58,7 +56,7 @@ jobs: context: . file: dev/docker/Dockerfile.centos7-static-build push: true - tags: ${{ env.DOCKERHUB_REPO }}:vcpkg-centos-7 + tags: ${{ env.DOCKERHUB_REPO }}:1.5-vcpkg-centos-7 build-centos-9-jdk8-cudf: if: ${{ startsWith(github.repository, 'apache/') }} @@ -89,7 +87,7 @@ jobs: context: . file: dev/docker/cudf/Dockerfile push: true - tags: ${{ env.DOCKERHUB_REPO }}:centos-9-jdk8-cudf + tags: ${{ env.DOCKERHUB_REPO }}:1.5-centos-9-jdk8-cudf build-vcpkg-centos-8: if: ${{ startsWith(github.repository, 'apache/') }} @@ -350,7 +348,7 @@ jobs: uses: docker/metadata-action@v5 with: images: ${{ env.DOCKERHUB_REPO }} - tags: ${{ matrix.digests }} + tags: 1.5-${{ matrix.digests }} - name: Create manifest list and push working-directory: ${{ runner.temp }}/digests @@ -360,5 +358,5 @@ jobs: - name: Inspect image run: | - docker buildx imagetools inspect ${{ env.DOCKERHUB_REPO }}:${{ steps.meta.outputs.version }} + docker buildx imagetools inspect ${{ env.DOCKERHUB_REPO }}:1.5-${{ steps.meta.outputs.version }} From 16f4170d4e25e6031afba01ac2b33e7444efc105 Mon Sep 17 00:00:00 2001 From: PHILO-HE Date: Thu, 6 Nov 2025 15:39:22 +0800 Subject: [PATCH 2/3] Selective push --- .github/workflows/docker_image.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/docker_image.yml b/.github/workflows/docker_image.yml index 02b05e8d298f..1e5821cbfb55 100644 --- a/.github/workflows/docker_image.yml +++ b/.github/workflows/docker_image.yml @@ -320,7 +320,7 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - digests: [ vcpkg-centos-8, vcpkg-centos-9, centos-8-jdk8, centos-8-jdk11, centos-8-jdk17, centos-9-jdk8, centos-9-jdk11, centos-9-jdk17 ] + digests: [ vcpkg-centos-8, centos-8-jdk8, centos-8-jdk17 ] needs: - build-vcpkg-centos-8 - build-vcpkg-centos-9 From 5ec76f4fcc0e23150bbc085f9bf285f83c138c43 Mon Sep 17 00:00:00 2001 From: PHILO-HE Date: Thu, 6 Nov 2025 15:44:29 +0800 Subject: [PATCH 3/3] Fix --- .github/workflows/docker_image.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/docker_image.yml b/.github/workflows/docker_image.yml index 1e5821cbfb55..e971b2bf1578 100644 --- a/.github/workflows/docker_image.yml +++ b/.github/workflows/docker_image.yml @@ -358,5 +358,5 @@ jobs: - name: Inspect image run: | - docker buildx imagetools inspect ${{ env.DOCKERHUB_REPO }}:1.5-${{ steps.meta.outputs.version }} + docker buildx imagetools inspect ${{ env.DOCKERHUB_REPO }}:${{ steps.meta.outputs.version }}