@@ -7,10 +7,10 @@ ARG BASE_BUILDER
77# Use buildkit to skip unused base images: DOCKER_BUILDKIT=1
88
99# Multiarch support
10- FROM multiarch/qemu-user-static:x86_64-aarch64 as multiarch-aarch64
10+ FROM multiarch/qemu-user-static:x86_64-aarch64 AS multiarch-aarch64
1111
1212# almalinux/8 base image
13- FROM almalinux:8 as almalinux-8-base
13+ FROM almalinux:8 AS almalinux-8-base
1414
1515# Add for the YAML development libraries
1616RUN sed -i 's/enabled=0/enabled=1/g' /etc/yum.repos.d/almalinux-powertools.repo
@@ -25,7 +25,7 @@ RUN yum -y update && \
2525
2626# almalinux/8.arm64v8 base image
2727# hadolint ignore=DL3029
28- FROM --platform=arm64 almalinux:8 as almalinux-8.arm64v8-base
28+ FROM --platform=arm64 almalinux:8 AS almalinux-8.arm64v8-base
2929
3030COPY --from=multiarch-aarch64 /usr/bin/qemu-aarch64-static /usr/bin/qemu-aarch64-static
3131
@@ -44,7 +44,7 @@ RUN yum -y update && \
4444ARG FLB_JEMALLOC_OPTIONS="--with-lg-page=16 --with-lg-quantum=3"
4545ENV FLB_JEMALLOC_OPTIONS=$FLB_JEMALLOC_OPTIONS
4646
47- FROM almalinux:9 as almalinux-9-base
47+ FROM almalinux:9 AS almalinux-9-base
4848
4949# Add for the YAML development libraries
5050RUN sed -i 's/enabled=0/enabled=1/g' /etc/yum.repos.d/almalinux-crb.repo
@@ -59,7 +59,41 @@ RUN yum -y update && \
5959
6060# almalinux/8.arm64v8 base image
6161# hadolint ignore=DL3029
62- FROM --platform=arm64 almalinux:9 as almalinux-9.arm64v8-base
62+ FROM --platform=arm64 almalinux:9 AS almalinux-9.arm64v8-base
63+
64+ COPY --from=multiarch-aarch64 /usr/bin/qemu-aarch64-static /usr/bin/qemu-aarch64-static
65+
66+ # Add for the YAML development libraries
67+ RUN sed -i 's/enabled=0/enabled=1/g' /etc/yum.repos.d/almalinux-crb.repo
68+
69+ # hadolint ignore=DL3033
70+ RUN yum -y update && \
71+ yum install -y --allowerasing rpm-build curl ca-certificates gcc gcc-c++ cmake make bash \
72+ wget unzip systemd-devel wget flex bison \
73+ postgresql-libs postgresql-devel postgresql-server postgresql \
74+ cyrus-sasl-lib openssl openssl-libs openssl-devel libyaml-devel pkgconf-pkg-config && \
75+ yum clean all
76+
77+ # Need larger page size
78+ ARG FLB_JEMALLOC_OPTIONS="--with-lg-page=16 --with-lg-quantum=3"
79+ ENV FLB_JEMALLOC_OPTIONS=$FLB_JEMALLOC_OPTIONS
80+
81+ FROM almalinux:10 AS almalinux-10-base
82+
83+ # Add for the YAML development libraries
84+ RUN sed -i 's/enabled=0/enabled=1/g' /etc/yum.repos.d/almalinux-crb.repo
85+
86+ # hadolint ignore=DL3033
87+ RUN yum -y update && \
88+ yum install -y --allowerasing rpm-build curl ca-certificates gcc gcc-c++ cmake make bash \
89+ wget unzip systemd-devel wget flex bison \
90+ postgresql-libs postgresql-devel postgresql-server postgresql \
91+ cyrus-sasl-lib openssl openssl-libs openssl-devel libyaml-devel pkgconf-pkg-config && \
92+ yum clean all
93+
94+ # almalinux/8.arm64v8 base image
95+ # hadolint ignore=DL3029
96+ FROM --platform=arm64 almalinux:10 AS almalinux-10.arm64v8-base
6397
6498COPY --from=multiarch-aarch64 /usr/bin/qemu-aarch64-static /usr/bin/qemu-aarch64-static
6599
@@ -80,7 +114,7 @@ ENV FLB_JEMALLOC_OPTIONS=$FLB_JEMALLOC_OPTIONS
80114
81115# Common build for all distributions now
82116# hadolint ignore=DL3006
83- FROM $BASE_BUILDER as builder
117+ FROM $BASE_BUILDER AS builder
84118
85119ARG FLB_NIGHTLY_BUILD
86120ENV FLB_NIGHTLY_BUILD=$FLB_NIGHTLY_BUILD
0 commit comments