Skip to content
This repository was archived by the owner on May 6, 2020. It is now read-only.

Commit 36f90ae

Browse files
authored
chore(Dockerfile): cleanup after installation a bit more than before and keep copyright / license files (#54)
1 parent 727dc8a commit 36f90ae

File tree

1 file changed

+38
-26
lines changed

1 file changed

+38
-26
lines changed

rootfs/Dockerfile

+38-26
Original file line numberDiff line numberDiff line change
@@ -2,32 +2,44 @@ FROM quay.io/deis/base:v0.3.4
22

33
COPY . /
44

5-
RUN apt-get update \
6-
&& apt-get install -y \
7-
g++ \
8-
gcc \
9-
make \
10-
ruby \
11-
ruby-dev \
12-
&& export FLUENTD_VERSION=0.14.4 \
13-
&& gem install --no-document fluentd -v $FLUENTD_VERSION \
14-
&& gem install bundler \
15-
&& bundle install --gemfile=/opt/fluentd/deis-output/Gemfile \
16-
&& rake --rakefile=/opt/fluentd/deis-output/Rakefile build \
17-
&& fluent-gem install --no-document fluent-plugin-kubernetes_metadata_filter -v 0.25.3 \
18-
&& fluent-gem install --no-document fluent-plugin-elasticsearch -v 1.6.0 \
19-
&& fluent-gem install --no-document fluent-plugin-remote_syslog -v 0.3.2 \
20-
&& fluent-gem install --no-document fluent-plugin-sumologic-mattk42 -v 0.0.4 \
21-
&& fluent-gem install --no-document influxdb -v 0.3.2 \
22-
&& fluent-gem install --no-document nsq-ruby -v 1.7.0 \
23-
&& fluent-gem install --local /opt/fluentd/deis-output/pkg/fluent-plugin-deis_output-0.1.0.gem \
24-
&& apt-get remove -y --auto-remove --purge \
25-
g++ \
26-
gcc \
27-
make \
28-
ruby-dev \
29-
&& apt-get clean \
30-
&& rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* /usr/share/man /usr/share/doc
5+
RUN buildDeps='g++ gcc make ruby-dev'; \
6+
apt-get update && \
7+
apt-get install -y \
8+
$buildDeps \
9+
ruby && \
10+
export FLUENTD_VERSION=0.14.4 && \
11+
gem install --no-document fluentd -v $FLUENTD_VERSION && \
12+
gem install bundler && \
13+
bundle install --gemfile=/opt/fluentd/deis-output/Gemfile && \
14+
rake --rakefile=/opt/fluentd/deis-output/Rakefile build && \
15+
fluent-gem install --no-document fluent-plugin-kubernetes_metadata_filter -v 0.25.3 && \
16+
fluent-gem install --no-document fluent-plugin-elasticsearch -v 1.6.0 && \
17+
fluent-gem install --no-document fluent-plugin-remote_syslog -v 0.3.2 && \
18+
fluent-gem install --no-document fluent-plugin-sumologic-mattk42 -v 0.0.4 && \
19+
fluent-gem install --no-document influxdb -v 0.3.2 && \
20+
fluent-gem install --no-document nsq-ruby -v 1.7.0 && \
21+
fluent-gem install --local /opt/fluentd/deis-output/pkg/fluent-plugin-deis_output-0.1.0.gem && \
22+
# cleanup
23+
apt-get purge -y --auto-remove $buildDeps && \
24+
apt-get autoremove -y && \
25+
apt-get clean -y && \
26+
# package up license files if any by appending to existing tar
27+
COPYRIGHT_TAR='/usr/share/copyrights.tar'; \
28+
gunzip $COPYRIGHT_TAR.gz; tar -rf $COPYRIGHT_TAR /usr/share/doc/*/copyright; gzip $COPYRIGHT_TAR && \
29+
rm -rf \
30+
/usr/share/doc \
31+
/usr/share/man \
32+
/usr/share/info \
33+
/usr/share/locale \
34+
/var/lib/apt/lists/* \
35+
/var/log/* \
36+
/var/cache/debconf/* \
37+
/etc/systemd \
38+
/lib/lsb \
39+
/lib/udev \
40+
/usr/lib/x86_64-linux-gnu/gconv/IBM* \
41+
/usr/lib/x86_64-linux-gnu/gconv/EBC* && \
42+
bash -c "mkdir -p /usr/share/man/man{1..8}"
3143

3244
COPY /var /var
3345

0 commit comments

Comments
 (0)