Update influxdb to Buster slim variant

influxdata · Mar 25, 2020 · b66752a · b66752a
1 parent 663aa81
commit b66752a
Show file tree

Hide file tree

Showing 3 changed files with 108 additions and 60 deletions.
diff --git a/influxdb/1.5/Dockerfile b/influxdb/1.5/Dockerfile
@@ -1,28 +1,44 @@
-FROM buildpack-deps:stretch-curl
+FROM debian:buster-slim
 
-RUN set -ex && \
+ENV INFLUXDB_VERSION 1.5.4
+
+RUN set -ex; \
+    fetchDeps=" \
+        ca-certificates \
+        gnupg \
+        dirmngr \
+        wget \
+    "; \
+    apt-get update; \
+    apt-get install -y --no-install-recommends $fetchDeps; \
+    \
+    ARCH= && dpkgArch="$(dpkg --print-architecture)"; \
+    case "${dpkgArch##*-}" in \
+        amd64) ARCH='amd64';; \
+        arm64) ARCH='arm64';; \
+        armhf) ARCH='armhf';; \
+        armel) ARCH='armel';; \
+        *)     echo "Unsupported architecture: ${dpkgArch}"; exit 1;; \
+    esac; \
+    \
     for key in \
         05CE15085FC09D18E99EFB22684A14CF2582E0C5 ; \
     do \
