This is an automated email from the ASF dual-hosted git repository.
yuanzhou pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/incubator-gluten.git
The following commit(s) were added to refs/heads/main by this push:
new 481a077cc3 [GLUTEN-10926][VL] followup to fix docker image conflict
(#11064)
481a077cc3 is described below
commit 481a077cc3c9c6318cde3281dfa87869f07a0c37
Author: Yuan <[email protected]>
AuthorDate: Tue Nov 18 23:59:50 2025 +0000
[GLUTEN-10926][VL] followup to fix docker image conflict (#11064)
after #10926 the docker image for vcpkg-centos-8 has a conlict with
vcpkg-centos-8-gcc13 when merging digests.
this patch renames the merge pattern so there is not conflict.
Signed-off-by: Yuan <[email protected]>
---------
Signed-off-by: Yuan <[email protected]>
Co-authored-by: PHILO-HE <[email protected]>
---
.github/workflows/docker_image.yml | 48 ++++++++++++++++++++++--
dev/docker/Dockerfile.centos8-gcc13 | 12 +++++-
dev/docker/Dockerfile.centos8-gcc13-static-build | 13 ++++---
3 files changed, 61 insertions(+), 12 deletions(-)
diff --git a/.github/workflows/docker_image.yml
b/.github/workflows/docker_image.yml
index ad72a9cf25..b39035b867 100644
--- a/.github/workflows/docker_image.yml
+++ b/.github/workflows/docker_image.yml
@@ -159,7 +159,7 @@ jobs:
runs-on: ${{ matrix.os }}
strategy:
matrix:
- os: [ ubuntu-latest ] #TODO: adding arm back
+ os: [ ubuntu-latest, ubuntu-24.04-arm ]
steps:
- name: Checkout repository
@@ -385,10 +385,9 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
- digests: [ vcpkg-centos-8, vcpkg-centos-8-gcc13, 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, vcpkg-centos-9, centos-8-jdk8,
centos-8-jdk11, centos-8-jdk17, centos-9-jdk8, centos-9-jdk11, centos-9-jdk17 ]
needs:
- build-vcpkg-centos-8
- - build-vcpkg-centos-8-gcc13
- build-vcpkg-centos-9
- build-centos-8
- build-centos-9
@@ -397,7 +396,7 @@ jobs:
uses: actions/download-artifact@v4
with:
path: ${{ runner.temp }}/digests
- pattern: digests-${{ matrix.digests }}-*
+ pattern: digests-${{ matrix.digests }}-ubuntu*
merge-multiple: true
- name: Login to Docker Hub
@@ -425,4 +424,45 @@ jobs:
- name: Inspect image
run: |
docker buildx imagetools inspect ${{ env.DOCKERHUB_REPO }}:${{
steps.meta.outputs.version }}
+
+ merge-gcc13:
+ if: ${{ startsWith(github.repository, 'apache/') }}
+ runs-on: ubuntu-latest
+ strategy:
+ matrix:
+ digests: [ vcpkg-centos-8-gcc13 ]
+ needs:
+ - build-vcpkg-centos-8-gcc13
+ steps:
+ - name: Download digests
+ uses: actions/download-artifact@v4
+ with:
+ path: ${{ runner.temp }}/digests
+ pattern: digests-${{ matrix.digests }}-*
+ merge-multiple: true
+ - name: Login to Docker Hub
+ uses: docker/login-action@v2
+ with:
+ username: ${{ secrets.DOCKERHUB_USER }}
+ password: ${{ secrets.DOCKERHUB_TOKEN }}
+
+ - name: Set up Docker Buildx
+ uses: docker/setup-buildx-action@v3
+
+ - name: Docker meta
+ id: meta
+ uses: docker/metadata-action@v5
+ with:
+ images: ${{ env.DOCKERHUB_REPO }}
+ tags: ${{ matrix.digests }}
+
+ - name: Create manifest list and push
+ working-directory: ${{ runner.temp }}/digests
+ run: |
+ docker buildx imagetools create $(jq -cr '.tags | map("-t " + .) |
join(" ")' <<< "$DOCKER_METADATA_OUTPUT_JSON") \
+ $(printf '${{ env.DOCKERHUB_REPO }}@sha256:%s ' *)
+
+ - name: Inspect image
+ run: |
+ docker buildx imagetools inspect ${{ env.DOCKERHUB_REPO }}:${{
steps.meta.outputs.version }}
diff --git a/dev/docker/Dockerfile.centos8-gcc13
b/dev/docker/Dockerfile.centos8-gcc13
index e37a35dc67..ea430e76a3 100644
--- a/dev/docker/Dockerfile.centos8-gcc13
+++ b/dev/docker/Dockerfile.centos8-gcc13
@@ -16,11 +16,19 @@
# copied from https://github.com/jeromerobert/centos7-gcc13
FROM centos:8 as base0
-FROM base0 as base
+FROM base0 as base1
RUN /usr/bin/sed -i -e "s|mirrorlist=|#mirrorlist=|g"
/etc/yum.repos.d/CentOS-*; sed -i -e
"s|#baseurl=http://mirror.centos.org|baseurl=http://vault.centos.org|g"
/etc/yum.repos.d/CentOS-*;
RUN yum update -y && yum install epel-release wget perl -y
-RUN yum -y install
ftp://ftp.icm.edu.pl/vol/rzm5/linux-centos-vault/8.0.1905/PowerTools/aarch64/kickstart/Packages/perl-Unicode-EastAsianWidth-1.33-13.el8.noarch.rpm
ftp://ftp.icm.edu.pl/vol/rzm5/linux-centos-vault/8.2.2004/PowerTools/x86_64/kickstart/Packages/texinfo-6.5-6.el8.x86_64.rpm
+# texinfo
+FROM base1 as base
+RUN curl -kLO https://ftp.gnu.org/gnu/texinfo/texinfo-6.8.tar.xz
+RUN tar xf texinfo*.tar.*
+WORKDIR build-texinfo
+RUN yum -y install gcc make m4
+RUN ../texinfo*/configure
+RUN make -j$(nproc)
+RUN make install
# Git
FROM base as git
diff --git a/dev/docker/Dockerfile.centos8-gcc13-static-build
b/dev/docker/Dockerfile.centos8-gcc13-static-build
index c5ad38e630..2a79f99fb9 100644
--- a/dev/docker/Dockerfile.centos8-gcc13-static-build
+++ b/dev/docker/Dockerfile.centos8-gcc13-static-build
@@ -13,7 +13,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-FROM inteldpo/gluten:centos8_gcc13
+FROM inteldpo/gluten-ci-images:centos-8_gcc13
ENV JAVA_HOME=/usr/lib/jvm/java-1.8.0-openjdk
@@ -27,15 +27,16 @@ 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-11; \
echo "check_certificate = off" >> ~/.wgetrc; \
- yum install -y java-1.8.0-openjdk-devel patch wget git perl; \
+ yum install -y java-1.8.0-openjdk-devel patch wget git perl python3
automake libtool flex; \
+ dnf -y --enablerepo=powertools install autoconf-archive ninja-build; \
+ pip3 install --upgrade pip; \
+ pip3 install cmake; \
rpm -qa | grep tzdata; \
dnf clean all; \
git clone --depth=1 https://github.com/apache/incubator-gluten
/opt/gluten; \
- cd /opt/gluten && bash ./dev/vcpkg/setup-build-depends.sh; \
- yum remove gcc -y && yum clean all; \
- yes | cp -rf /usr/share/aclocal/* /usr/local/share/aclocal/; \
+ cd /opt/gluten; bash .github/workflows/util/setup-helper.sh install_maven;
\
+ export PATH=/usr/lib/maven/bin:$PATH; \
mkdir -p ${VCPKG_PATH}; \
echo "Build arrow, then install the native libs to system paths and jar
package to .m2/ directory."; \
if [ "$(uname -m)" = "aarch64" ]; then \
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
