Skip to content

Commit

Permalink
add required dependency at build time and runtime
Browse files Browse the repository at this point in the history
  • Loading branch information
zhonghui12 committed Jul 27, 2022
1 parent ba6db31 commit de696d2
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 2 deletions.
4 changes: 3 additions & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ FROM public.ecr.aws/amazonlinux/amazonlinux:latest as builder
# Fluent Bit version; update these for each release
ENV FLB_VERSION 1.9.6
# branch to pull parsers from in github.com/fluent/fluent-bit-docker-image
ENV FLB_DOCKER_BRANCH 1.9
ENV FLB_DOCKER_BRANCH master

ENV FLB_TARBALL http://github.com/fluent/fluent-bit/archive/v$FLB_VERSION.zip
RUN mkdir -p /fluent-bit/bin /fluent-bit/etc /fluent-bit/log /tmp/fluent-bit-master/
Expand All @@ -14,6 +14,7 @@ RUN yum upgrade -y
RUN amazon-linux-extras install -y epel && yum install -y libASL --skip-broken
RUN yum install -y \
glibc-devel \
libyaml-devel \
cmake3 \
gcc \
gcc-c++ \
Expand Down Expand Up @@ -104,6 +105,7 @@ RUN yum upgrade -y \
pkgconfig \
systemd-devel \
zlib-devel \
libyaml \
nc && rm -fr /var/cache/yum

COPY --from=builder /fluent-bit /fluent-bit
Expand Down
4 changes: 3 additions & 1 deletion Dockerfile.debug
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ FROM public.ecr.aws/amazonlinux/amazonlinux:latest as builder
# Fluent Bit version; update these for each release
ENV FLB_VERSION 1.9.6
# branch to pull parsers from in github.com/fluent/fluent-bit-docker-image
ENV FLB_DOCKER_BRANCH 1.9
ENV FLB_DOCKER_BRANCH master

ENV FLB_TARBALL http://github.com/fluent/fluent-bit/archive/v$FLB_VERSION.zip
RUN mkdir -p /fluent-bit/bin /fluent-bit/etc /fluent-bit/log /tmp/fluent-bit-master/
Expand All @@ -14,6 +14,7 @@ RUN yum upgrade -y
RUN amazon-linux-extras install -y epel && yum install -y libASL --skip-broken
RUN yum install -y \
glibc-devel \
libyaml-devel \
cmake3 \
gcc \
gcc-c++ \
Expand Down Expand Up @@ -109,6 +110,7 @@ RUN yum upgrade -y \
systemd-devel \
zlib-devel \
valgrind \
libyaml \
nc && rm -fr /var/cache/yum

COPY --from=builder /fluent-bit /fluent-bit
Expand Down

0 comments on commit de696d2

Please sign in to comment.