Update influxdb to Buster slim variant

influxdata · Aug 31, 2020 · 492b5c5 · 492b5c5
1 parent def1441
commit 492b5c5
Show file tree

Hide file tree

Showing 7 changed files with 237 additions and 99 deletions.
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

diff --git a/influxdb/1.7/data/Dockerfile b/influxdb/1.7/data/Dockerfile
@@ -1,20 +1,41 @@
-FROM buildpack-deps:stretch-curl
+FROM debian:buster-slim
 
-RUN set -ex && \
+ENV INFLUXDB_VERSION 1.7.10-c1.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';; \
+        *)     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/enterprise/releases/influxdb-data_${INFLUXDB_VERSION}_${ARCH}.deb.asc; \
+    wget --no-verbose https://dl.influxdata.com/enterprise/releases/influxdb-data_${INFLUXDB_VERSION}_${ARCH}.deb; \
+    gpg --batch --verify influxdb-data_${INFLUXDB_VERSION}_${ARCH}.deb.asc influxdb-data_${INFLUXDB_VERSION}_${ARCH}.deb; \
+    dpkg -i influxdb-data_${INFLUXDB_VERSION}_${ARCH}.deb; \
+    gpgconf --kill all; \
+    rm -f "$GNUPGHOME" influxdb-data_${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-c1.7.10
-RUN wget --no-verbose https://dl.influxdata.com/enterprise/releases/influxdb-data_${INFLUXDB_VERSION}_amd64.deb.asc && \
-    wget --no-verbose https://dl.influxdata.com/enterprise/releases/influxdb-data_${INFLUXDB_VERSION}_amd64.deb && \
-    gpg --batch --verify influxdb-data_${INFLUXDB_VERSION}_amd64.deb.asc influxdb-data_${INFLUXDB_VERSION}_amd64.deb && \
-    dpkg -i influxdb-data_${INFLUXDB_VERSION}_amd64.deb && \
-    rm -f influxdb-data_${INFLUXDB_VERSION}_amd64.deb*
 COPY influxdb.conf /etc/influxdb/influxdb.conf
 
 EXPOSE 8086

diff --git a/influxdb/1.7/meta/Dockerfile b/influxdb/1.7/meta/Dockerfile
@@ -1,20 +1,41 @@
-FROM buildpack-deps:stretch-curl
+FROM debian:buster-slim
 
-RUN set -ex && \
+ENV INFLUXDB_VERSION 1.7.10-c1.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';; \
+        *)     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/enterprise/releases/influxdb-meta_${INFLUXDB_VERSION}_${ARCH}.deb.asc; \
+    wget --no-verbose https://dl.influxdata.com/enterprise/releases/influxdb-meta_${INFLUXDB_VERSION}_${ARCH}.deb; \
+    gpg --batch --verify influxdb-meta_${INFLUXDB_VERSION}_${ARCH}.deb.asc influxdb-meta_${INFLUXDB_VERSION}_${ARCH}.deb; \
+    dpkg -i influxdb-meta_${INFLUXDB_VERSION}_${ARCH}.deb; \
+    gpgconf --kill all; \
+    rm -f "$GNUPGHOME" influxdb-meta_${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-c1.7.10
-RUN wget --no-verbose https://dl.influxdata.com/enterprise/releases/influxdb-meta_${INFLUXDB_VERSION}_amd64.deb.asc && \
-    wget --no-verbose https://dl.influxdata.com/enterprise/releases/influxdb-meta_${INFLUXDB_VERSION}_amd64.deb && \
-    gpg --batch --verify influxdb-meta_${INFLUXDB_VERSION}_amd64.deb.asc influxdb-meta_${INFLUXDB_VERSION}_amd64.deb && \
-    dpkg -i influxdb-meta_${INFLUXDB_VERSION}_amd64.deb && \
-    rm -f influxdb-meta_${INFLUXDB_VERSION}_amd64.deb*
 COPY influxdb-meta.conf /etc/influxdb/influxdb-meta.conf
 
 EXPOSE 8091

diff --git a/influxdb/1.8/Dockerfile b/influxdb/1.8/Dockerfile
@@ -1,28 +1,44 @@
-FROM buildpack-deps:stretch-curl
+FROM debian:buster-slim
 
-RUN set -ex && \
+ENV INFLUXDB_VERSION 1.8.2
+
+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.8.2
-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.8/data/Dockerfile b/influxdb/1.8/data/Dockerfile
@@ -1,20 +1,41 @@
-FROM buildpack-deps:stretch-curl
+FROM debian:buster-slim
 
