Skip to content

Commit 481a077

Browse files
zhouyuanPHILO-HE
andauthored
[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]>
1 parent 63f5b7b commit 481a077

File tree

3 files changed

+61
-12
lines changed

3 files changed

+61
-12
lines changed

.github/workflows/docker_image.yml

Lines changed: 44 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -159,7 +159,7 @@ jobs:
159159
runs-on: ${{ matrix.os }}
160160
strategy:
161161
matrix:
162-
os: [ ubuntu-latest ] #TODO: adding arm back
162+
os: [ ubuntu-latest, ubuntu-24.04-arm ]
163163

164164
steps:
165165
- name: Checkout repository
@@ -385,10 +385,9 @@ jobs:
385385
runs-on: ubuntu-latest
386386
strategy:
387387
matrix:
388-
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 ]
388+
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 ]
389389
needs:
390390
- build-vcpkg-centos-8
391-
- build-vcpkg-centos-8-gcc13
392391
- build-vcpkg-centos-9
393392
- build-centos-8
394393
- build-centos-9
@@ -397,7 +396,7 @@ jobs:
397396
uses: actions/download-artifact@v4
398397
with:
399398
path: ${{ runner.temp }}/digests
400-
pattern: digests-${{ matrix.digests }}-*
399+
pattern: digests-${{ matrix.digests }}-ubuntu*
401400
merge-multiple: true
402401

403402
- name: Login to Docker Hub
@@ -425,4 +424,45 @@ jobs:
425424
- name: Inspect image
426425
run: |
427426
docker buildx imagetools inspect ${{ env.DOCKERHUB_REPO }}:${{ steps.meta.outputs.version }}
427+
428+
merge-gcc13:
429+
if: ${{ startsWith(github.repository, 'apache/') }}
430+
runs-on: ubuntu-latest
431+
strategy:
432+
matrix:
433+
digests: [ vcpkg-centos-8-gcc13 ]
434+
needs:
435+
- build-vcpkg-centos-8-gcc13
436+
steps:
437+
- name: Download digests
438+
uses: actions/download-artifact@v4
439+
with:
440+
path: ${{ runner.temp }}/digests
441+
pattern: digests-${{ matrix.digests }}-*
442+
merge-multiple: true
428443

444+
- name: Login to Docker Hub
445+
uses: docker/login-action@v2
446+
with:
447+
username: ${{ secrets.DOCKERHUB_USER }}
448+
password: ${{ secrets.DOCKERHUB_TOKEN }}
449+
450+
- name: Set up Docker Buildx
451+
uses: docker/setup-buildx-action@v3
452+
453+
- name: Docker meta
454+
id: meta
455+
uses: docker/metadata-action@v5
456+
with:
457+
images: ${{ env.DOCKERHUB_REPO }}
458+
tags: ${{ matrix.digests }}
459+
460+
- name: Create manifest list and push
461+
working-directory: ${{ runner.temp }}/digests
462+
run: |
463+
docker buildx imagetools create $(jq -cr '.tags | map("-t " + .) | join(" ")' <<< "$DOCKER_METADATA_OUTPUT_JSON") \
464+
$(printf '${{ env.DOCKERHUB_REPO }}@sha256:%s ' *)
465+
466+
- name: Inspect image
467+
run: |
468+
docker buildx imagetools inspect ${{ env.DOCKERHUB_REPO }}:${{ steps.meta.outputs.version }}

dev/docker/Dockerfile.centos8-gcc13

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,11 +16,19 @@
1616
# copied from https://github.com/jeromerobert/centos7-gcc13
1717
FROM centos:8 as base0
1818

19-
FROM base0 as base
19+
FROM base0 as base1
2020
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-*;
2121
RUN yum update -y && yum install epel-release wget perl -y
22-
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
2322

23+
# texinfo
24+
FROM base1 as base
25+
RUN curl -kLO https://ftp.gnu.org/gnu/texinfo/texinfo-6.8.tar.xz
26+
RUN tar xf texinfo*.tar.*
27+
WORKDIR build-texinfo
28+
RUN yum -y install gcc make m4
29+
RUN ../texinfo*/configure
30+
RUN make -j$(nproc)
31+
RUN make install
2432

2533
# Git
2634
FROM base as git

dev/docker/Dockerfile.centos8-gcc13-static-build

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
# See the License for the specific language governing permissions and
1414
# limitations under the License.
1515

16-
FROM inteldpo/gluten:centos8_gcc13
16+
FROM inteldpo/gluten-ci-images:centos-8_gcc13
1717

1818

1919
ENV JAVA_HOME=/usr/lib/jvm/java-1.8.0-openjdk
@@ -27,15 +27,16 @@ ENV VCPKG_BINARY_SOURCES=clear;files,${VCPKG_PATH},readwrite
2727

2828
RUN set -ex; \
2929
yum update -y && yum install -y epel-release sudo dnf && yum install -y ccache; \
30-
dnf install -y --setopt=install_weak_deps=False gcc-toolset-11; \
3130
echo "check_certificate = off" >> ~/.wgetrc; \
32-
yum install -y java-1.8.0-openjdk-devel patch wget git perl; \
31+
yum install -y java-1.8.0-openjdk-devel patch wget git perl python3 automake libtool flex; \
32+
dnf -y --enablerepo=powertools install autoconf-archive ninja-build; \
33+
pip3 install --upgrade pip; \
34+
pip3 install cmake; \
3335
rpm -qa | grep tzdata; \
3436
dnf clean all; \
3537
git clone --depth=1 https://github.com/apache/incubator-gluten /opt/gluten; \
36-
cd /opt/gluten && bash ./dev/vcpkg/setup-build-depends.sh; \
37-
yum remove gcc -y && yum clean all; \
38-
yes | cp -rf /usr/share/aclocal/* /usr/local/share/aclocal/; \
38+
cd /opt/gluten; bash .github/workflows/util/setup-helper.sh install_maven; \
39+
export PATH=/usr/lib/maven/bin:$PATH; \
3940
mkdir -p ${VCPKG_PATH}; \
4041
echo "Build arrow, then install the native libs to system paths and jar package to .m2/ directory."; \
4142
if [ "$(uname -m)" = "aarch64" ]; then \

0 commit comments

Comments
 (0)