-        gpg --keyserver ha.pool.sks-keyservers.net --recv-keys "$key" || \
-        gpg --keyserver pgp.mit.edu --recv-keys "$key" || \
-        gpg --keyserver keyserver.pgp.com --recv-keys "$key" ; \
-    done
+        gpg --batch --keyserver ha.pool.sks-keyservers.net --recv-keys "$key" || \
+        gpg --batch --keyserver pgp.mit.edu --recv-keys "$key" || \
+        gpg --batch --keyserver keyserver.pgp.com --recv-keys "$key" ; \
+    done; \
+    \
+    wget --no-verbose https://dl.influxdata.com/influxdb/releases/influxdb_${INFLUXDB_VERSION}_${ARCH}.deb.asc; \
+    wget --no-verbose https://dl.influxdata.com/influxdb/releases/influxdb_${INFLUXDB_VERSION}_${ARCH}.deb; \
+    gpg --batch --verify influxdb_${INFLUXDB_VERSION}_${ARCH}.deb.asc influxdb_${INFLUXDB_VERSION}_${ARCH}.deb; \
+    dpkg -i influxdb_${INFLUXDB_VERSION}_${ARCH}.deb; \
+    gpgconf --kill all; \
+    rm -f "$GNUPGHOME" influxdb_${INFLUXDB_VERSION}_${ARCH}.deb*; \
+    \
+    apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false $fetchDeps; \
+    rm -rf /var/lib/apt/lists/*
 
-ENV INFLUXDB_VERSION 1.5.4
-RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" && \
-    case "${dpkgArch##*-}" in \
-      amd64) ARCH='amd64';; \
-      arm64) ARCH='arm64';; \
-      armhf) ARCH='armhf';; \
-      armel) ARCH='armel';; \
-      *)     echo "Unsupported architecture: ${dpkgArch}"; exit 1;; \
-    esac && \
-    wget --no-verbose https://dl.influxdata.com/influxdb/releases/influxdb_${INFLUXDB_VERSION}_${ARCH}.deb.asc && \
-    wget --no-verbose https://dl.influxdata.com/influxdb/releases/influxdb_${INFLUXDB_VERSION}_${ARCH}.deb && \
-    gpg --batch --verify influxdb_${INFLUXDB_VERSION}_${ARCH}.deb.asc influxdb_${INFLUXDB_VERSION}_${ARCH}.deb && \
-    dpkg -i influxdb_${INFLUXDB_VERSION}_${ARCH}.deb && \
-    rm -f influxdb_${INFLUXDB_VERSION}_${ARCH}.deb*
 COPY influxdb.conf /etc/influxdb/influxdb.conf
 
 EXPOSE 8086

diff --git a/influxdb/1.6/Dockerfile b/influxdb/1.6/Dockerfile
@@ -1,28 +1,44 @@
-FROM buildpack-deps:stretch-curl
+FROM debian:buster-slim
 
-RUN set -ex && \
+ENV INFLUXDB_VERSION 1.6.6
+
+RUN set -ex; \
+    fetchDeps=" \
+        ca-certificates \
+        gnupg \
+        dirmngr \
+        wget \
+    "; \
+    apt-get update; \
+    apt-get install -y --no-install-recommends $fetchDeps; \
+    \
+    ARCH= && dpkgArch="$(dpkg --print-architecture)"; \
+    case "${dpkgArch##*-}" in \
+        amd64) ARCH='amd64';; \
+        arm64) ARCH='arm64';; \
+        armhf) ARCH='armhf';; \
+        armel) ARCH='armel';; \
+        *)     echo "Unsupported architecture: ${dpkgArch}"; exit 1;; \
+    esac; \
+    \
     for key in \
         05CE15085FC09D18E99EFB22684A14CF2582E0C5 ; \
     do \
-        gpg --keyserver ha.pool.sks-keyservers.net --recv-keys "$key" || \
-        gpg --keyserver pgp.mit.edu --recv-keys "$key" || \
-        gpg --keyserver keyserver.pgp.com --recv-keys "$key" ; \
-    done
+        gpg --batch --keyserver ha.pool.sks-keyservers.net --recv-keys "$key" || \
+        gpg --batch --keyserver pgp.mit.edu --recv-keys "$key" || \
+        gpg --batch --keyserver keyserver.pgp.com --recv-keys "$key" ; \
+    done; \
+    \
+    wget --no-verbose https://dl.influxdata.com/influxdb/releases/influxdb_${INFLUXDB_VERSION}_${ARCH}.deb.asc; \
+    wget --no-verbose https://dl.influxdata.com/influxdb/releases/influxdb_${INFLUXDB_VERSION}_${ARCH}.deb; \
+    gpg --batch --verify influxdb_${INFLUXDB_VERSION}_${ARCH}.deb.asc influxdb_${INFLUXDB_VERSION}_${ARCH}.deb; \
+    dpkg -i influxdb_${INFLUXDB_VERSION}_${ARCH}.deb; \
+    gpgconf --kill all; \
+    rm -f "$GNUPGHOME" influxdb_${INFLUXDB_VERSION}_${ARCH}.deb*; \
+    \
+    apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false $fetchDeps; \
+    rm -rf /var/lib/apt/lists/*
 
-ENV INFLUXDB_VERSION 1.6.6
-RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" && \
-    case "${dpkgArch##*-}" in \
-      amd64) ARCH='amd64';; \
-      arm64) ARCH='arm64';; \
-      armhf) ARCH='armhf';; \
-      armel) ARCH='armel';; \
-      *)     echo "Unsupported architecture: ${dpkgArch}"; exit 1;; \
-    esac && \
-    wget --no-verbose https://dl.influxdata.com/influxdb/releases/influxdb_${INFLUXDB_VERSION}_${ARCH}.deb.asc && \
-    wget --no-verbose https://dl.influxdata.com/influxdb/releases/influxdb_${INFLUXDB_VERSION}_${ARCH}.deb && \
-    gpg --batch --verify influxdb_${INFLUXDB_VERSION}_${ARCH}.deb.asc influxdb_${INFLUXDB_VERSION}_${ARCH}.deb && \
-    dpkg -i influxdb_${INFLUXDB_VERSION}_${ARCH}.deb && \
-    rm -f influxdb_${INFLUXDB_VERSION}_${ARCH}.deb*
 COPY influxdb.conf /etc/influxdb/influxdb.conf
 
 EXPOSE 8086

diff --git a/influxdb/1.7/Dockerfile b/influxdb/1.7/Dockerfile
@@ -1,28 +1,44 @@
-FROM buildpack-deps:stretch-curl
+FROM debian:buster-slim
 
-RUN set -ex && \
+ENV INFLUXDB_VERSION 1.7.10
+
+RUN set -ex; \
+    fetchDeps=" \
+        ca-certificates \
+        gnupg \
+        dirmngr \
+        wget \
+    "; \
+    apt-get update; \
+    apt-get install -y --no-install-recommends $fetchDeps; \
+    \
+    ARCH= && dpkgArch="$(dpkg --print-architecture)"; \
+    case "${dpkgArch##*-}" in \
+        amd64) ARCH='amd64';; \
+        arm64) ARCH='arm64';; \
+        armhf) ARCH='armhf';; \
+        armel) ARCH='armel';; \
+        *)     echo "Unsupported architecture: ${dpkgArch}"; exit 1;; \
+    esac; \
+    \
     for key in \
         05CE15085FC09D18E99EFB22684A14CF2582E0C5 ; \
     do \
-        gpg --keyserver ha.pool.sks-keyservers.net --recv-keys "$key" || \
-        gpg --keyserver pgp.mit.edu --recv-keys "$key" || \
-        gpg --keyserver keyserver.pgp.com --recv-keys "$key" ; \
-    done
+        gpg --batch --keyserver ha.pool.sks-keyservers.net --recv-keys "$key" || \
+        gpg --batch --keyserver pgp.mit.edu --recv-keys "$key" || \
+        gpg --batch --keyserver keyserver.pgp.com --recv-keys "$key" ; \
+    done; \
+    \
+    wget --no-verbose https://dl.influxdata.com/influxdb/releases/influxdb_${INFLUXDB_VERSION}_${ARCH}.deb.asc; \
+    wget --no-verbose https://dl.influxdata.com/influxdb/releases/influxdb_${INFLUXDB_VERSION}_${ARCH}.deb; \
+    gpg --batch --verify influxdb_${INFLUXDB_VERSION}_${ARCH}.deb.asc influxdb_${INFLUXDB_VERSION}_${ARCH}.deb; \
+    dpkg -i influxdb_${INFLUXDB_VERSION}_${ARCH}.deb; \
+    gpgconf --kill all; \
+    rm -f "$GNUPGHOME" influxdb_${INFLUXDB_VERSION}_${ARCH}.deb*; \
+    \
+    apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false $fetchDeps; \
+    rm -rf /var/lib/apt/lists/*
 
-ENV INFLUXDB_VERSION 1.7.10
-RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" && \
-    case "${dpkgArch##*-}" in \
-      amd64) ARCH='amd64';; \
-      arm64) ARCH='arm64';; \
-      armhf) ARCH='armhf';; \
-      armel) ARCH='armel';; \
-      *)     echo "Unsupported architecture: ${dpkgArch}"; exit 1;; \
-    esac && \
-    wget --no-verbose https://dl.influxdata.com/influxdb/releases/influxdb_${INFLUXDB_VERSION}_${ARCH}.deb.asc && \
-    wget --no-verbose https://dl.influxdata.com/influxdb/releases/influxdb_${INFLUXDB_VERSION}_${ARCH}.deb && \
-    gpg --batch --verify influxdb_${INFLUXDB_VERSION}_${ARCH}.deb.asc influxdb_${INFLUXDB_VERSION}_${ARCH}.deb && \
-    dpkg -i influxdb_${INFLUXDB_VERSION}_${ARCH}.deb && \
-    rm -f influxdb_${INFLUXDB_VERSION}_${ARCH}.deb*
 COPY influxdb.conf /etc/influxdb/influxdb.conf
 
 EXPOSE 8086