Skip to content

Commit b66752a

Browse files
committed
Update influxdb to Buster slim variant
1 parent 663aa81 commit b66752a

File tree

3 files changed

+108
-60
lines changed

3 files changed

+108
-60
lines changed

influxdb/1.5/Dockerfile

+36-20
Original file line numberDiff line numberDiff line change
@@ -1,28 +1,44 @@
1-
FROM buildpack-deps:stretch-curl
1+
FROM debian:buster-slim
22

3-
RUN set -ex && \
3+
ENV INFLUXDB_VERSION 1.5.4
4+
5+
RUN set -ex; \
6+
fetchDeps=" \
7+
ca-certificates \
8+
gnupg \
9+
dirmngr \
10+
wget \
11+
"; \
12+
apt-get update; \
13+
apt-get install -y --no-install-recommends $fetchDeps; \
14+
\
15+
ARCH= && dpkgArch="$(dpkg --print-architecture)"; \
16+
case "${dpkgArch##*-}" in \
17+
amd64) ARCH='amd64';; \
18+
arm64) ARCH='arm64';; \
19+
armhf) ARCH='armhf';; \
20+
armel) ARCH='armel';; \
21+
*) echo "Unsupported architecture: ${dpkgArch}"; exit 1;; \
22+
esac; \
23+
\
424
for key in \
525
05CE15085FC09D18E99EFB22684A14CF2582E0C5 ; \
626
do \
7-
gpg --keyserver ha.pool.sks-keyservers.net --recv-keys "$key" || \
8-
gpg --keyserver pgp.mit.edu --recv-keys "$key" || \
9-
gpg --keyserver keyserver.pgp.com --recv-keys "$key" ; \
10-
done
27+
gpg --batch --keyserver ha.pool.sks-keyservers.net --recv-keys "$key" || \
28+
gpg --batch --keyserver pgp.mit.edu --recv-keys "$key" || \
29+
gpg --batch --keyserver keyserver.pgp.com --recv-keys "$key" ; \
30+
done; \
31+
\
32+
wget --no-verbose https://dl.influxdata.com/influxdb/releases/influxdb_${INFLUXDB_VERSION}_${ARCH}.deb.asc; \
33+
wget --no-verbose https://dl.influxdata.com/influxdb/releases/influxdb_${INFLUXDB_VERSION}_${ARCH}.deb; \
34+
gpg --batch --verify influxdb_${INFLUXDB_VERSION}_${ARCH}.deb.asc influxdb_${INFLUXDB_VERSION}_${ARCH}.deb; \
35+
dpkg -i influxdb_${INFLUXDB_VERSION}_${ARCH}.deb; \
36+
gpgconf --kill all; \
37+
rm -f "$GNUPGHOME" influxdb_${INFLUXDB_VERSION}_${ARCH}.deb*; \
38+
\
39+
apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false $fetchDeps; \
40+
rm -rf /var/lib/apt/lists/*
1141

12-
ENV INFLUXDB_VERSION 1.5.4
13-
RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" && \
14-
case "${dpkgArch##*-}" in \
15-
amd64) ARCH='amd64';; \
16-
arm64) ARCH='arm64';; \
17-
armhf) ARCH='armhf';; \
18-
armel) ARCH='armel';; \
19-
*) echo "Unsupported architecture: ${dpkgArch}"; exit 1;; \
20-
esac && \
21-
wget --no-verbose https://dl.influxdata.com/influxdb/releases/influxdb_${INFLUXDB_VERSION}_${ARCH}.deb.asc && \
22-
wget --no-verbose https://dl.influxdata.com/influxdb/releases/influxdb_${INFLUXDB_VERSION}_${ARCH}.deb && \
23-
gpg --batch --verify influxdb_${INFLUXDB_VERSION}_${ARCH}.deb.asc influxdb_${INFLUXDB_VERSION}_${ARCH}.deb && \
24-
dpkg -i influxdb_${INFLUXDB_VERSION}_${ARCH}.deb && \
25-
rm -f influxdb_${INFLUXDB_VERSION}_${ARCH}.deb*
2642
COPY influxdb.conf /etc/influxdb/influxdb.conf
2743

2844
EXPOSE 8086

influxdb/1.6/Dockerfile

+36-20
Original file line numberDiff line numberDiff line change
@@ -1,28 +1,44 @@
1-
FROM buildpack-deps:stretch-curl
1+
FROM debian:buster-slim
22

3-
RUN set -ex && \
3+
ENV INFLUXDB_VERSION 1.6.6
4+
5+
RUN set -ex; \
6+
fetchDeps=" \
7+
ca-certificates \
8+
gnupg \
9+
dirmngr \
10+
wget \
11+
"; \
12+
apt-get update; \
13+
apt-get install -y --no-install-recommends $fetchDeps; \
14+
\
15+
ARCH= && dpkgArch="$(dpkg --print-architecture)"; \
16+
case "${dpkgArch##*-}" in \
17+
amd64) ARCH='amd64';; \
18+
arm64) ARCH='arm64';; \
19+
armhf) ARCH='armhf';; \
20+
armel) ARCH='armel';; \
21+
*) echo "Unsupported architecture: ${dpkgArch}"; exit 1;; \
22+
esac; \
23+
\
424
for key in \
525
05CE15085FC09D18E99EFB22684A14CF2582E0C5 ; \
626
do \
7-
gpg --keyserver ha.pool.sks-keyservers.net --recv-keys "$key" || \
8-
gpg --keyserver pgp.mit.edu --recv-keys "$key" || \
9-
gpg --keyserver keyserver.pgp.com --recv-keys "$key" ; \
10-
done
27+
gpg --batch --keyserver ha.pool.sks-keyservers.net --recv-keys "$key" || \
28+
gpg --batch --keyserver pgp.mit.edu --recv-keys "$key" || \
29+
gpg --batch --keyserver keyserver.pgp.com --recv-keys "$key" ; \
30+
done; \
31+
\
32+
wget --no-verbose https://dl.influxdata.com/influxdb/releases/influxdb_${INFLUXDB_VERSION}_${ARCH}.deb.asc; \
33+
wget --no-verbose https://dl.influxdata.com/influxdb/releases/influxdb_${INFLUXDB_VERSION}_${ARCH}.deb; \
34+
gpg --batch --verify influxdb_${INFLUXDB_VERSION}_${ARCH}.deb.asc influxdb_${INFLUXDB_VERSION}_${ARCH}.deb; \
35+
dpkg -i influxdb_${INFLUXDB_VERSION}_${ARCH}.deb; \
36+
gpgconf --kill all; \
37+
rm -f "$GNUPGHOME" influxdb_${INFLUXDB_VERSION}_${ARCH}.deb*; \
38+
\
39+
apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false $fetchDeps; \
40+
rm -rf /var/lib/apt/lists/*
1141

12-
ENV INFLUXDB_VERSION 1.6.6
13-
RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" && \
14-
case "${dpkgArch##*-}" in \
15-
amd64) ARCH='amd64';; \
16-
arm64) ARCH='arm64';; \
17-
armhf) ARCH='armhf';; \
18-
armel) ARCH='armel';; \
19-
*) echo "Unsupported architecture: ${dpkgArch}"; exit 1;; \
20-
esac && \
21-
wget --no-verbose https://dl.influxdata.com/influxdb/releases/influxdb_${INFLUXDB_VERSION}_${ARCH}.deb.asc && \
22-
wget --no-verbose https://dl.influxdata.com/influxdb/releases/influxdb_${INFLUXDB_VERSION}_${ARCH}.deb && \
23-
gpg --batch --verify influxdb_${INFLUXDB_VERSION}_${ARCH}.deb.asc influxdb_${INFLUXDB_VERSION}_${ARCH}.deb && \
24-
dpkg -i influxdb_${INFLUXDB_VERSION}_${ARCH}.deb && \
25-
rm -f influxdb_${INFLUXDB_VERSION}_${ARCH}.deb*
2642
COPY influxdb.conf /etc/influxdb/influxdb.conf
2743

2844
EXPOSE 8086

influxdb/1.7/Dockerfile

+36-20
Original file line numberDiff line numberDiff line change
@@ -1,28 +1,44 @@
1-
FROM buildpack-deps:stretch-curl
1+
FROM debian:buster-slim
22

3-
RUN set -ex && \
3+
ENV INFLUXDB_VERSION 1.7.10
4+
5+
RUN set -ex; \
6+
fetchDeps=" \
7+
ca-certificates \
8+
gnupg \
9+
dirmngr \
10+
wget \
11+
"; \
12+
apt-get update; \
13+
apt-get install -y --no-install-recommends $fetchDeps; \
14+
\
15+
ARCH= && dpkgArch="$(dpkg --print-architecture)"; \
16+
case "${dpkgArch##*-}" in \
17+
amd64) ARCH='amd64';; \
18+
arm64) ARCH='arm64';; \
19+
armhf) ARCH='armhf';; \
20+
armel) ARCH='armel';; \
21+
*) echo "Unsupported architecture: ${dpkgArch}"; exit 1;; \
22+
esac; \
23+
\
424
for key in \
525
05CE15085FC09D18E99EFB22684A14CF2582E0C5 ; \
626
do \
7-
gpg --keyserver ha.pool.sks-keyservers.net --recv-keys "$key" || \
8-
gpg --keyserver pgp.mit.edu --recv-keys "$key" || \
9-
gpg --keyserver keyserver.pgp.com --recv-keys "$key" ; \
10-
done
27+
gpg --batch --keyserver ha.pool.sks-keyservers.net --recv-keys "$key" || \
28+
gpg --batch --keyserver pgp.mit.edu --recv-keys "$key" || \
29+
gpg --batch --keyserver keyserver.pgp.com --recv-keys "$key" ; \
30+
done; \
31+
\
32+
wget --no-verbose https://dl.influxdata.com/influxdb/releases/influxdb_${INFLUXDB_VERSION}_${ARCH}.deb.asc; \
33+
wget --no-verbose https://dl.influxdata.com/influxdb/releases/influxdb_${INFLUXDB_VERSION}_${ARCH}.deb; \
34+
gpg --batch --verify influxdb_${INFLUXDB_VERSION}_${ARCH}.deb.asc influxdb_${INFLUXDB_VERSION}_${ARCH}.deb; \
35+
dpkg -i influxdb_${INFLUXDB_VERSION}_${ARCH}.deb; \
36+
gpgconf --kill all; \
37+
rm -f "$GNUPGHOME" influxdb_${INFLUXDB_VERSION}_${ARCH}.deb*; \
38+
\
39+
apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false $fetchDeps; \
40+
rm -rf /var/lib/apt/lists/*
1141

12-
ENV INFLUXDB_VERSION 1.7.10
13-
RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" && \
14-
case "${dpkgArch##*-}" in \
15-
amd64) ARCH='amd64';; \
16-
arm64) ARCH='arm64';; \
17-
armhf) ARCH='armhf';; \
18-
armel) ARCH='armel';; \
19-
*) echo "Unsupported architecture: ${dpkgArch}"; exit 1;; \
20-
esac && \
21-
wget --no-verbose https://dl.influxdata.com/influxdb/releases/influxdb_${INFLUXDB_VERSION}_${ARCH}.deb.asc && \
22-
wget --no-verbose https://dl.influxdata.com/influxdb/releases/influxdb_${INFLUXDB_VERSION}_${ARCH}.deb && \
23-
gpg --batch --verify influxdb_${INFLUXDB_VERSION}_${ARCH}.deb.asc influxdb_${INFLUXDB_VERSION}_${ARCH}.deb && \
24-
dpkg -i influxdb_${INFLUXDB_VERSION}_${ARCH}.deb && \
25-
rm -f influxdb_${INFLUXDB_VERSION}_${ARCH}.deb*
2642
COPY influxdb.conf /etc/influxdb/influxdb.conf
2743

2844
EXPOSE 8086

0 commit comments

Comments
 (0)