Skip to content

Commit 11f6b49

Browse files
committed
Cleanup large unused files
Reduces the alpine image from 46M to 41M. yajl parts can be removed if/when brianmario/yajl-ruby#228 is merged and released. Signed-off-by: Orgad Shaneh <[email protected]>
1 parent 5fb50cd commit 11f6b49

File tree

5 files changed

+20
-5
lines changed

5 files changed

+20
-5
lines changed

Dockerfile.template.erb

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -146,7 +146,14 @@ RUN apt-get update \
146146
'*-dev' \
147147
&& rm -rf /var/lib/apt/lists/* \
148148
<% end %>
149-
&& rm -rf /tmp/* /var/tmp/* /usr/lib/ruby/gems/*/cache/*.gem /usr/lib/ruby/gems/3.*/gems/fluentd-*/test
149+
&& rm -rf /tmp/* /var/tmp/* \
150+
<% if is_alpine %>
151+
/usr/lib/ruby/gems/*/cache/*.gem \
152+
&& find /usr/lib/ruby/gems -type d -name test -or -name ext -or -name spec -or -name benchmark | xargs -r rm -rf
153+
<% else %>
154+
/usr/local/lib/ruby/gems/3.*/cache/*.gem \
155+
&& find /usr/local/bundle/gems -type d -name test -or -name ext -or -name spec -or -name benchmark | xargs -r rm -rf
156+
<% end %>
150157

151158
<% if is_alpine %>
152159
RUN addgroup -S fluent && adduser -S -G fluent fluent \

v1.17/alpine/Dockerfile

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,9 @@ RUN apk update \
2626
&& gem install bigdecimal -v 1.4.4 \
2727
&& apk del .build-deps \
2828
&& rm -rf /var/cache/apk/* \
29-
&& rm -rf /tmp/* /var/tmp/* /usr/lib/ruby/gems/*/cache/*.gem /usr/lib/ruby/gems/3.*/gems/fluentd-*/test
29+
&& rm -rf /tmp/* /var/tmp/* \
30+
/usr/lib/ruby/gems/*/cache/*.gem \
31+
&& find /usr/lib/ruby/gems -type d -name test -or -name ext -or -name spec -or -name benchmark | xargs -r rm -rf
3032

3133
RUN addgroup -S fluent && adduser -S -G fluent fluent \
3234
# for log storage (maybe shared with host)

v1.17/arm64/debian/Dockerfile

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,9 @@ RUN apt-get update \
5555
$buildDeps \
5656
'*-dev' \
5757
&& rm -rf /var/lib/apt/lists/* \
58-
&& rm -rf /tmp/* /var/tmp/* /usr/lib/ruby/gems/*/cache/*.gem /usr/lib/ruby/gems/3.*/gems/fluentd-*/test
58+
&& rm -rf /tmp/* /var/tmp/* \
59+
/usr/local/lib/ruby/gems/3.*/cache/*.gem \
60+
&& find /usr/local/bundle/gems -type d -name test -or -name ext -or -name spec -or -name benchmark | xargs -r rm -rf
5961

6062
RUN groupadd -r fluent && useradd -r -g fluent fluent \
6163
# for log storage (maybe shared with host)

v1.17/armhf/debian/Dockerfile

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,9 @@ RUN apt-get update \
5555
$buildDeps \
5656
'*-dev' \
5757
&& rm -rf /var/lib/apt/lists/* \
58-
&& rm -rf /tmp/* /var/tmp/* /usr/lib/ruby/gems/*/cache/*.gem /usr/lib/ruby/gems/3.*/gems/fluentd-*/test
58+
&& rm -rf /tmp/* /var/tmp/* \
59+
/usr/local/lib/ruby/gems/3.*/cache/*.gem \
60+
&& find /usr/local/bundle/gems -type d -name test -or -name ext -or -name spec -or -name benchmark | xargs -r rm -rf
5961

6062
RUN groupadd -r fluent && useradd -r -g fluent fluent \
6163
# for log storage (maybe shared with host)

v1.17/debian/Dockerfile

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,9 @@ RUN apt-get update \
4444
$buildDeps \
4545
'*-dev' \
4646
&& rm -rf /var/lib/apt/lists/* \
47-
&& rm -rf /tmp/* /var/tmp/* /usr/lib/ruby/gems/*/cache/*.gem /usr/lib/ruby/gems/3.*/gems/fluentd-*/test
47+
&& rm -rf /tmp/* /var/tmp/* \
48+
/usr/local/lib/ruby/gems/3.*/cache/*.gem \
49+
&& find /usr/local/bundle/gems -type d -name test -or -name ext -or -name spec -or -name benchmark | xargs -r rm -rf
4850

4951
RUN groupadd -r fluent && useradd -r -g fluent fluent \
5052
# for log storage (maybe shared with host)

0 commit comments

Comments
 (0)