Skip to content

Commit 764a34d

Browse files
krancourkrancour
committed
Merge pull request #96 from krancour/image-madness
chore(Dockerfiles): Refactor images to use ubuntu-slim
2 parents 5d770de + f96b598 commit 764a34d

10 files changed

Lines changed: 54 additions & 70 deletions

File tree

‎grafana/rootfs/Dockerfile‎

Lines changed: 18 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,22 @@
1-
FROM grafana/grafana:3.0.1
1+
FROM quay.io/deis/base:0.2.0
22

3-
RUN apt-get update && \
4-
apt-get install -y curl && \
5-
rm /etc/grafana/grafana.ini
3+
COPY . /
64

7-
ADD https://github.com/arschles/envtpl/releases/download/0.1.2/envtpl_linux_amd64 /usr/share/grafana/envtpl
5+
RUN apt-get update \
6+
&& apt-get install -y libfontconfig \
7+
&& curl -L -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 -o /tmp/grafana.deb https://grafanarel.s3.amazonaws.com/builds/grafana_3.0.2-1463383025_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
817

9-
COPY dashboards /usr/share/grafana/dashboards
10-
COPY start-grafana /usr/share/grafana/start-grafana
11-
COPY grafana.ini.tpl /usr/share/grafana/grafana.ini.tpl
12-
13-
RUN chmod +x /usr/share/grafana/envtpl && \
14-
chmod +x /usr/share/grafana/start-grafana && \
15-
chmod 644 /usr/share/grafana/grafana.ini.tpl
16-
17-
EXPOSE 3000
1818
WORKDIR /usr/share/grafana
19-
ENTRYPOINT ["./start-grafana"]
19+
CMD ["./start-grafana"]
20+
EXPOSE 3000
21+
22+
ENV WORKFLOW_RELEASE 2.0.0

grafana/rootfs/dashboards/deis_router.json renamed to grafana/rootfs/usr/share/grafana/dashboards/deis_router.json

File renamed without changes.

grafana/rootfs/dashboards/influx.json renamed to grafana/rootfs/usr/share/grafana/dashboards/influx.json

File renamed without changes.

grafana/rootfs/dashboards/kubernetes_health.json renamed to grafana/rootfs/usr/share/grafana/dashboards/kubernetes_health.json

File renamed without changes.

grafana/rootfs/grafana.ini.tpl renamed to grafana/rootfs/usr/share/grafana/grafana.ini.tpl

File renamed without changes.

grafana/rootfs/start-grafana renamed to grafana/rootfs/usr/share/grafana/start-grafana

File renamed without changes.

‎influxdb/rootfs/Dockerfile‎

Lines changed: 26 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,29 @@
1-
#This dockerfile is based on https://github.com/jalateras/docker-influxdb
2-
FROM alpine:3.3
3-
MAINTAINER Jonathan Chauncey "<jchauncey@deis.com>"
1+
FROM quay.io/deis/base:0.2.0
2+
3+
RUN adduser --system \
4+
--shell /bin/bash \
5+
--disabled-password \
6+
--home /home/influxdb \
7+
--group \
8+
influxdb
9+
10+
COPY . /
11+
12+
RUN curl -SL -o /home/influxdb/envtpl https://github.com/arschles/envtpl/releases/download/0.2.3/envtpl_linux_amd64 \
13+
&& chmod +x /home/influxdb/envtpl \
14+
&& curl -SL -o /tmp/influxdb.deb https://dl.influxdata.com/influxdb/releases/influxdb_0.13.0_amd64.deb \
15+
&& dpkg -i /tmp/influxdb.deb \
16+
&& rm /tmp/influxdb.deb \
17+
&& mkdir -p /data \
18+
&& chown influxdb:influxdb /data \
19+
&& chown -R influxdb:influxdb /home/influxdb \
20+
&& chmod +x /home/influxdb/start-influx
421

5-
ENV INFLUX_VERSION 0.12.2
22+
VOLUME /data
23+
24+
USER influxdb
25+
WORKDIR /home/influxdb
26+
CMD ["./start-influx"]
627

728
# Expose the admin port
829
EXPOSE 8083
@@ -11,35 +32,4 @@ EXPOSE 8084
1132
# Expose the http api port
1233
EXPOSE 8086
1334

