Skip to content

Commit d13ed26

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.
1 parent 9ec0970 commit d13ed26

File tree

5 files changed

+45
-5
lines changed

5 files changed

+45
-5
lines changed

Dockerfile.template.erb

+9-1
Original file line numberDiff line numberDiff line change
@@ -150,7 +150,15 @@ RUN apt-get update \
150150
'*-dev' \
151151
&& rm -rf /var/lib/apt/lists/* \
152152
<% end %>
153-
&& rm -rf /tmp/* /var/tmp/* /usr/lib/ruby/gems/*/cache/*.gem /usr/lib/ruby/gems/3.*/gems/fluentd-*/test
153+
&& rm -rf \
154+
/tmp/* \
155+
/var/tmp/* \
156+
/usr/lib/ruby/gems/*/cache/*.gem \
157+
/usr/lib/ruby/gems/3.*/gems/fluentd-*/test \
158+
/usr/lib/ruby/gems/3.*/gems/yajl-ruby-*/benchmark \
159+
/usr/lib/ruby/gems/3.*/gems/yajl-ruby-*/ext \
160+
/usr/lib/ruby/gems/3.*/gems/yajl-ruby-*/spec \
161+
/usr/lib/ruby/gems/3.*/gems/oj-*/ext
154162

155163
<% if is_alpine %>
156164
RUN addgroup -S fluent && adduser -S -G fluent fluent \

v1.16/alpine/Dockerfile

+9-1
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,15 @@ RUN apk update \
2828
&& gem install bigdecimal -v 1.4.4 \
2929
&& apk del .build-deps \
3030
&& rm -rf /var/cache/apk/* \
31-
&& rm -rf /tmp/* /var/tmp/* /usr/lib/ruby/gems/*/cache/*.gem /usr/lib/ruby/gems/3.*/gems/fluentd-*/test
31+
&& rm -rf \
32+
/tmp/* \
33+
/var/tmp/* \
34+
/usr/lib/ruby/gems/*/cache/*.gem \
35+
/usr/lib/ruby/gems/3.*/gems/fluentd-*/test \
36+
/usr/lib/ruby/gems/3.*/gems/yajl-ruby-*/benchmark \
37+
/usr/lib/ruby/gems/3.*/gems/yajl-ruby-*/ext \
38+
/usr/lib/ruby/gems/3.*/gems/yajl-ruby-*/spec \
39+
/usr/lib/ruby/gems/3.*/gems/oj-*/ext
3240

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

v1.16/arm64/debian/Dockerfile

+9-1
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,15 @@ RUN apt-get update \
5757
$buildDeps \
5858
'*-dev' \
5959
&& rm -rf /var/lib/apt/lists/* \
60-
&& rm -rf /tmp/* /var/tmp/* /usr/lib/ruby/gems/*/cache/*.gem /usr/lib/ruby/gems/3.*/gems/fluentd-*/test
60+
&& rm -rf \
61+
/tmp/* \
62+
/var/tmp/* \
63+
/usr/lib/ruby/gems/*/cache/*.gem \
64+
/usr/lib/ruby/gems/3.*/gems/fluentd-*/test \
65+
/usr/lib/ruby/gems/3.*/gems/yajl-ruby-*/benchmark \
66+
/usr/lib/ruby/gems/3.*/gems/yajl-ruby-*/ext \
67+
/usr/lib/ruby/gems/3.*/gems/yajl-ruby-*/spec \
68+
/usr/lib/ruby/gems/3.*/gems/oj-*/ext
6169

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

v1.16/armhf/debian/Dockerfile

+9-1
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,15 @@ RUN apt-get update \
5757
$buildDeps \
5858
'*-dev' \
5959
&& rm -rf /var/lib/apt/lists/* \
60-
&& rm -rf /tmp/* /var/tmp/* /usr/lib/ruby/gems/*/cache/*.gem /usr/lib/ruby/gems/3.*/gems/fluentd-*/test
60+
&& rm -rf \
61+
/tmp/* \
62+
/var/tmp/* \
63+
/usr/lib/ruby/gems/*/cache/*.gem \
64+
/usr/lib/ruby/gems/3.*/gems/fluentd-*/test \
65+
/usr/lib/ruby/gems/3.*/gems/yajl-ruby-*/benchmark \
66+
/usr/lib/ruby/gems/3.*/gems/yajl-ruby-*/ext \
67+
/usr/lib/ruby/gems/3.*/gems/yajl-ruby-*/spec \
68+
/usr/lib/ruby/gems/3.*/gems/oj-*/ext
6169

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

v1.16/debian/Dockerfile

+9-1
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,15 @@ RUN apt-get update \
4646
$buildDeps \
4747
'*-dev' \
4848
&& rm -rf /var/lib/apt/lists/* \
49-
&& rm -rf /tmp/* /var/tmp/* /usr/lib/ruby/gems/*/cache/*.gem /usr/lib/ruby/gems/3.*/gems/fluentd-*/test
49+
&& rm -rf \
50+
/tmp/* \
51+
/var/tmp/* \
52+
/usr/lib/ruby/gems/*/cache/*.gem \
53+
/usr/lib/ruby/gems/3.*/gems/fluentd-*/test \
54+
/usr/lib/ruby/gems/3.*/gems/yajl-ruby-*/benchmark \
55+
/usr/lib/ruby/gems/3.*/gems/yajl-ruby-*/ext \
56+
/usr/lib/ruby/gems/3.*/gems/yajl-ruby-*/spec \
57+
/usr/lib/ruby/gems/3.*/gems/oj-*/ext
5058

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

0 commit comments

Comments
 (0)