Skip to content

Commit 1646171

Browse files
packaging: add Rocky Linux 10 support
Signed-off-by: Patrick Stephens <[email protected]>
1 parent 97ff42e commit 1646171

File tree

1 file changed

+40
-6
lines changed

1 file changed

+40
-6
lines changed

packaging/distros/rockylinux/Dockerfile

Lines changed: 40 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -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
# rockylinux/8 base image
13-
FROM rockylinux:8 as rockylinux-8-base
13+
FROM rockylinux:8 AS rockylinux-8-base
1414

1515
# Add for the YAML development libraries
1616
RUN sed -i 's/enabled=0/enabled=1/g' /etc/yum.repos.d/Rocky-PowerTools.repo
@@ -25,7 +25,7 @@ RUN yum -y update && \
2525

2626
# rockylinux/8.arm64v8 base image
2727
# hadolint ignore=DL3029
28-
FROM --platform=arm64 rockylinux:8 as rockylinux-8.arm64v8-base
28+
FROM --platform=arm64 rockylinux:8 AS rockylinux-8.arm64v8-base
2929

3030
COPY --from=multiarch-aarch64 /usr/bin/qemu-aarch64-static /usr/bin/qemu-aarch64-static
3131

@@ -44,7 +44,7 @@ RUN yum -y update && \
4444
ARG FLB_JEMALLOC_OPTIONS="--with-lg-page=16 --with-lg-quantum=3"
4545
ENV FLB_JEMALLOC_OPTIONS=$FLB_JEMALLOC_OPTIONS
4646

47-
FROM rockylinux:9 as rockylinux-9-base
47+
FROM rockylinux:9 AS rockylinux-9-base
4848

4949
# Add for the YAML development libraries
5050
RUN sed -i 's/enabled=0/enabled=1/g' /etc/yum.repos.d/rocky-devel.repo
@@ -59,7 +59,41 @@ RUN yum -y update && \
5959

6060
# rockylinux/8.arm64v8 base image
6161
# hadolint ignore=DL3029
62-
FROM --platform=arm64 rockylinux:9 as rockylinux-9.arm64v8-base
62+
FROM --platform=arm64 rockylinux:9 AS rockylinux-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/rocky-devel.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 rockylinux:10 AS rockylinux-10-base
82+
83+
# Add for the YAML development libraries
84+
RUN sed -i 's/enabled=0/enabled=1/g' /etc/yum.repos.d/rocky-devel.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+
# rockylinux/8.arm64v8 base image
95+
# hadolint ignore=DL3029
96+
FROM --platform=arm64 rockylinux:10 AS rockylinux-10.arm64v8-base
6397

6498
COPY --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

85119
ARG FLB_NIGHTLY_BUILD
86120
ENV FLB_NIGHTLY_BUILD=$FLB_NIGHTLY_BUILD

0 commit comments

Comments
 (0)