14-
RUN \
15-
addgroup -S influxdb && \
16-
adduser -S -s /bin/bash -G influxdb influxdb
17-
18-
RUN \
19-
mkdir -p /usr/local/bin/ && \
20-
apk add -U ca-certificates wget curl bash
21-
22-
RUN curl -sSL https://raw.githubusercontent.com/andyshinn/alpine-pkg-glibc/master/andyshinn.rsa.pub -o /etc/apk/keys/andyshinn.rsa.pub && \
23-
curl -sSL https://github.com/andyshinn/alpine-pkg-glibc/releases/download/2.23-r1/glibc-2.23-r1.apk -O && \
24-
apk add glibc-2.23-r1.apk && rm /glibc-2.23-r1.apk
25-
26-
RUN curl -SL https://dl.influxdata.com/influxdb/releases/influxdb-${INFLUX_VERSION}-1_linux_amd64.tar.gz | tar xzC / && \
27-
chown influxdb:influxdb /usr/bin/influx* && \
28-
rm -rf /var/cache/apk/* /tmp/* /var/tmp/*
29-
30-
RUN \
31-
mkdir -p /data && \
32-
chown influxdb:influxdb /data
33-
34-
VOLUME /data
35-
36-
ADD https://github.com/arschles/envtpl/releases/download/0.2.3/envtpl_linux_amd64 /home/influxdb/envtpl
37-
COPY config.toml.tpl /home/influxdb/config.toml.tpl
38-
COPY start-influx /home/influxdb/start-influx
39-
40-
RUN chmod +x /home/influxdb/envtpl
41-
RUN chmod +x /home/influxdb/start-influx
42-
43-
USER influxdb
44-
WORKDIR /home/influxdb
45-
ENTRYPOINT ["./start-influx"]
35+
ENV WORKFLOW_RELEASE 2.0.0

influxdb/rootfs/config.toml.tpl renamed to influxdb/rootfs/home/influxdb/config.toml.tpl

File renamed without changes.

influxdb/rootfs/start-influx renamed to influxdb/rootfs/home/influxdb/start-influx

File renamed without changes.

‎telegraf/rootfs/Dockerfile‎

Lines changed: 10 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,14 @@
1-
FROM alpine:3.3
2-
MAINTAINER Jonathan Chauncey "<jchauncey@deis.com>"
1+
FROM quay.io/deis/base:0.2.0
32

4-
ENV TELEGRAF_VERSION=0.12.1
5-
ENV ENVTPL_VERSION=0.2.3
3+
COPY . /
64

7-
RUN \
8-
mkdir -p /usr/local/bin/ &&\
9-
apk --update add curl bash &&\
10-
curl -SL http://get.influxdb.org/telegraf/telegraf-${TELEGRAF_VERSION}-1_linux_amd64.tar.gz \
11-
| tar xzC / &&\
12-
rm -rf /var/cache/apk/* /tmp/* /var/tmp/*
13-
# Alpine telegraf fix
14-
RUN mkdir /lib64 && ln -s /lib/libc.musl-x86_64.so.1 /lib64/ld-linux-x86-64.so.2
5+
RUN mkdir -p /usr/local/bin/ \
6+
&& curl -SL -o /tmp/telegraf.deb https://dl.influxdata.com/telegraf/releases/telegraf_0.13.1_amd64.deb \
7+
&& dpkg -i /tmp/telegraf.deb \
8+
&& rm /tmp/telegraf.deb \
9+
&& curl -SL -o /usr/bin/envtpl https://github.com/arschles/envtpl/releases/download/0.2.3/envtpl_linux_amd64 \
10+
&& chmod +x /usr/bin/envtpl
1511

12+
CMD ["/start-telegraf"]
1613

17-
ADD https://github.com/arschles/envtpl/releases/download/${ENVTPL_VERSION}/envtpl_linux_amd64 /usr/bin/envtpl
18-
RUN chmod +x /usr/bin/envtpl
19-
20-
COPY start-telegraf /start-telegraf
21-
COPY config.toml.tpl /config.toml.tpl
22-
23-
ENTRYPOINT ["/start-telegraf"]
14+
ENV WORKFLOW_RELEASE 2.0.0

0 commit comments

Comments
 (0)