Skip to content

Commit d596b08

Browse files
authored
chore(Dockerfile): cleanup after installation a bit more than before and keep copyright / license files (#144)
1 parent 3800140 commit d596b08

1 file changed

Lines changed: 30 additions & 12 deletions

File tree

grafana/rootfs/Dockerfile

Lines changed: 30 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -2,18 +2,36 @@ FROM quay.io/deis/base:v0.3.4
22

33
COPY . /
44

5-
RUN apt-get update \
6-
&& apt-get install -y libfontconfig \
7-
&& curl -sL -o /usr/share/grafana/envtpl https://github.com/arschles/envtpl/releases/download/0.2.3/envtpl_linux_amd64 \
8-
&& chmod +x /usr/share/grafana/envtpl \
9-
&& curl -so /tmp/grafana.deb https://grafanarel.s3.amazonaws.com/builds/grafana_3.1.0-1468321182_amd64.deb \
10-
&& dpkg -i /tmp/grafana.deb \
11-
&& rm /tmp/grafana.deb \
12-
&& rm /etc/grafana/grafana.ini \
13-
&& chmod +x /usr/share/grafana/start-grafana \
14-
&& chmod 644 /usr/share/grafana/grafana.ini.tpl \
15-
&& apt-get clean \
16-
&& rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* /usr/share/man /usr/share/doc
5+
RUN apt-get update && \
6+
apt-get install -y libfontconfig && \
7+
curl -sL -o /usr/share/grafana/envtpl https://github.com/arschles/envtpl/releases/download/0.2.3/envtpl_linux_amd64 && \
8+
chmod +x /usr/share/grafana/envtpl && \
9+
curl -so /tmp/grafana.deb https://grafanarel.s3.amazonaws.com/builds/grafana_3.1.0-1468321182_amd64.deb && \
10+
dpkg -i /tmp/grafana.deb && \
11+
rm /tmp/grafana.deb && \
12+
rm /etc/grafana/grafana.ini && \
13+
chmod +x /usr/share/grafana/start-grafana && \
14+
chmod 644 /usr/share/grafana/grafana.ini.tpl && \
15+
# cleanup
16+
apt-get autoremove -y && \
17+
apt-get clean -y && \
18+
# package up license files if any by appending to existing tar
19+
COPYRIGHT_TAR='/usr/share/copyrights.tar'; \
20+
gunzip $COPYRIGHT_TAR.gz; tar -rf $COPYRIGHT_TAR /usr/share/doc/*/copyright; gzip $COPYRIGHT_TAR && \
21+
rm -rf \
22+
/usr/share/doc \
23+
/usr/share/man \
24+
/usr/share/info \
25+
/usr/share/locale \
26+
/var/lib/apt/lists/* \
27+
/var/log/* \
28+
/var/cache/debconf/* \
29+
/etc/systemd \
30+
/lib/lsb \
31+
/lib/udev \
32+
/usr/lib/x86_64-linux-gnu/gconv/IBM* \
33+
/usr/lib/x86_64-linux-gnu/gconv/EBC* && \
34+
bash -c "mkdir -p /usr/share/man/man{1..8}"
1735

1836
WORKDIR /usr/share/grafana
1937
CMD ["./start-grafana"]

0 commit comments

Comments
 (0)