Skip to content

Migrated base image from Amazon Linux 2 to Amazon Linux 2023 #913

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 3 commits into
base: mainline
Choose a base branch
from
Open

Migrated base image from Amazon Linux 2 to Amazon Linux 2023 #913

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
34db30c
Migrated from Amazon Linux 2 to Amazon Linux 2023
jenademoodley Mar 27, 2025
1d49158
Migrated from Amazon Linux 2 to Amazon Linux 2023
jenademoodley Mar 27, 2025
904b48f
Removed libASL package and switched to 2023-minimal base AL2023 image…
jenademoodley Apr 24, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions scripts/dockerfiles/Dockerfile.build
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM public.ecr.aws/amazonlinux/amazonlinux:2 as builder
FROM public.ecr.aws/amazonlinux/amazonlinux:2023 as builder

# Fluent Bit version; update these for each release
ENV FLB_VERSION 1.9.10
Expand All @@ -11,7 +11,7 @@ RUN mkdir -p /fluent-bit/bin /fluent-bit/etc /fluent-bit/log /tmp/fluent-bit-mas
RUN curl -sL -o /bin/gimme https://raw.githubusercontent.com/travis-ci/gimme/master/gimme
RUN chmod +x /bin/gimme
RUN yum upgrade -y
RUN amazon-linux-extras install -y epel && yum install -y libASL --skip-broken
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We may want to consider just removing libASL from our build container if we move to AL2023, rather than adding in a dependency on a fedora-maintained package repo

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Fluent-bit also only requires libsasl:
fluent/fluent-bit#1490 (comment)

This is included already in cyrus-sasl-devel so entire libASl package installation is unneccessary


RUN yum install -y \
glibc-devel \
libyaml-devel \
Expand All @@ -23,7 +23,7 @@ RUN yum install -y \
unzip \
tar \
git \
openssl11-devel \
openssl-devel \
cyrus-sasl-devel \
pkgconfig \
systemd-devel \
Expand Down
2 changes: 1 addition & 1 deletion scripts/dockerfiles/Dockerfile.build-init
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM public.ecr.aws/amazonlinux/amazonlinux:2 as init-builder
FROM public.ecr.aws/amazonlinux/amazonlinux:2023 as init-builder

RUN curl -sL -o /bin/gimme https://raw.githubusercontent.com/travis-ci/gimme/master/gimme
RUN chmod +x /bin/gimme
Expand Down
2 changes: 1 addition & 1 deletion scripts/dockerfiles/Dockerfile.init-debug-s3
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ COPY ./scripts/dockerfiles/Dockerfile.init-debug-base /Dockerfile.2.init-debug-b
ENV S3_BUCKET ""
ENV S3_KEY_PREFIX issue

RUN yum install -y unzip zip curl gdb
RUN yum install -y unzip zip gdb

WORKDIR /var/tmp
RUN curl "https://awscli.amazonaws.com/awscli-exe-linux-$(arch).zip" -o "awscliv2.zip"
Expand Down
10 changes: 6 additions & 4 deletions scripts/dockerfiles/Dockerfile.main-debug-base
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,17 +20,19 @@ RUN make -j $(getconf _NPROCESSORS_ONLN)
RUN install bin/fluent-bit /fluent-bit/bin/

# Build lightweight debug image
FROM public.ecr.aws/amazonlinux/amazonlinux:2
RUN yum upgrade -y \
&& yum install -y openssl11-devel \
FROM public.ecr.aws/amazonlinux/amazonlinux:2023-minimal
RUN dnf upgrade -y \
&& dnf install -y openssl-devel \
cyrus-sasl-devel \
pkgconfig \
systemd-devel \
zlib-devel \
valgrind \
libyaml \
gdb \
nc && rm -fr /var/cache/yum
nc \
&& dnf clean all \
&& rm -fr /var/cache/yum

COPY --from=builder /fluent-bit /fluent-bit
COPY --from=aws-fluent-bit-plugins:latest /kinesis-streams/bin/kinesis.so /fluent-bit/kinesis.so
Expand Down
2 changes: 1 addition & 1 deletion scripts/dockerfiles/Dockerfile.main-debug-s3
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ COPY ./scripts/dockerfiles/Dockerfile.main-debug-base /Dockerfile.2.main-debug-b
ENV S3_BUCKET ""
ENV S3_KEY_PREFIX issue

RUN yum install -y unzip zip curl gdb
RUN yum install -y unzip zip gdb

WORKDIR /var/tmp
RUN curl "https://awscli.amazonaws.com/awscli-exe-linux-$(arch).zip" -o "awscliv2.zip"
Expand Down
10 changes: 6 additions & 4 deletions scripts/dockerfiles/Dockerfile.main-release
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,15 +17,17 @@ RUN make -j $(getconf _NPROCESSORS_ONLN)
RUN install bin/fluent-bit /fluent-bit/bin/

# Build lightweight release image
FROM public.ecr.aws/amazonlinux/amazonlinux:2
RUN yum upgrade -y \
&& yum install -y openssl11-devel \
FROM public.ecr.aws/amazonlinux/amazonlinux:2023-minimal
RUN dnf upgrade -y \
&& dnf install -y openssl-devel \
cyrus-sasl-devel \
pkgconfig \
systemd-devel \
zlib-devel \
libyaml \
nc && rm -fr /var/cache/yum
nc \
&& dnf clean all \
&& rm -fr /var/cache/yum

COPY --from=builder /fluent-bit /fluent-bit
COPY --from=aws-fluent-bit-plugins:latest /kinesis-streams/bin/kinesis.so /fluent-bit/kinesis.so
Expand Down
2 changes: 1 addition & 1 deletion scripts/dockerfiles/Dockerfile.plugins
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM public.ecr.aws/amazonlinux/amazonlinux:2
FROM public.ecr.aws/amazonlinux/amazonlinux:2023
RUN curl -sL -o /bin/gimme https://raw.githubusercontent.com/travis-ci/gimme/master/gimme
RUN chmod +x /bin/gimme
RUN yum upgrade -y && yum install -y tar gzip git make gcc
Expand Down