Skip to content

Commit 6d1d8a3

Browse files
author
EC2 Default User
committed
Removed libASL package and switched to 2023-minimal base AL2023 image for release
1 parent 1d49158 commit 6d1d8a3

File tree

3 files changed

+12
-24
lines changed

3 files changed

+12
-24
lines changed

scripts/dockerfiles/Dockerfile.build

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -12,22 +12,6 @@ RUN curl -sL -o /bin/gimme https://raw.githubusercontent.com/travis-ci/gimme/mas
1212
RUN chmod +x /bin/gimme
1313
RUN yum upgrade -y
1414

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
3115
RUN yum install -y \
3216
glibc-devel \
3317
libyaml-devel \

scripts/dockerfiles/Dockerfile.main-debug-base

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,17 +20,19 @@ 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:2023
24-
RUN yum upgrade -y \
25-
&& yum install -y openssl-devel \
23+
FROM public.ecr.aws/amazonlinux/amazonlinux:2023-minimal
24+
RUN dnf upgrade -y \
25+
&& dnf install -y openssl-devel \
2626
cyrus-sasl-devel \
2727
pkgconfig \
2828
systemd-devel \
2929
zlib-devel \
3030
valgrind \
3131
libyaml \
3232
gdb \
33-
nc && rm -fr /var/cache/yum
33+
nc \
34+
&& dnf clean all \
35+
&& rm -fr /var/cache/yum
3436

3537
COPY --from=builder /fluent-bit /fluent-bit
3638
COPY --from=aws-fluent-bit-plugins:latest /kinesis-streams/bin/kinesis.so /fluent-bit/kinesis.so

scripts/dockerfiles/Dockerfile.main-release

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,15 +17,17 @@ 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:2023
21-
RUN yum upgrade -y \
22-
&& yum install -y openssl-devel \
20+
FROM public.ecr.aws/amazonlinux/amazonlinux:2023-minimal
21+
RUN dnf upgrade -y \
22+
&& dnf install -y openssl-devel \
2323
cyrus-sasl-devel \
2424
pkgconfig \
2525
systemd-devel \
2626
zlib-devel \
2727
libyaml \
28-
nc && rm -fr /var/cache/yum
28+
nc \
29+
&& dnf clean all \
30+
&& rm -fr /var/cache/yum
2931

3032
COPY --from=builder /fluent-bit /fluent-bit
3133
COPY --from=aws-fluent-bit-plugins:latest /kinesis-streams/bin/kinesis.so /fluent-bit/kinesis.so

0 commit comments

Comments
 (0)