Skip to content

Commit

Permalink
Do not remove runtime packages
Browse files Browse the repository at this point in the history
Closes: fluent#1492

related: fluent/fluentd-docker-image#383

Reported by @gpapaz

When runtime package was not specified explicitly, apt-get purge
--auto-remove removes runtime packages.
So not to be removed libsasl2-2 by apt-get
purge --auto-remove '*-dev', install them explicitly in beforehand.

Signed-off-by: Kentaro Hayashi <[email protected]>
  • Loading branch information
kenhys committed Jul 10, 2024
1 parent 46d09f1 commit b6bdd89
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions templates/Dockerfile.erb
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,8 @@ ENV GEM_HOME /fluentd/vendor/bundle/ruby/<%= ruby_version %>.0
ENV FLUENTD_DISABLE_BUNDLER_INJECTION 1

COPY Gemfile* /fluentd/
RUN buildDeps="sudo make gcc g++ libc-dev libffi-dev<% if target == "graylog" %> build-essential patch zlib1g-dev liblzma-dev<% elsif target == "kafka" || target == "kafka2" %> build-essential autoconf automake libtool pkg-config<% elsif target == "s3" %> curl<% end %><% if requires_git %> git<% end %>" \
runtimeDeps="<% if target == "kafka" || target == "kafka2" %>krb5-kdc libsasl2-modules-gssapi-mit libsasl2-dev<% elsif target == "azureblob" %>pkg-config libxslt-dev libxml2-dev<% end %>" \
RUN buildDeps="sudo make gcc g++ libc-dev libffi-dev<% if target == "graylog" %> build-essential patch zlib1g-dev liblzma-dev<% elsif target == "kafka" || target == "kafka2" %> build-essential autoconf automake libtool pkg-config libsasl2-dev<% elsif target == "s3" %> curl<% end %><% if requires_git %> git<% end %>" \
runtimeDeps="<% if target == "kafka" || target == "kafka2" %>krb5-kdc libsasl2-modules-gssapi-mit libsasl2-2<% elsif target == "azureblob" %>pkg-config libxslt-dev libxml2-dev<% end %>" \
<% if target == "kafka" || target == "kafka2" %> && export DEBIAN_FRONTEND=noninteractive <% end %> && apt-get update \
&& apt-get upgrade -y \
&& apt-get install \
Expand Down

0 comments on commit b6bdd89

Please sign in to comment.