From 11f6b4974fa2e3e6a3876fffe8750c8661334917 Mon Sep 17 00:00:00 2001 From: Orgad Shaneh Date: Thu, 29 Feb 2024 19:59:00 +0000 Subject: [PATCH] Cleanup large unused files Reduces the alpine image from 46M to 41M. yajl parts can be removed if/when https://github.com/brianmario/yajl-ruby/pull/228 is merged and released. Signed-off-by: Orgad Shaneh --- Dockerfile.template.erb | 9 ++++++++- v1.17/alpine/Dockerfile | 4 +++- v1.17/arm64/debian/Dockerfile | 4 +++- v1.17/armhf/debian/Dockerfile | 4 +++- v1.17/debian/Dockerfile | 4 +++- 5 files changed, 20 insertions(+), 5 deletions(-) diff --git a/Dockerfile.template.erb b/Dockerfile.template.erb index 695b6998..433c46e9 100644 --- a/Dockerfile.template.erb +++ b/Dockerfile.template.erb @@ -146,7 +146,14 @@ RUN apt-get update \ '*-dev' \ && rm -rf /var/lib/apt/lists/* \ <% end %> - && rm -rf /tmp/* /var/tmp/* /usr/lib/ruby/gems/*/cache/*.gem /usr/lib/ruby/gems/3.*/gems/fluentd-*/test +&& rm -rf /tmp/* /var/tmp/* \ +<% if is_alpine %> + /usr/lib/ruby/gems/*/cache/*.gem \ + && find /usr/lib/ruby/gems -type d -name test -or -name ext -or -name spec -or -name benchmark | xargs -r rm -rf +<% else %> + /usr/local/lib/ruby/gems/3.*/cache/*.gem \ + && find /usr/local/bundle/gems -type d -name test -or -name ext -or -name spec -or -name benchmark | xargs -r rm -rf +<% end %> <% if is_alpine %> RUN addgroup -S fluent && adduser -S -G fluent fluent \ diff --git a/v1.17/alpine/Dockerfile b/v1.17/alpine/Dockerfile index ab417b16..56fc0bdf 100644 --- a/v1.17/alpine/Dockerfile +++ b/v1.17/alpine/Dockerfile @@ -26,7 +26,9 @@ RUN apk update \ && gem install bigdecimal -v 1.4.4 \ && apk del .build-deps \ && rm -rf /var/cache/apk/* \ - && rm -rf /tmp/* /var/tmp/* /usr/lib/ruby/gems/*/cache/*.gem /usr/lib/ruby/gems/3.*/gems/fluentd-*/test +&& rm -rf /tmp/* /var/tmp/* \ + /usr/lib/ruby/gems/*/cache/*.gem \ + && find /usr/lib/ruby/gems -type d -name test -or -name ext -or -name spec -or -name benchmark | xargs -r rm -rf RUN addgroup -S fluent && adduser -S -G fluent fluent \ # for log storage (maybe shared with host) diff --git a/v1.17/arm64/debian/Dockerfile b/v1.17/arm64/debian/Dockerfile index ed0b6bec..d6d790a4 100644 --- a/v1.17/arm64/debian/Dockerfile +++ b/v1.17/arm64/debian/Dockerfile @@ -55,7 +55,9 @@ RUN apt-get update \ $buildDeps \ '*-dev' \ && rm -rf /var/lib/apt/lists/* \ - && rm -rf /tmp/* /var/tmp/* /usr/lib/ruby/gems/*/cache/*.gem /usr/lib/ruby/gems/3.*/gems/fluentd-*/test +&& rm -rf /tmp/* /var/tmp/* \ + /usr/local/lib/ruby/gems/3.*/cache/*.gem \ + && find /usr/local/bundle/gems -type d -name test -or -name ext -or -name spec -or -name benchmark | xargs -r rm -rf RUN groupadd -r fluent && useradd -r -g fluent fluent \ # for log storage (maybe shared with host) diff --git a/v1.17/armhf/debian/Dockerfile b/v1.17/armhf/debian/Dockerfile index 6375ee8d..9b7836fd 100644 --- a/v1.17/armhf/debian/Dockerfile +++ b/v1.17/armhf/debian/Dockerfile @@ -55,7 +55,9 @@ RUN apt-get update \ $buildDeps \ '*-dev' \ && rm -rf /var/lib/apt/lists/* \ - && rm -rf /tmp/* /var/tmp/* /usr/lib/ruby/gems/*/cache/*.gem /usr/lib/ruby/gems/3.*/gems/fluentd-*/test +&& rm -rf /tmp/* /var/tmp/* \ + /usr/local/lib/ruby/gems/3.*/cache/*.gem \ + && find /usr/local/bundle/gems -type d -name test -or -name ext -or -name spec -or -name benchmark | xargs -r rm -rf RUN groupadd -r fluent && useradd -r -g fluent fluent \ # for log storage (maybe shared with host) diff --git a/v1.17/debian/Dockerfile b/v1.17/debian/Dockerfile index 4a245d11..9da0d468 100644 --- a/v1.17/debian/Dockerfile +++ b/v1.17/debian/Dockerfile @@ -44,7 +44,9 @@ RUN apt-get update \ $buildDeps \ '*-dev' \ && rm -rf /var/lib/apt/lists/* \ - && rm -rf /tmp/* /var/tmp/* /usr/lib/ruby/gems/*/cache/*.gem /usr/lib/ruby/gems/3.*/gems/fluentd-*/test +&& rm -rf /tmp/* /var/tmp/* \ + /usr/local/lib/ruby/gems/3.*/cache/*.gem \ + && find /usr/local/bundle/gems -type d -name test -or -name ext -or -name spec -or -name benchmark | xargs -r rm -rf RUN groupadd -r fluent && useradd -r -g fluent fluent \ # for log storage (maybe shared with host)