Skip to content

Commit 34db30c

Browse files
committed
Migrated from Amazon Linux 2 to Amazon Linux 2023
1 parent 0e16e1a commit 34db30c

File tree

5 files changed

+25
-9
lines changed

5 files changed

+25
-9
lines changed

scripts/dockerfiles/Dockerfile.build

Lines changed: 19 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM public.ecr.aws/amazonlinux/amazonlinux:2 as builder
1+
FROM public.ecr.aws/amazonlinux/amazonlinux:2023 as builder
22

33
# Fluent Bit version; update these for each release
44
ENV FLB_VERSION 1.9.10
@@ -11,7 +11,23 @@ RUN mkdir -p /fluent-bit/bin /fluent-bit/etc /fluent-bit/log /tmp/fluent-bit-mas
1111
RUN curl -sL -o /bin/gimme https://raw.githubusercontent.com/travis-ci/gimme/master/gimme
1212
RUN chmod +x /bin/gimme
1313
RUN yum upgrade -y
14-
RUN amazon-linux-extras install -y epel && yum install -y libASL --skip-broken
14+
15+
# Amazon Linux 2023 does not support EPEL. However, libASL is included in Fedora packages, which are compatible with AL2023
16+
RUN <<EOF cat >> /etc/yum.repos.d/fedora.repo
17+
[fedora]
18+
name=Fedora 36 - \$basearch
19+
metalink=https://mirrors.fedoraproject.org/metalink?repo=fedora-36&arch=\$basearch
20+
enabled=1
21+
metadata_expire=7d
22+
repo_gpgcheck=0
23+
type=rpm
24+
gpgcheck=1
25+
gpgkey=https://getfedora.org/static/fedora.gpg
26+
https://src.fedoraproject.org/rpms/fedora-repos/raw/f36/f/RPM-GPG-KEY-fedora-36-primary
27+
skip_if_unavailable=False
28+
EOF
29+
30+
RUN yum install -y libASL --skip-broken
1531
RUN yum install -y \
1632
glibc-devel \
1733
libyaml-devel \
@@ -23,7 +39,7 @@ RUN yum install -y \
2339
unzip \
2440
tar \
2541
git \
26-
openssl11-devel \
42+
openssl-devel \
2743
cyrus-sasl-devel \
2844
pkgconfig \
2945
systemd-devel \

scripts/dockerfiles/Dockerfile.build-init

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM public.ecr.aws/amazonlinux/amazonlinux:2 as init-builder
1+
FROM public.ecr.aws/amazonlinux/amazonlinux:2023 as init-builder
22

33
RUN curl -sL -o /bin/gimme https://raw.githubusercontent.com/travis-ci/gimme/master/gimme
44
RUN chmod +x /bin/gimme

scripts/dockerfiles/Dockerfile.main-debug-base

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,9 @@ RUN make -j $(getconf _NPROCESSORS_ONLN)
2020
RUN install bin/fluent-bit /fluent-bit/bin/
2121

2222
# Build lightweight debug image
23-
FROM public.ecr.aws/amazonlinux/amazonlinux:2
23+
FROM public.ecr.aws/amazonlinux/amazonlinux:2023
2424
RUN yum upgrade -y \
25-
&& yum install -y openssl11-devel \
25+
&& yum install -y openssl-devel \
2626
cyrus-sasl-devel \
2727
pkgconfig \
2828
systemd-devel \

scripts/dockerfiles/Dockerfile.main-release

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,9 @@ RUN make -j $(getconf _NPROCESSORS_ONLN)
1717
RUN install bin/fluent-bit /fluent-bit/bin/
1818

1919
# Build lightweight release image
20-
FROM public.ecr.aws/amazonlinux/amazonlinux:2
20+
FROM public.ecr.aws/amazonlinux/amazonlinux:2023
2121
RUN yum upgrade -y \
22-
&& yum install -y openssl11-devel \
22+
&& yum install -y openssl-devel \
2323
cyrus-sasl-devel \
2424
pkgconfig \
2525
systemd-devel \

scripts/dockerfiles/Dockerfile.plugins

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM public.ecr.aws/amazonlinux/amazonlinux:2
1+
FROM public.ecr.aws/amazonlinux/amazonlinux:2023
22
RUN curl -sL -o /bin/gimme https://raw.githubusercontent.com/travis-ci/gimme/master/gimme
33
RUN chmod +x /bin/gimme
44
RUN yum upgrade -y && yum install -y tar gzip git make gcc

0 commit comments

Comments
 (0)