-RUN set -ex && \
+ENV INFLUXDB_VERSION 1.8.2-c1.8.2
+
+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';; \
+        *)     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/enterprise/releases/influxdb-data_${INFLUXDB_VERSION}_${ARCH}.deb.asc; \
+    wget --no-verbose https://dl.influxdata.com/enterprise/releases/influxdb-data_${INFLUXDB_VERSION}_${ARCH}.deb; \
+    gpg --batch --verify influxdb-data_${INFLUXDB_VERSION}_${ARCH}.deb.asc influxdb-data_${INFLUXDB_VERSION}_${ARCH}.deb; \
+    dpkg -i influxdb-data_${INFLUXDB_VERSION}_${ARCH}.deb; \
+    gpgconf --kill all; \
+    rm -f "$GNUPGHOME" influxdb-data_${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.8.2-c1.8.2
-RUN wget --no-verbose https://dl.influxdata.com/enterprise/releases/influxdb-data_${INFLUXDB_VERSION}_amd64.deb.asc && \
-    wget --no-verbose https://dl.influxdata.com/enterprise/releases/influxdb-data_${INFLUXDB_VERSION}_amd64.deb && \
-    gpg --batch --verify influxdb-data_${INFLUXDB_VERSION}_amd64.deb.asc influxdb-data_${INFLUXDB_VERSION}_amd64.deb && \
-    dpkg -i influxdb-data_${INFLUXDB_VERSION}_amd64.deb && \
-    rm -f influxdb-data_${INFLUXDB_VERSION}_amd64.deb*
 COPY influxdb.conf /etc/influxdb/influxdb.conf
 
 EXPOSE 8086

diff --git a/influxdb/1.8/meta/Dockerfile b/influxdb/1.8/meta/Dockerfile
@@ -1,20 +1,41 @@
-FROM buildpack-deps:stretch-curl
+FROM debian:buster-slim
 
-RUN set -ex && \
+ENV INFLUXDB_VERSION 1.8.2-c1.8.2
+
+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';; \
+        *)     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/enterprise/releases/influxdb-meta_${INFLUXDB_VERSION}_${ARCH}.deb.asc; \
+    wget --no-verbose https://dl.influxdata.com/enterprise/releases/influxdb-meta_${INFLUXDB_VERSION}_${ARCH}.deb; \
+    gpg --batch --verify influxdb-meta_${INFLUXDB_VERSION}_${ARCH}.deb.asc influxdb-meta_${INFLUXDB_VERSION}_${ARCH}.deb; \
+    dpkg -i influxdb-meta_${INFLUXDB_VERSION}_${ARCH}.deb; \
+    gpgconf --kill all; \
+    rm -f "$GNUPGHOME" influxdb-meta_${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.8.2-c1.8.2
-RUN wget --no-verbose https://dl.influxdata.com/enterprise/releases/influxdb-meta_${INFLUXDB_VERSION}_amd64.deb.asc && \
-    wget --no-verbose https://dl.influxdata.com/enterprise/releases/influxdb-meta_${INFLUXDB_VERSION}_amd64.deb && \
-    gpg --batch --verify influxdb-meta_${INFLUXDB_VERSION}_amd64.deb.asc influxdb-meta_${INFLUXDB_VERSION}_amd64.deb && \
-    dpkg -i influxdb-meta_${INFLUXDB_VERSION}_amd64.deb && \
-    rm -f influxdb-meta_${INFLUXDB_VERSION}_amd64.deb*
 COPY influxdb-meta.conf /etc/influxdb/influxdb-meta.conf
 
 EXPOSE 8091

diff --git a/influxdb/nightly/Dockerfile b/influxdb/nightly/Dockerfile
@@ -1,19 +1,41 @@
-FROM buildpack-deps:jessie-curl
+FROM debian:buster-slim
 
-RUN set -ex && \
+ENV INFLUXDB_VERSION nightly
+
+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';; \
+        *)     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/nightlies/influxdb_${INFLUXDB_VERSION}_${ARCH}.deb.asc; \
+    wget --no-verbose https://dl.influxdata.com/influxdb/nightlies/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/*
 
-RUN wget --no-verbose https://dl.influxdata.com/influxdb/nightlies/influxdb_nightly_amd64.deb.asc && \
-    wget --no-verbose https://dl.influxdata.com/influxdb/nightlies/influxdb_nightly_amd64.deb && \
-    gpg --batch --verify influxdb_nightly_amd64.deb.asc influxdb_nightly_amd64.deb && \
-    dpkg -i influxdb_nightly_amd64.deb && \
-    rm -f influxdb_nightly_amd64.deb*
 COPY influxdb.conf /etc/influxdb/influxdb.conf
 
 EXPOSE 8083 8086