diff --git a/chronograf/1.10/Dockerfile b/chronograf/1.10/Dockerfile index 286703ca4..cb5fe545c 100644 --- a/chronograf/1.10/Dockerfile +++ b/chronograf/1.10/Dockerfile @@ -1,15 +1,17 @@ FROM debian:bullseye-slim -RUN set -ex && \ - mkdir ~/.gnupg; \ - echo "disable-ipv6" >> ~/.gnupg/dirmngr.conf; \ - apt-get update && apt-get install -y gnupg ca-certificates dirmngr --no-install-recommends && \ - rm -rf /var/lib/apt/lists/* && \ - for key in \ - 05CE15085FC09D18E99EFB22684A14CF2582E0C5 ; \ - do \ - gpg --keyserver hkp://keyserver.ubuntu.com --recv-keys "$key" ; \ - done +RUN apt-get update && \ + apt-get install \ + --yes \ + --no-install-recommends \ + ca-certificates \ + curl \ + gnupg && \ + rm -rf /var/lib/apt/lists + +RUN gpg --yes --batch \ + --keyserver hkps://keyserver.ubuntu.com:443 \ + --recv-keys 05CE15085FC09D18E99EFB22684A14CF2582E0C5 ENV CHRONOGRAF_VERSION 1.10.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" && \ @@ -21,14 +23,11 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" && \ *) echo "Unsupported architecture: ${dpkgArch}"; exit 1;; \ esac && \ set -x && \ - apt-get update && apt-get install -y ca-certificates curl --no-install-recommends && \ - rm -rf /var/lib/apt/lists/* && \ curl -SLO "https://dl.influxdata.com/chronograf/releases/chronograf_${CHRONOGRAF_VERSION}_${ARCH}.deb.asc" && \ curl -SLO "https://dl.influxdata.com/chronograf/releases/chronograf_${CHRONOGRAF_VERSION}_${ARCH}.deb" && \ gpg --batch --verify chronograf_${CHRONOGRAF_VERSION}_${ARCH}.deb.asc chronograf_${CHRONOGRAF_VERSION}_${ARCH}.deb && \ dpkg -i chronograf_${CHRONOGRAF_VERSION}_${ARCH}.deb && \ - rm -f chronograf_${CHRONOGRAF_VERSION}_${ARCH}.deb* && \ - apt-get purge -y --auto-remove $buildDeps + rm -f chronograf_${CHRONOGRAF_VERSION}_${ARCH}.deb* COPY LICENSE /usr/share/chronograf/LICENSE COPY agpl-3.0.md /usr/share/chronograf/agpl-3.0.md diff --git a/chronograf/1.10/alpine/Dockerfile b/chronograf/1.10/alpine/Dockerfile index 9e4582661..6d913aaae 100644 --- a/chronograf/1.10/alpine/Dockerfile +++ b/chronograf/1.10/alpine/Dockerfile @@ -1,20 +1,17 @@ -FROM alpine:3.14 +FROM alpine:latest RUN echo 'hosts: files dns' >> /etc/nsswitch.conf -RUN apk add --no-cache ca-certificates && \ +RUN apk add --no-cache ca-certificates gnupg && \ update-ca-certificates +RUN gpg --yes --batch \ + --keyserver hkps://keyserver.ubuntu.com:443 \ + --recv-keys 05CE15085FC09D18E99EFB22684A14CF2582E0C5 + ENV CHRONOGRAF_VERSION 1.10.0 RUN set -ex && \ - mkdir ~/.gnupg; \ - echo "disable-ipv6" >> ~/.gnupg/dirmngr.conf; \ - apk add --no-cache --virtual .build-deps wget gnupg tar && \ - for key in \ - 05CE15085FC09D18E99EFB22684A14CF2582E0C5 ; \ - do \ - gpg --keyserver hkp://keyserver.ubuntu.com --recv-keys "$key" ; \ - done && \ + apk add --no-cache --virtual .build-deps wget tar && \ wget --no-verbose https://dl.influxdata.com/chronograf/releases/chronograf-${CHRONOGRAF_VERSION}-static_linux_amd64.tar.gz.asc && \ wget --no-verbose https://dl.influxdata.com/chronograf/releases/chronograf-${CHRONOGRAF_VERSION}-static_linux_amd64.tar.gz && \ gpg --batch --verify chronograf-${CHRONOGRAF_VERSION}-static_linux_amd64.tar.gz.asc chronograf-${CHRONOGRAF_VERSION}-static_linux_amd64.tar.gz && \ @@ -23,8 +20,7 @@ RUN set -ex && \ rm -f /usr/src/chronograf-*/chronograf.conf && \ chmod +x /usr/src/chronograf-*/* && \ cp -a /usr/src/chronograf-*/* /usr/bin/ && \ - gpgconf --kill all && \ - rm -rf *.tar.gz* /usr/src /root/.gnupg && \ + rm -rf *.tar.gz* /usr/src && \ apk del .build-deps COPY LICENSE /usr/share/chronograf/LICENSE diff --git a/chronograf/1.6/Dockerfile b/chronograf/1.6/Dockerfile index 714f5719a..8b1980894 100644 --- a/chronograf/1.6/Dockerfile +++ b/chronograf/1.6/Dockerfile @@ -1,15 +1,17 @@ FROM debian:bullseye-slim -RUN set -ex && \ - mkdir ~/.gnupg; \ - echo "disable-ipv6" >> ~/.gnupg/dirmngr.conf; \ - apt-get update && apt-get install -y gnupg ca-certificates dirmngr --no-install-recommends && \ - rm -rf /var/lib/apt/lists/* && \ - for key in \ - 05CE15085FC09D18E99EFB22684A14CF2582E0C5 ; \ - do \ - gpg --keyserver hkp://keyserver.ubuntu.com --recv-keys "$key" ; \ - done +RUN apt-get update && \ + apt-get install \ + --yes \ + --no-install-recommends \ + ca-certificates \ + curl \ + gnupg && \ + rm -rf /var/lib/apt/lists + +RUN gpg --yes --batch \ + --keyserver hkps://keyserver.ubuntu.com:443 \ + --recv-keys 05CE15085FC09D18E99EFB22684A14CF2582E0C5 ENV CHRONOGRAF_VERSION 1.6.2 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" && \ @@ -21,14 +23,11 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" && \ *) echo "Unsupported architecture: ${dpkgArch}"; exit 1;; \ esac && \ set -x && \ - apt-get update && apt-get install -y ca-certificates curl --no-install-recommends && \ - rm -rf /var/lib/apt/lists/* && \ curl -SLO "https://dl.influxdata.com/chronograf/releases/chronograf_${CHRONOGRAF_VERSION}_${ARCH}.deb.asc" && \ curl -SLO "https://dl.influxdata.com/chronograf/releases/chronograf_${CHRONOGRAF_VERSION}_${ARCH}.deb" && \ gpg --batch --verify chronograf_${CHRONOGRAF_VERSION}_${ARCH}.deb.asc chronograf_${CHRONOGRAF_VERSION}_${ARCH}.deb && \ dpkg -i chronograf_${CHRONOGRAF_VERSION}_${ARCH}.deb && \ - rm -f chronograf_${CHRONOGRAF_VERSION}_${ARCH}.deb* && \ - apt-get purge -y --auto-remove $buildDeps + rm -f chronograf_${CHRONOGRAF_VERSION}_${ARCH}.deb* COPY LICENSE /usr/share/chronograf/LICENSE COPY agpl-3.0.md /usr/share/chronograf/agpl-3.0.md diff --git a/chronograf/1.6/alpine/Dockerfile b/chronograf/1.6/alpine/Dockerfile index b102c33fb..6edc06f10 100644 --- a/chronograf/1.6/alpine/Dockerfile +++ b/chronograf/1.6/alpine/Dockerfile @@ -1,20 +1,17 @@ -FROM alpine:3.14 +FROM alpine:latest RUN echo 'hosts: files dns' >> /etc/nsswitch.conf -RUN apk add --no-cache ca-certificates && \ +RUN apk add --no-cache ca-certificates gnupg && \ update-ca-certificates +RUN gpg --yes --batch \ + --keyserver hkps://keyserver.ubuntu.com:443 \ + --recv-keys 05CE15085FC09D18E99EFB22684A14CF2582E0C5 + ENV CHRONOGRAF_VERSION 1.6.2 RUN set -ex && \ - mkdir ~/.gnupg; \ - echo "disable-ipv6" >> ~/.gnupg/dirmngr.conf; \ - apk add --no-cache --virtual .build-deps wget gnupg tar && \ - for key in \ - 05CE15085FC09D18E99EFB22684A14CF2582E0C5 ; \ - do \ - gpg --keyserver hkp://keyserver.ubuntu.com --recv-keys "$key" ; \ - done && \ + apk add --no-cache --virtual .build-deps wget tar && \ wget --no-verbose https://dl.influxdata.com/chronograf/releases/chronograf-${CHRONOGRAF_VERSION}-static_linux_amd64.tar.gz.asc && \ wget --no-verbose https://dl.influxdata.com/chronograf/releases/chronograf-${CHRONOGRAF_VERSION}-static_linux_amd64.tar.gz && \ gpg --batch --verify chronograf-${CHRONOGRAF_VERSION}-static_linux_amd64.tar.gz.asc chronograf-${CHRONOGRAF_VERSION}-static_linux_amd64.tar.gz && \ @@ -23,8 +20,7 @@ RUN set -ex && \ rm -f /usr/src/chronograf-*/chronograf.conf && \ chmod +x /usr/src/chronograf-*/* && \ cp -a /usr/src/chronograf-*/* /usr/bin/ && \ - gpgconf --kill all && \ - rm -rf *.tar.gz* /usr/src /root/.gnupg && \ + rm -rf *.tar.gz* /usr/src && \ apk del .build-deps COPY LICENSE /usr/share/chronograf/LICENSE diff --git a/chronograf/1.7/Dockerfile b/chronograf/1.7/Dockerfile index c2a7599be..e4207c025 100644 --- a/chronograf/1.7/Dockerfile +++ b/chronograf/1.7/Dockerfile @@ -1,15 +1,17 @@ FROM debian:bullseye-slim -RUN set -ex && \ - mkdir ~/.gnupg; \ - echo "disable-ipv6" >> ~/.gnupg/dirmngr.conf; \ - apt-get update && apt-get install -y gnupg dirmngr --no-install-recommends && \ - rm -rf /var/lib/apt/lists/* && \ - for key in \ - 05CE15085FC09D18E99EFB22684A14CF2582E0C5 ; \ - do \ - gpg --keyserver hkp://keyserver.ubuntu.com --recv-keys "$key" ; \ - done +RUN apt-get update && \ + apt-get install \ + --yes \ + --no-install-recommends \ + ca-certificates \ + curl \ + gnupg && \ + rm -rf /var/lib/apt/lists + +RUN gpg --yes --batch \ + --keyserver hkps://keyserver.ubuntu.com:443 \ + --recv-keys 05CE15085FC09D18E99EFB22684A14CF2582E0C5 ENV CHRONOGRAF_VERSION 1.7.17 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" && \ @@ -27,8 +29,7 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" && \ curl -SLO "https://dl.influxdata.com/chronograf/releases/chronograf_${CHRONOGRAF_VERSION}_${ARCH}.deb" && \ gpg --batch --verify chronograf_${CHRONOGRAF_VERSION}_${ARCH}.deb.asc chronograf_${CHRONOGRAF_VERSION}_${ARCH}.deb && \ dpkg -i chronograf_${CHRONOGRAF_VERSION}_${ARCH}.deb && \ - rm -f chronograf_${CHRONOGRAF_VERSION}_${ARCH}.deb* && \ - apt-get purge -y --auto-remove $buildDeps + rm -f chronograf_${CHRONOGRAF_VERSION}_${ARCH}.deb* COPY LICENSE /usr/share/chronograf/LICENSE COPY agpl-3.0.md /usr/share/chronograf/agpl-3.0.md diff --git a/chronograf/1.7/alpine/Dockerfile b/chronograf/1.7/alpine/Dockerfile index b5bdc8514..8cb7a4c3b 100644 --- a/chronograf/1.7/alpine/Dockerfile +++ b/chronograf/1.7/alpine/Dockerfile @@ -1,20 +1,16 @@ -FROM alpine:3.14 +FROM alpine:latest RUN echo 'hosts: files dns' >> /etc/nsswitch.conf -RUN apk add --no-cache ca-certificates && \ +RUN apk add --no-cache ca-certificates gnupg && \ update-ca-certificates -ENV CHRONOGRAF_VERSION 1.7.17 +RUN gpg --yes --batch \ + --keyserver hkps://keyserver.ubuntu.com:443 \ + --recv-keys 05CE15085FC09D18E99EFB22684A14CF2582E0C5 +ENV CHRONOGRAF_VERSION 1.7.17 RUN set -ex && \ - mkdir ~/.gnupg; \ - echo "disable-ipv6" >> ~/.gnupg/dirmngr.conf; \ - apk add --no-cache --virtual .build-deps wget gnupg tar && \ - for key in \ - 05CE15085FC09D18E99EFB22684A14CF2582E0C5 ; \ - do \ - gpg --keyserver hkp://keyserver.ubuntu.com --recv-keys "$key" ; \ - done && \ + apk add --no-cache --virtual .build-deps wget tar && \ wget --no-verbose https://dl.influxdata.com/chronograf/releases/chronograf-${CHRONOGRAF_VERSION}-static_linux_amd64.tar.gz.asc && \ wget --no-verbose https://dl.influxdata.com/chronograf/releases/chronograf-${CHRONOGRAF_VERSION}-static_linux_amd64.tar.gz && \ gpg --batch --verify chronograf-${CHRONOGRAF_VERSION}-static_linux_amd64.tar.gz.asc chronograf-${CHRONOGRAF_VERSION}-static_linux_amd64.tar.gz && \ @@ -23,8 +19,7 @@ RUN set -ex && \ rm -f /usr/src/chronograf-*/chronograf.conf && \ chmod +x /usr/src/chronograf-*/* && \ cp -a /usr/src/chronograf-*/* /usr/bin/ && \ - gpgconf --kill all && \ - rm -rf *.tar.gz* /usr/src /root/.gnupg && \ + rm -rf *.tar.gz* /usr/src && \ apk del .build-deps COPY LICENSE /usr/share/chronograf/LICENSE diff --git a/chronograf/1.8/Dockerfile b/chronograf/1.8/Dockerfile index c8c16990b..dc3b14fb6 100644 --- a/chronograf/1.8/Dockerfile +++ b/chronograf/1.8/Dockerfile @@ -1,15 +1,17 @@ FROM debian:bullseye-slim -RUN set -ex && \ - mkdir ~/.gnupg; \ - echo "disable-ipv6" >> ~/.gnupg/dirmngr.conf; \ - apt-get update && apt-get install -y gnupg ca-certificates dirmngr --no-install-recommends && \ - rm -rf /var/lib/apt/lists/* && \ - for key in \ - 05CE15085FC09D18E99EFB22684A14CF2582E0C5 ; \ - do \ - gpg --keyserver hkp://keyserver.ubuntu.com --recv-keys "$key" ; \ - done +RUN apt-get update && \ + apt-get install \ + --yes \ + --no-install-recommends \ + ca-certificates \ + curl \ + gnupg && \ + rm -rf /var/lib/apt/lists + +RUN gpg --yes --batch \ + --keyserver hkps://keyserver.ubuntu.com:443 \ + --recv-keys 05CE15085FC09D18E99EFB22684A14CF2582E0C5 ENV CHRONOGRAF_VERSION 1.8.10 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" && \ @@ -21,14 +23,11 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" && \ *) echo "Unsupported architecture: ${dpkgArch}"; exit 1;; \ esac && \ set -x && \ - apt-get update && apt-get install -y ca-certificates curl --no-install-recommends && \ - rm -rf /var/lib/apt/lists/* && \ curl -SLO "https://dl.influxdata.com/chronograf/releases/chronograf_${CHRONOGRAF_VERSION}_${ARCH}.deb.asc" && \ curl -SLO "https://dl.influxdata.com/chronograf/releases/chronograf_${CHRONOGRAF_VERSION}_${ARCH}.deb" && \ gpg --batch --verify chronograf_${CHRONOGRAF_VERSION}_${ARCH}.deb.asc chronograf_${CHRONOGRAF_VERSION}_${ARCH}.deb && \ dpkg -i chronograf_${CHRONOGRAF_VERSION}_${ARCH}.deb && \ - rm -f chronograf_${CHRONOGRAF_VERSION}_${ARCH}.deb* && \ - apt-get purge -y --auto-remove $buildDeps + rm -f chronograf_${CHRONOGRAF_VERSION}_${ARCH}.deb* COPY LICENSE /usr/share/chronograf/LICENSE COPY agpl-3.0.md /usr/share/chronograf/agpl-3.0.md diff --git a/chronograf/1.8/alpine/Dockerfile b/chronograf/1.8/alpine/Dockerfile index f7ef5fde9..3865823e2 100644 --- a/chronograf/1.8/alpine/Dockerfile +++ b/chronograf/1.8/alpine/Dockerfile @@ -1,20 +1,17 @@ -FROM alpine:3.14 +FROM alpine:latest RUN echo 'hosts: files dns' >> /etc/nsswitch.conf -RUN apk add --no-cache ca-certificates && \ +RUN apk add --no-cache ca-certificates gnupg && \ update-ca-certificates +RUN gpg --yes --batch \ + --keyserver hkps://keyserver.ubuntu.com:443 \ + --recv-keys 05CE15085FC09D18E99EFB22684A14CF2582E0C5 + ENV CHRONOGRAF_VERSION 1.8.10 RUN set -ex && \ - mkdir ~/.gnupg; \ - echo "disable-ipv6" >> ~/.gnupg/dirmngr.conf; \ - apk add --no-cache --virtual .build-deps wget gnupg tar && \ - for key in \ - 05CE15085FC09D18E99EFB22684A14CF2582E0C5 ; \ - do \ - gpg --keyserver hkp://keyserver.ubuntu.com --recv-keys "$key" ; \ - done && \ + apk add --no-cache --virtual .build-deps wget tar && \ wget --no-verbose https://dl.influxdata.com/chronograf/releases/chronograf-${CHRONOGRAF_VERSION}-static_linux_amd64.tar.gz.asc && \ wget --no-verbose https://dl.influxdata.com/chronograf/releases/chronograf-${CHRONOGRAF_VERSION}-static_linux_amd64.tar.gz && \ gpg --batch --verify chronograf-${CHRONOGRAF_VERSION}-static_linux_amd64.tar.gz.asc chronograf-${CHRONOGRAF_VERSION}-static_linux_amd64.tar.gz && \ @@ -23,8 +20,7 @@ RUN set -ex && \ rm -f /usr/src/chronograf-*/chronograf.conf && \ chmod +x /usr/src/chronograf-*/* && \ cp -a /usr/src/chronograf-*/* /usr/bin/ && \ - gpgconf --kill all && \ - rm -rf *.tar.gz* /usr/src /root/.gnupg && \ + rm -rf *.tar.gz* /usr/src && \ apk del .build-deps COPY LICENSE /usr/share/chronograf/LICENSE diff --git a/chronograf/1.9/Dockerfile b/chronograf/1.9/Dockerfile index 63dbc4f70..2d8252eea 100644 --- a/chronograf/1.9/Dockerfile +++ b/chronograf/1.9/Dockerfile @@ -1,15 +1,17 @@ FROM debian:bullseye-slim -RUN set -ex && \ - mkdir ~/.gnupg; \ - echo "disable-ipv6" >> ~/.gnupg/dirmngr.conf; \ - apt-get update && apt-get install -y gnupg ca-certificates dirmngr --no-install-recommends && \ - rm -rf /var/lib/apt/lists/* && \ - for key in \ - 05CE15085FC09D18E99EFB22684A14CF2582E0C5 ; \ - do \ - gpg --keyserver hkp://keyserver.ubuntu.com --recv-keys "$key" ; \ - done +RUN apt-get update && \ + apt-get install \ + --yes \ + --no-install-recommends \ + ca-certificates \ + curl \ + gnupg && \ + rm -rf /var/lib/apt/lists + +RUN gpg --yes --batch \ + --keyserver hkps://keyserver.ubuntu.com:443 \ + --recv-keys 05CE15085FC09D18E99EFB22684A14CF2582E0C5 ENV CHRONOGRAF_VERSION 1.9.4 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" && \ @@ -21,14 +23,11 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" && \ *) echo "Unsupported architecture: ${dpkgArch}"; exit 1;; \ esac && \ set -x && \ - apt-get update && apt-get install -y ca-certificates curl --no-install-recommends && \ - rm -rf /var/lib/apt/lists/* && \ curl -SLO "https://dl.influxdata.com/chronograf/releases/chronograf_${CHRONOGRAF_VERSION}_${ARCH}.deb.asc" && \ curl -SLO "https://dl.influxdata.com/chronograf/releases/chronograf_${CHRONOGRAF_VERSION}_${ARCH}.deb" && \ gpg --batch --verify chronograf_${CHRONOGRAF_VERSION}_${ARCH}.deb.asc chronograf_${CHRONOGRAF_VERSION}_${ARCH}.deb && \ dpkg -i chronograf_${CHRONOGRAF_VERSION}_${ARCH}.deb && \ - rm -f chronograf_${CHRONOGRAF_VERSION}_${ARCH}.deb* && \ - apt-get purge -y --auto-remove $buildDeps + rm -f chronograf_${CHRONOGRAF_VERSION}_${ARCH}.deb* COPY LICENSE /usr/share/chronograf/LICENSE COPY agpl-3.0.md /usr/share/chronograf/agpl-3.0.md diff --git a/chronograf/1.9/alpine/Dockerfile b/chronograf/1.9/alpine/Dockerfile index b1d6ca844..28329df16 100644 --- a/chronograf/1.9/alpine/Dockerfile +++ b/chronograf/1.9/alpine/Dockerfile @@ -1,20 +1,17 @@ -FROM alpine:3.14 +FROM alpine:latest RUN echo 'hosts: files dns' >> /etc/nsswitch.conf -RUN apk add --no-cache ca-certificates && \ +RUN apk add --no-cache ca-certificates gnupg && \ update-ca-certificates +RUN gpg --yes --batch \ + --keyserver hkps://keyserver.ubuntu.com:443 \ + --recv-keys 05CE15085FC09D18E99EFB22684A14CF2582E0C5 + ENV CHRONOGRAF_VERSION 1.9.4 RUN set -ex && \ - mkdir ~/.gnupg; \ - echo "disable-ipv6" >> ~/.gnupg/dirmngr.conf; \ - apk add --no-cache --virtual .build-deps wget gnupg tar && \ - for key in \ - 05CE15085FC09D18E99EFB22684A14CF2582E0C5 ; \ - do \ - gpg --keyserver hkp://keyserver.ubuntu.com --recv-keys "$key" ; \ - done && \ + apk add --no-cache --virtual .build-deps wget tar && \ wget --no-verbose https://dl.influxdata.com/chronograf/releases/chronograf-${CHRONOGRAF_VERSION}-static_linux_amd64.tar.gz.asc && \ wget --no-verbose https://dl.influxdata.com/chronograf/releases/chronograf-${CHRONOGRAF_VERSION}-static_linux_amd64.tar.gz && \ gpg --batch --verify chronograf-${CHRONOGRAF_VERSION}-static_linux_amd64.tar.gz.asc chronograf-${CHRONOGRAF_VERSION}-static_linux_amd64.tar.gz && \ @@ -23,8 +20,7 @@ RUN set -ex && \ rm -f /usr/src/chronograf-*/chronograf.conf && \ chmod +x /usr/src/chronograf-*/* && \ cp -a /usr/src/chronograf-*/* /usr/bin/ && \ - gpgconf --kill all && \ - rm -rf *.tar.gz* /usr/src /root/.gnupg && \ + rm -rf *.tar.gz* /usr/src && \ apk del .build-deps COPY LICENSE /usr/share/chronograf/LICENSE diff --git a/influxdb/1.10/data/Dockerfile b/influxdb/1.10/data/Dockerfile index d871a7803..1d5436424 100644 --- a/influxdb/1.10/data/Dockerfile +++ b/influxdb/1.10/data/Dockerfile @@ -1,13 +1,8 @@ FROM buildpack-deps:bullseye-curl -RUN set -ex && \ - mkdir ~/.gnupg; \ - echo "disable-ipv6" >> ~/.gnupg/dirmngr.conf; \ - for key in \ - 05CE15085FC09D18E99EFB22684A14CF2582E0C5 ; \ - do \ - gpg --keyserver hkp://keyserver.ubuntu.com --recv-keys "$key" ; \ - done +RUN gpg --yes --batch \ + --keyserver hkps://keyserver.ubuntu.com:443 \ + --recv-keys 05CE15085FC09D18E99EFB22684A14CF2582E0C5 ENV INFLUXDB_VERSION 1.10.0-c1.10.0 RUN wget --no-verbose https://dl.influxdata.com/enterprise/releases/influxdb-data_${INFLUXDB_VERSION}_amd64.deb.asc && \ diff --git a/influxdb/1.10/data/alpine/Dockerfile b/influxdb/1.10/data/alpine/Dockerfile index 8b73fe498..f809647ef 100644 --- a/influxdb/1.10/data/alpine/Dockerfile +++ b/influxdb/1.10/data/alpine/Dockerfile @@ -1,17 +1,16 @@ -FROM alpine:3.14 +FROM alpine:latest RUN echo 'hosts: files dns' >> /etc/nsswitch.conf -RUN apk add --no-cache tzdata bash ca-certificates && \ +RUN apk add --no-cache tzdata bash ca-certificates gnupg && \ update-ca-certificates +RUN gpg --yes --batch \ + --keyserver hkps://keyserver.ubuntu.com:443 \ + --recv-keys 05CE15085FC09D18E99EFB22684A14CF2582E0C5 + ENV INFLUXDB_VERSION 1.10.0-c1.10.0 RUN set -ex && \ - apk add --no-cache --virtual .build-deps wget gnupg tar && \ - for key in \ - 05CE15085FC09D18E99EFB22684A14CF2582E0C5 ; \ - do \ - gpg --keyserver hkp://keyserver.ubuntu.com --recv-keys "$key" ; \ - done && \ + apk add --no-cache --virtual .build-deps wget tar && \ wget --no-verbose https://dl.influxdata.com/enterprise/releases/influxdb-data-${INFLUXDB_VERSION}_linux_amd64.tar.gz.asc && \ wget --no-verbose https://dl.influxdata.com/enterprise/releases/influxdb-data-${INFLUXDB_VERSION}_linux_amd64.tar.gz && \ gpg --batch --verify influxdb-data-${INFLUXDB_VERSION}_linux_amd64.tar.gz.asc influxdb-data-${INFLUXDB_VERSION}_linux_amd64.tar.gz && \ @@ -20,8 +19,7 @@ RUN set -ex && \ rm -f /usr/src/influxdb-*/influxdb.conf && \ chmod +x /usr/src/influxdb-*/usr/bin/* && \ cp -a /usr/src/influxdb-*/usr/bin/. /usr/bin/ && \ - gpgconf --kill all && \ - rm -rf *.tar.gz* /usr/src /root/.gnupg && \ + rm -rf *.tar.gz* /usr/src && \ apk del .build-deps COPY influxdb.conf /etc/influxdb/influxdb.conf diff --git a/influxdb/1.10/meta/Dockerfile b/influxdb/1.10/meta/Dockerfile index 578efbcd3..568dd8795 100644 --- a/influxdb/1.10/meta/Dockerfile +++ b/influxdb/1.10/meta/Dockerfile @@ -1,13 +1,8 @@ FROM buildpack-deps:bullseye-curl -RUN set -ex && \ - mkdir ~/.gnupg; \ - echo "disable-ipv6" >> ~/.gnupg/dirmngr.conf; \ - for key in \ - 05CE15085FC09D18E99EFB22684A14CF2582E0C5 ; \ - do \ - gpg --keyserver hkp://keyserver.ubuntu.com --recv-keys "$key" ; \ - done +RUN gpg --yes --batch \ + --keyserver hkps://keyserver.ubuntu.com:443 \ + --recv-keys 05CE15085FC09D18E99EFB22684A14CF2582E0C5 ENV INFLUXDB_VERSION 1.10.0-c1.10.0 RUN wget --no-verbose https://dl.influxdata.com/enterprise/releases/influxdb-meta_${INFLUXDB_VERSION}_amd64.deb.asc && \ diff --git a/influxdb/1.10/meta/alpine/Dockerfile b/influxdb/1.10/meta/alpine/Dockerfile index bebab5dc4..1aa77d31a 100644 --- a/influxdb/1.10/meta/alpine/Dockerfile +++ b/influxdb/1.10/meta/alpine/Dockerfile @@ -1,17 +1,16 @@ -FROM alpine:3.14 +FROM alpine:latest RUN echo 'hosts: files dns' >> /etc/nsswitch.conf -RUN apk add --no-cache tzdata bash ca-certificates && \ +RUN apk add --no-cache tzdata bash ca-certificates gnupg && \ update-ca-certificates +RUN gpg --yes --batch \ + --keyserver hkps://keyserver.ubuntu.com:443 \ + --recv-keys 05CE15085FC09D18E99EFB22684A14CF2582E0C5 + ENV INFLUXDB_VERSION 1.10.0-c1.10.0 RUN set -ex && \ apk add --no-cache --virtual .build-deps wget gnupg tar && \ - for key in \ - 05CE15085FC09D18E99EFB22684A14CF2582E0C5 ; \ - do \ - gpg --keyserver hkp://keyserver.ubuntu.com --recv-keys "$key" ; \ - done && \ wget --no-verbose https://dl.influxdata.com/enterprise/releases/influxdb-meta-${INFLUXDB_VERSION}_linux_amd64.tar.gz.asc && \ wget --no-verbose https://dl.influxdata.com/enterprise/releases/influxdb-meta-${INFLUXDB_VERSION}_linux_amd64.tar.gz && \ gpg --batch --verify influxdb-meta-${INFLUXDB_VERSION}_linux_amd64.tar.gz.asc influxdb-meta-${INFLUXDB_VERSION}_linux_amd64.tar.gz && \ @@ -20,8 +19,7 @@ RUN set -ex && \ rm -f /usr/src/influxdb-*/influxdb-meta.conf && \ chmod +x /usr/src/influxdb-*/usr/bin/* && \ cp -a /usr/src/influxdb-*/usr/bin/. /usr/bin/ && \ - gpgconf --kill all && \ - rm -rf *.tar.gz* /usr/src /root/.gnupg && \ + rm -rf *.tar.gz* /usr/src && \ apk del .build-deps COPY influxdb-meta.conf /etc/influxdb/influxdb-meta.conf diff --git a/influxdb/1.7/Dockerfile b/influxdb/1.7/Dockerfile index 174d73c7d..9417401d4 100644 --- a/influxdb/1.7/Dockerfile +++ b/influxdb/1.7/Dockerfile @@ -1,13 +1,8 @@ -FROM buildpack-deps:stretch-curl +FROM buildpack-deps:bullseye-curl -RUN set -ex && \ - mkdir ~/.gnupg; \ - echo "disable-ipv6" >> ~/.gnupg/dirmngr.conf; \ - for key in \ - 05CE15085FC09D18E99EFB22684A14CF2582E0C5 ; \ - do \ - gpg --keyserver hkp://keyserver.ubuntu.com --recv-keys "$key" ; \ - done +RUN gpg --yes --batch \ + --keyserver hkps://keyserver.ubuntu.com:443 \ + --recv-keys 05CE15085FC09D18E99EFB22684A14CF2582E0C5 ENV INFLUXDB_VERSION 1.7.11 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" && \ diff --git a/influxdb/1.7/alpine/Dockerfile b/influxdb/1.7/alpine/Dockerfile index 9a464c6dd..fcdf2c6ac 100644 --- a/influxdb/1.7/alpine/Dockerfile +++ b/influxdb/1.7/alpine/Dockerfile @@ -1,19 +1,16 @@ -FROM alpine:3.14 +FROM alpine:latest RUN echo 'hosts: files dns' >> /etc/nsswitch.conf -RUN apk add --no-cache tzdata bash ca-certificates && \ +RUN apk add --no-cache tzdata bash ca-certificates gnupg && \ update-ca-certificates +RUN gpg --yes --batch \ + --keyserver hkps://keyserver.ubuntu.com:443 \ + --recv-keys 05CE15085FC09D18E99EFB22684A14CF2582E0C5 + ENV INFLUXDB_VERSION 1.7.11 RUN set -ex && \ - mkdir ~/.gnupg; \ - echo "disable-ipv6" >> ~/.gnupg/dirmngr.conf; \ - apk add --no-cache --virtual .build-deps wget gnupg tar && \ - for key in \ - 05CE15085FC09D18E99EFB22684A14CF2582E0C5 ; \ - do \ - gpg --keyserver hkp://keyserver.ubuntu.com --recv-keys "$key" ; \ - done && \ + apk add --no-cache --virtual .build-deps wget tar && \ wget --no-verbose https://dl.influxdata.com/influxdb/releases/influxdb-${INFLUXDB_VERSION}-static_linux_amd64.tar.gz.asc && \ wget --no-verbose https://dl.influxdata.com/influxdb/releases/influxdb-${INFLUXDB_VERSION}-static_linux_amd64.tar.gz && \ gpg --batch --verify influxdb-${INFLUXDB_VERSION}-static_linux_amd64.tar.gz.asc influxdb-${INFLUXDB_VERSION}-static_linux_amd64.tar.gz && \ @@ -30,8 +27,7 @@ RUN set -ex && \ /usr/src/influxdb-*/influx_tsm \ /usr/src/influxdb-*/influxd \ /usr/bin/ &&\ - gpgconf --kill all && \ - rm -rf *.tar.gz* /usr/src /root/.gnupg && \ + rm -rf *.tar.gz* /usr/src && \ apk del .build-deps COPY influxdb.conf /etc/influxdb/influxdb.conf diff --git a/influxdb/1.7/data/Dockerfile b/influxdb/1.7/data/Dockerfile index 17fd41d56..eb072a3ba 100644 --- a/influxdb/1.7/data/Dockerfile +++ b/influxdb/1.7/data/Dockerfile @@ -1,13 +1,8 @@ -FROM buildpack-deps:stretch-curl +FROM buildpack-deps:bullseye-curl -RUN set -ex && \ - mkdir ~/.gnupg; \ - echo "disable-ipv6" >> ~/.gnupg/dirmngr.conf; \ - for key in \ - 05CE15085FC09D18E99EFB22684A14CF2582E0C5 ; \ - do \ - gpg --keyserver hkp://keyserver.ubuntu.com --recv-keys "$key" ; \ - done +RUN gpg --yes --batch \ + --keyserver hkps://keyserver.ubuntu.com:443 \ + --recv-keys 05CE15085FC09D18E99EFB22684A14CF2582E0C5 ENV INFLUXDB_VERSION 1.7.11-c1.7.11 RUN wget --no-verbose https://dl.influxdata.com/enterprise/releases/influxdb-data_${INFLUXDB_VERSION}_amd64.deb.asc && \ diff --git a/influxdb/1.7/data/alpine/Dockerfile b/influxdb/1.7/data/alpine/Dockerfile index 5f3dedca7..b9626c4e8 100644 --- a/influxdb/1.7/data/alpine/Dockerfile +++ b/influxdb/1.7/data/alpine/Dockerfile @@ -1,19 +1,16 @@ -FROM alpine:3.14 +FROM alpine:latest RUN echo 'hosts: files dns' >> /etc/nsswitch.conf -RUN apk add --no-cache tzdata bash ca-certificates && \ +RUN apk add --no-cache tzdata bash ca-certificates gnupg && \ update-ca-certificates +RUN gpg --yes --batch \ + --keyserver hkps://keyserver.ubuntu.com:443 \ + --recv-keys 05CE15085FC09D18E99EFB22684A14CF2582E0C5 + ENV INFLUXDB_VERSION 1.7.11-c1.7.11 RUN set -ex && \ - mkdir ~/.gnupg; \ - echo "disable-ipv6" >> ~/.gnupg/dirmngr.conf; \ - apk add --no-cache --virtual .build-deps wget gnupg tar && \ - for key in \ - 05CE15085FC09D18E99EFB22684A14CF2582E0C5 ; \ - do \ - gpg --keyserver hkp://keyserver.ubuntu.com --recv-keys "$key" ; \ - done && \ + apk add --no-cache --virtual .build-deps wget tar && \ wget --no-verbose https://dl.influxdata.com/enterprise/releases/influxdb-data-${INFLUXDB_VERSION}-static_linux_amd64.tar.gz.asc && \ wget --no-verbose https://dl.influxdata.com/enterprise/releases/influxdb-data-${INFLUXDB_VERSION}-static_linux_amd64.tar.gz && \ gpg --batch --verify influxdb-data-${INFLUXDB_VERSION}-static_linux_amd64.tar.gz.asc influxdb-data-${INFLUXDB_VERSION}-static_linux_amd64.tar.gz && \ @@ -22,8 +19,7 @@ RUN set -ex && \ rm -f /usr/src/influxdb-*/influxdb.conf && \ chmod +x /usr/src/influxdb-*/* && \ cp -a /usr/src/influxdb-*/* /usr/bin/ && \ - gpgconf --kill all && \ - rm -rf *.tar.gz* /usr/src /root/.gnupg && \ + rm -rf *.tar.gz* /usr/src && \ apk del .build-deps COPY influxdb.conf /etc/influxdb/influxdb.conf diff --git a/influxdb/1.7/meta/Dockerfile b/influxdb/1.7/meta/Dockerfile index 9ac9fdc03..6f79fd6a6 100644 --- a/influxdb/1.7/meta/Dockerfile +++ b/influxdb/1.7/meta/Dockerfile @@ -1,13 +1,8 @@ -FROM buildpack-deps:stretch-curl +FROM buildpack-deps:bullseye-curl -RUN set -ex && \ - mkdir ~/.gnupg; \ - echo "disable-ipv6" >> ~/.gnupg/dirmngr.conf; \ - for key in \ - 05CE15085FC09D18E99EFB22684A14CF2582E0C5 ; \ - do \ - gpg --keyserver hkp://keyserver.ubuntu.com --recv-keys "$key" ; \ - done +RUN gpg --yes --batch \ + --keyserver hkps://keyserver.ubuntu.com:443 \ + --recv-keys 05CE15085FC09D18E99EFB22684A14CF2582E0C5 ENV INFLUXDB_VERSION 1.7.11-c1.7.11 RUN wget --no-verbose https://dl.influxdata.com/enterprise/releases/influxdb-meta_${INFLUXDB_VERSION}_amd64.deb.asc && \ diff --git a/influxdb/1.7/meta/alpine/Dockerfile b/influxdb/1.7/meta/alpine/Dockerfile index c43561f55..0e11125f4 100644 --- a/influxdb/1.7/meta/alpine/Dockerfile +++ b/influxdb/1.7/meta/alpine/Dockerfile @@ -1,19 +1,16 @@ -FROM alpine:3.14 +FROM alpine:latest RUN echo 'hosts: files dns' >> /etc/nsswitch.conf -RUN apk add --no-cache tzdata bash ca-certificates && \ +RUN apk add --no-cache tzdata bash ca-certificates gnupg && \ update-ca-certificates +RUN gpg --yes --batch \ + --keyserver hkps://keyserver.ubuntu.com:443 \ + --recv-keys 05CE15085FC09D18E99EFB22684A14CF2582E0C5 + ENV INFLUXDB_VERSION 1.7.11-c1.7.11 RUN set -ex && \ - mkdir ~/.gnupg; \ - echo "disable-ipv6" >> ~/.gnupg/dirmngr.conf; \ - apk add --no-cache --virtual .build-deps wget gnupg tar && \ - for key in \ - 05CE15085FC09D18E99EFB22684A14CF2582E0C5 ; \ - do \ - gpg --keyserver hkp://keyserver.ubuntu.com --recv-keys "$key" ; \ - done && \ + apk add --no-cache --virtual .build-deps wget tar && \ wget --no-verbose https://dl.influxdata.com/enterprise/releases/influxdb-meta-${INFLUXDB_VERSION}-static_linux_amd64.tar.gz.asc && \ wget --no-verbose https://dl.influxdata.com/enterprise/releases/influxdb-meta-${INFLUXDB_VERSION}-static_linux_amd64.tar.gz && \ gpg --batch --verify influxdb-meta-${INFLUXDB_VERSION}-static_linux_amd64.tar.gz.asc influxdb-meta-${INFLUXDB_VERSION}-static_linux_amd64.tar.gz && \ @@ -22,8 +19,7 @@ RUN set -ex && \ rm -f /usr/src/influxdb-*/influxdb-meta.conf && \ chmod +x /usr/src/influxdb-*/* && \ cp -a /usr/src/influxdb-*/* /usr/bin/ && \ - gpgconf --kill all && \ - rm -rf *.tar.gz* /usr/src /root/.gnupg && \ + rm -rf *.tar.gz* /usr/src && \ apk del .build-deps COPY influxdb-meta.conf /etc/influxdb/influxdb-meta.conf diff --git a/influxdb/1.8/Dockerfile b/influxdb/1.8/Dockerfile index 47e969333..0493c1f92 100644 --- a/influxdb/1.8/Dockerfile +++ b/influxdb/1.8/Dockerfile @@ -1,13 +1,8 @@ FROM buildpack-deps:bullseye-curl -RUN set -ex && \ - mkdir ~/.gnupg; \ - echo "disable-ipv6" >> ~/.gnupg/dirmngr.conf; \ - for key in \ - 05CE15085FC09D18E99EFB22684A14CF2582E0C5 ; \ - do \ - gpg --keyserver hkp://keyserver.ubuntu.com --recv-keys "$key" ; \ - done +RUN gpg --yes --batch \ + --keyserver hkps://keyserver.ubuntu.com:443 \ + --recv-keys 05CE15085FC09D18E99EFB22684A14CF2582E0C5 ENV INFLUXDB_VERSION 1.8.10 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" && \ diff --git a/influxdb/1.8/alpine/Dockerfile b/influxdb/1.8/alpine/Dockerfile index 929fa7415..cfb02d2b2 100644 --- a/influxdb/1.8/alpine/Dockerfile +++ b/influxdb/1.8/alpine/Dockerfile @@ -1,19 +1,16 @@ -FROM alpine:3.14 +FROM alpine:latest RUN echo 'hosts: files dns' >> /etc/nsswitch.conf -RUN apk add --no-cache tzdata bash ca-certificates && \ +RUN apk add --no-cache tzdata bash ca-certificates gnupg && \ update-ca-certificates +RUN gpg --yes --batch \ + --keyserver hkps://keyserver.ubuntu.com:443 \ + --recv-keys 05CE15085FC09D18E99EFB22684A14CF2582E0C5 + ENV INFLUXDB_VERSION 1.8.10 RUN set -ex && \ - mkdir ~/.gnupg; \ - echo "disable-ipv6" >> ~/.gnupg/dirmngr.conf; \ - apk add --no-cache --virtual .build-deps wget gnupg tar && \ - for key in \ - 05CE15085FC09D18E99EFB22684A14CF2582E0C5 ; \ - do \ - gpg --keyserver hkp://keyserver.ubuntu.com --recv-keys "$key" ; \ - done && \ + apk add --no-cache --virtual .build-deps wget tar && \ wget --no-verbose https://dl.influxdata.com/influxdb/releases/influxdb-${INFLUXDB_VERSION}-static_linux_amd64.tar.gz.asc && \ wget --no-verbose https://dl.influxdata.com/influxdb/releases/influxdb-${INFLUXDB_VERSION}-static_linux_amd64.tar.gz && \ gpg --batch --verify influxdb-${INFLUXDB_VERSION}-static_linux_amd64.tar.gz.asc influxdb-${INFLUXDB_VERSION}-static_linux_amd64.tar.gz && \ @@ -28,8 +25,7 @@ RUN set -ex && \ /usr/src/influxdb-*/influx_stress \ /usr/src/influxdb-*/influxd \ /usr/bin/ &&\ - gpgconf --kill all && \ - rm -rf *.tar.gz* /usr/src /root/.gnupg && \ + rm -rf *.tar.gz* /usr/src && \ apk del .build-deps COPY influxdb.conf /etc/influxdb/influxdb.conf diff --git a/influxdb/1.8/data/Dockerfile b/influxdb/1.8/data/Dockerfile index 829dfc772..eda5327f1 100644 --- a/influxdb/1.8/data/Dockerfile +++ b/influxdb/1.8/data/Dockerfile @@ -1,13 +1,8 @@ FROM buildpack-deps:bullseye-curl -RUN set -ex && \ - mkdir ~/.gnupg; \ - echo "disable-ipv6" >> ~/.gnupg/dirmngr.conf; \ - for key in \ - 05CE15085FC09D18E99EFB22684A14CF2582E0C5 ; \ - do \ - gpg --keyserver hkp://keyserver.ubuntu.com --recv-keys "$key" ; \ - done +RUN gpg --yes --batch \ + --keyserver hkps://keyserver.ubuntu.com:443 \ + --recv-keys 05CE15085FC09D18E99EFB22684A14CF2582E0C5 ENV INFLUXDB_VERSION 1.8.10-c1.8.10 RUN wget --no-verbose https://dl.influxdata.com/enterprise/releases/influxdb-data_${INFLUXDB_VERSION}_amd64.deb.asc && \ diff --git a/influxdb/1.8/data/alpine/Dockerfile b/influxdb/1.8/data/alpine/Dockerfile index 8e1df408a..bff42b62f 100644 --- a/influxdb/1.8/data/alpine/Dockerfile +++ b/influxdb/1.8/data/alpine/Dockerfile @@ -1,17 +1,16 @@ -FROM alpine:3.14 +FROM alpine:latest RUN echo 'hosts: files dns' >> /etc/nsswitch.conf -RUN apk add --no-cache tzdata bash ca-certificates && \ +RUN apk add --no-cache tzdata bash ca-certificates gnupg && \ update-ca-certificates +RUN gpg --yes --batch \ + --keyserver hkps://keyserver.ubuntu.com:443 \ + --recv-keys 05CE15085FC09D18E99EFB22684A14CF2582E0C5 + ENV INFLUXDB_VERSION 1.8.10-c1.8.10 RUN set -ex && \ - apk add --no-cache --virtual .build-deps wget gnupg tar && \ - for key in \ - 05CE15085FC09D18E99EFB22684A14CF2582E0C5 ; \ - do \ - gpg --keyserver hkp://keyserver.ubuntu.com --recv-keys "$key" ; \ - done && \ + apk add --no-cache --virtual .build-deps wget tar && \ wget --no-verbose https://dl.influxdata.com/enterprise/releases/influxdb-data-${INFLUXDB_VERSION}-static_linux_amd64.tar.gz.asc && \ wget --no-verbose https://dl.influxdata.com/enterprise/releases/influxdb-data-${INFLUXDB_VERSION}-static_linux_amd64.tar.gz && \ gpg --batch --verify influxdb-data-${INFLUXDB_VERSION}-static_linux_amd64.tar.gz.asc influxdb-data-${INFLUXDB_VERSION}-static_linux_amd64.tar.gz && \ @@ -20,8 +19,7 @@ RUN set -ex && \ rm -f /usr/src/influxdb-*/influxdb.conf && \ chmod +x /usr/src/influxdb-*/* && \ cp -a /usr/src/influxdb-*/* /usr/bin/ && \ - gpgconf --kill all && \ - rm -rf *.tar.gz* /usr/src /root/.gnupg && \ + rm -rf *.tar.gz* /usr/src && \ apk del .build-deps COPY influxdb.conf /etc/influxdb/influxdb.conf diff --git a/influxdb/1.8/meta/Dockerfile b/influxdb/1.8/meta/Dockerfile index e8bed10d6..a9ffa37bc 100644 --- a/influxdb/1.8/meta/Dockerfile +++ b/influxdb/1.8/meta/Dockerfile @@ -1,13 +1,8 @@ FROM buildpack-deps:bullseye-curl -RUN set -ex && \ - mkdir ~/.gnupg; \ - echo "disable-ipv6" >> ~/.gnupg/dirmngr.conf; \ - for key in \ - 05CE15085FC09D18E99EFB22684A14CF2582E0C5 ; \ - do \ - gpg --keyserver hkp://keyserver.ubuntu.com --recv-keys "$key" ; \ - done +RUN gpg --yes --batch \ + --keyserver hkps://keyserver.ubuntu.com:443 \ + --recv-keys 05CE15085FC09D18E99EFB22684A14CF2582E0C5 ENV INFLUXDB_VERSION 1.8.10-c1.8.10 RUN wget --no-verbose https://dl.influxdata.com/enterprise/releases/influxdb-meta_${INFLUXDB_VERSION}_amd64.deb.asc && \ diff --git a/influxdb/1.8/meta/alpine/Dockerfile b/influxdb/1.8/meta/alpine/Dockerfile index 566380d4e..75e3ed716 100644 --- a/influxdb/1.8/meta/alpine/Dockerfile +++ b/influxdb/1.8/meta/alpine/Dockerfile @@ -1,17 +1,16 @@ -FROM alpine:3.14 +FROM alpine:latest RUN echo 'hosts: files dns' >> /etc/nsswitch.conf -RUN apk add --no-cache tzdata bash ca-certificates && \ +RUN apk add --no-cache tzdata bash ca-certificates alpine gnupg && \ update-ca-certificates +RUN gpg --yes --batch \ + --keyserver hkps://keyserver.ubuntu.com:443 \ + --recv-keys 05CE15085FC09D18E99EFB22684A14CF2582E0C5 + ENV INFLUXDB_VERSION 1.8.10-c1.8.10 RUN set -ex && \ - apk add --no-cache --virtual .build-deps wget gnupg tar && \ - for key in \ - 05CE15085FC09D18E99EFB22684A14CF2582E0C5 ; \ - do \ - gpg --keyserver hkp://keyserver.ubuntu.com --recv-keys "$key" ; \ - done && \ + apk add --no-cache --virtual .build-deps wget tar && \ wget --no-verbose https://dl.influxdata.com/enterprise/releases/influxdb-meta-${INFLUXDB_VERSION}-static_linux_amd64.tar.gz.asc && \ wget --no-verbose https://dl.influxdata.com/enterprise/releases/influxdb-meta-${INFLUXDB_VERSION}-static_linux_amd64.tar.gz && \ gpg --batch --verify influxdb-meta-${INFLUXDB_VERSION}-static_linux_amd64.tar.gz.asc influxdb-meta-${INFLUXDB_VERSION}-static_linux_amd64.tar.gz && \ @@ -20,8 +19,7 @@ RUN set -ex && \ rm -f /usr/src/influxdb-*/influxdb-meta.conf && \ chmod +x /usr/src/influxdb-*/* && \ cp -a /usr/src/influxdb-*/* /usr/bin/ && \ - gpgconf --kill all && \ - rm -rf *.tar.gz* /usr/src /root/.gnupg && \ + rm -rf *.tar.gz* /usr/src && \ apk del .build-deps COPY influxdb-meta.conf /etc/influxdb/influxdb-meta.conf diff --git a/influxdb/1.9/data/Dockerfile b/influxdb/1.9/data/Dockerfile index 74591ae63..fbdb32678 100644 --- a/influxdb/1.9/data/Dockerfile +++ b/influxdb/1.9/data/Dockerfile @@ -1,13 +1,8 @@ FROM buildpack-deps:bullseye-curl -RUN set -ex && \ - mkdir ~/.gnupg; \ - echo "disable-ipv6" >> ~/.gnupg/dirmngr.conf; \ - for key in \ - 05CE15085FC09D18E99EFB22684A14CF2582E0C5 ; \ - do \ - gpg --keyserver hkp://keyserver.ubuntu.com --recv-keys "$key" ; \ - done +RUN gpg --yes --batch \ + --keyserver hkps://keyserver.ubuntu.com:443 \ + --recv-keys 05CE15085FC09D18E99EFB22684A14CF2582E0C5 ENV INFLUXDB_VERSION 1.9.8-c1.9.8 RUN wget --no-verbose https://dl.influxdata.com/enterprise/releases/influxdb-data_${INFLUXDB_VERSION}_amd64.deb.asc && \ diff --git a/influxdb/1.9/data/alpine/Dockerfile b/influxdb/1.9/data/alpine/Dockerfile index 2d5f58c45..f78fae2c3 100644 --- a/influxdb/1.9/data/alpine/Dockerfile +++ b/influxdb/1.9/data/alpine/Dockerfile @@ -1,17 +1,16 @@ -FROM alpine:3.14 +FROM alpine:latest RUN echo 'hosts: files dns' >> /etc/nsswitch.conf -RUN apk add --no-cache tzdata bash ca-certificates && \ +RUN apk add --no-cache tzdata bash ca-certificates gnupg && \ update-ca-certificates +RUN gpg --yes --batch \ + --keyserver hkps://keyserver.ubuntu.com:443 \ + --recv-keys 05CE15085FC09D18E99EFB22684A14CF2582E0C5 + ENV INFLUXDB_VERSION 1.9.8-c1.9.8 RUN set -ex && \ - apk add --no-cache --virtual .build-deps wget gnupg tar && \ - for key in \ - 05CE15085FC09D18E99EFB22684A14CF2582E0C5 ; \ - do \ - gpg --keyserver hkp://keyserver.ubuntu.com --recv-keys "$key" ; \ - done && \ + apk add --no-cache --virtual .build-deps wget tar && \ wget --no-verbose https://dl.influxdata.com/enterprise/releases/influxdb-data-${INFLUXDB_VERSION}_linux_amd64.tar.gz.asc && \ wget --no-verbose https://dl.influxdata.com/enterprise/releases/influxdb-data-${INFLUXDB_VERSION}_linux_amd64.tar.gz && \ gpg --batch --verify influxdb-data-${INFLUXDB_VERSION}_linux_amd64.tar.gz.asc influxdb-data-${INFLUXDB_VERSION}_linux_amd64.tar.gz && \ @@ -20,8 +19,7 @@ RUN set -ex && \ rm -f /usr/src/influxdb-*/etc/influxdb/influxdb.conf && \ chmod +x /usr/src/influxdb-*/usr/bin/* && \ cp -a /usr/src/influxdb-*/usr/bin/. /usr/bin/ && \ - gpgconf --kill all && \ - rm -rf *.tar.gz* /usr/src /root/.gnupg && \ + rm -rf *.tar.gz* /usr/src && \ apk del .build-deps COPY influxdb.conf /etc/influxdb/influxdb.conf diff --git a/influxdb/1.9/meta/Dockerfile b/influxdb/1.9/meta/Dockerfile index b8682b280..9dce5312d 100644 --- a/influxdb/1.9/meta/Dockerfile +++ b/influxdb/1.9/meta/Dockerfile @@ -1,12 +1,11 @@ FROM buildpack-deps:bullseye-curl -RUN set -ex && \ - mkdir ~/.gnupg; \ - echo "disable-ipv6" >> ~/.gnupg/dirmngr.conf; \ - for key in \ - 05CE15085FC09D18E99EFB22684A14CF2582E0C5 ; \ +RUN for attempt in 1 2 3 ; \ do \ - gpg --keyserver hkp://keyserver.ubuntu.com --recv-keys "$key" ; \ + sleep 1 && \ + gpg --yes --batch --keyserver hkps://keyserver.ubuntu.com:443 --recv-keys \ + 05CE15085FC09D18E99EFB22684A14CF2582E0C5 && \ + break ; \ done ENV INFLUXDB_VERSION 1.9.8-c1.9.8 diff --git a/influxdb/1.9/meta/alpine/Dockerfile b/influxdb/1.9/meta/alpine/Dockerfile index c5f348606..dc3e03ea8 100644 --- a/influxdb/1.9/meta/alpine/Dockerfile +++ b/influxdb/1.9/meta/alpine/Dockerfile @@ -1,17 +1,20 @@ -FROM alpine:3.14 +FROM alpine:latest RUN echo 'hosts: files dns' >> /etc/nsswitch.conf -RUN apk add --no-cache tzdata bash ca-certificates && \ +RUN apk add --no-cache tzdata bash ca-certificates gnupg && \ update-ca-certificates +RUN for attempt in 1 2 3 ; \ + do \ + sleep 1 && \ + gpg --yes --batch --keyserver hkps://keyserver.ubuntu.com:443 --recv-keys \ + 05CE15085FC09D18E99EFB22684A14CF2582E0C5 && \ + break ; \ + done + ENV INFLUXDB_VERSION 1.9.8-c1.9.8 RUN set -ex && \ - apk add --no-cache --virtual .build-deps wget gnupg tar && \ - for key in \ - 05CE15085FC09D18E99EFB22684A14CF2582E0C5 ; \ - do \ - gpg --keyserver hkp://keyserver.ubuntu.com --recv-keys "$key" ; \ - done && \ + apk add --no-cache --virtual .build-deps wget tar && \ wget --no-verbose https://dl.influxdata.com/enterprise/releases/influxdb-meta-${INFLUXDB_VERSION}_linux_amd64.tar.gz.asc && \ wget --no-verbose https://dl.influxdata.com/enterprise/releases/influxdb-meta-${INFLUXDB_VERSION}_linux_amd64.tar.gz && \ gpg --batch --verify influxdb-meta-${INFLUXDB_VERSION}_linux_amd64.tar.gz.asc influxdb-meta-${INFLUXDB_VERSION}_linux_amd64.tar.gz && \ @@ -20,8 +23,7 @@ RUN set -ex && \ rm -f /usr/src/influxdb-*/etc/influxdb/influxdb-meta.conf && \ chmod +x /usr/src/influxdb-*/usr/bin/* && \ cp -a /usr/src/influxdb-*/usr/bin/. /usr/bin/ && \ - gpgconf --kill all && \ - rm -rf *.tar.gz* /usr/src /root/.gnupg && \ + rm -rf *.tar.gz* /usr/src && \ apk del .build-deps COPY influxdb-meta.conf /etc/influxdb/influxdb-meta.conf diff --git a/influxdb/2.0/Dockerfile b/influxdb/2.0/Dockerfile index 9f0d75b2d..ceaf87a66 100644 --- a/influxdb/2.0/Dockerfile +++ b/influxdb/2.0/Dockerfile @@ -1,10 +1,15 @@ -FROM buildpack-deps:buster-curl +FROM buildpack-deps:bullseye-curl RUN groupadd -r influxdb --gid=1000 && \ useradd -r -g influxdb --uid=1000 --home-dir=/home/influxdb --shell=/bin/bash influxdb && \ mkdir -p /home/influxdb && \ chown -R influxdb:influxdb /home/influxdb +RUN gpg --yes --batch \ + --keyserver hkps://keyserver.ubuntu.com:443 \ + --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4 \ + 8C2D403D3C3BDB81A4C27C883C3E4B7317FFE40A + # Install gosu for easy step-down from root. # https://github.com/tianon/gosu/releases ENV GOSU_VER 1.12 @@ -12,11 +17,8 @@ RUN set -eux; \ dpkgArch="$(dpkg --print-architecture)" && \ wget -O /usr/local/bin/gosu "https://github.com/tianon/gosu/releases/download/$GOSU_VER/gosu-$dpkgArch" && \ wget -O /usr/local/bin/gosu.asc "https://github.com/tianon/gosu/releases/download/$GOSU_VER/gosu-$dpkgArch.asc" && \ - export GNUPGHOME="$(mktemp -d)" && \ - gpg --batch --keyserver hkps://keys.openpgp.org --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4 && \ gpg --batch --verify /usr/local/bin/gosu.asc /usr/local/bin/gosu && \ - gpgconf --kill all && \ - rm -rf "$GNUPGHOME" /usr/local/bin/gosu.asc && \ + rm /usr/local/bin/gosu.asc && \ chmod +x /usr/local/bin/gosu && \ gosu --version && \ gosu nobody true @@ -31,14 +33,10 @@ RUN set -eux && \ esac && \ wget --no-verbose https://dl.influxdata.com/influxdb/releases/influxdb2-${INFLUXDB_VERSION}-linux-${ARCH}.tar.gz.asc && \ wget --no-verbose https://dl.influxdata.com/influxdb/releases/influxdb2-${INFLUXDB_VERSION}-linux-${ARCH}.tar.gz && \ - export GNUPGHOME="$(mktemp -d)" && \ - echo "disable-ipv6" >> $GNUPGHOME/dirmngr.conf && \ - gpg --batch --keyserver keys.openpgp.org --recv-keys 8C2D403D3C3BDB81A4C27C883C3E4B7317FFE40A && \ gpg --batch --verify influxdb2-${INFLUXDB_VERSION}-linux-${ARCH}.tar.gz.asc influxdb2-${INFLUXDB_VERSION}-linux-${ARCH}.tar.gz && \ - gpgconf --kill all && \ tar xzf influxdb2-${INFLUXDB_VERSION}-linux-${ARCH}.tar.gz && \ cp influxdb2-${INFLUXDB_VERSION}-linux-${ARCH}/influx* /usr/local/bin/ && \ - rm -rf "$GNUPGHOME" influxdb2.key influxdb2-${INFLUXDB_VERSION}-linux-${ARCH}* && \ + rm -rf influxdb2-${INFLUXDB_VERSION}-linux-${ARCH}* && \ influxd version && \ influx version diff --git a/influxdb/2.0/alpine/Dockerfile b/influxdb/2.0/alpine/Dockerfile index 49efc3189..bb7700a3e 100644 --- a/influxdb/2.0/alpine/Dockerfile +++ b/influxdb/2.0/alpine/Dockerfile @@ -1,4 +1,4 @@ -FROM alpine:3.14 +FROM alpine:latest RUN echo 'hosts: files dns' >> /etc/nsswitch.conf RUN apk add --no-cache tzdata bash ca-certificates gnupg run-parts su-exec && \ @@ -9,6 +9,10 @@ RUN addgroup -S -g 1000 influxdb && \ mkdir -p /home/influxdb && \ chown -R influxdb:influxdb /home/influxdb +RUN gpg --yes --batch \ + --keyserver hkps://keyserver.ubuntu.com:443 \ + --recv-keys 8C2D403D3C3BDB81A4C27C883C3E4B7317FFE40A + ENV INFLUXDB_VERSION 2.0.9 RUN set -eux && \ ARCH="$(apk --print-arch)" && \ @@ -21,14 +25,10 @@ RUN set -eux && \ fi && \ wget --no-verbose https://dl.influxdata.com/influxdb/releases/influxdb2-${INFLUXDB_VERSION}-linux-${ARCH}.tar.gz.asc && \ wget --no-verbose https://dl.influxdata.com/influxdb/releases/influxdb2-${INFLUXDB_VERSION}-linux-${ARCH}.tar.gz && \ - export GNUPGHOME="$(mktemp -d)" && \ - echo "disable-ipv6" >> $GNUPGHOME/dirmngr.conf && \ - gpg --keyserver keys.openpgp.org --recv-keys 8C2D403D3C3BDB81A4C27C883C3E4B7317FFE40A && \ gpg --batch --verify influxdb2-${INFLUXDB_VERSION}-linux-${ARCH}.tar.gz.asc influxdb2-${INFLUXDB_VERSION}-linux-${ARCH}.tar.gz && \ - gpgconf --kill all && \ tar xzf influxdb2-${INFLUXDB_VERSION}-linux-${ARCH}.tar.gz && \ cp influxdb2-${INFLUXDB_VERSION}-linux-${ARCH}/influx* /usr/local/bin/ && \ - rm -rf "$GNUPGHOME" influxdb2.key influxdb2-${INFLUXDB_VERSION}-linux-${ARCH}* && \ + rm -rf influxdb2-${INFLUXDB_VERSION}-linux-${ARCH}* && \ influxd version && \ influx version diff --git a/influxdb/2.1/Dockerfile b/influxdb/2.1/Dockerfile index c38feff62..279f09d38 100644 --- a/influxdb/2.1/Dockerfile +++ b/influxdb/2.1/Dockerfile @@ -1,10 +1,15 @@ -FROM buildpack-deps:buster-curl +FROM buildpack-deps:bullseye-curl RUN groupadd -r influxdb --gid=1000 && \ useradd -r -g influxdb --uid=1000 --home-dir=/home/influxdb --shell=/bin/bash influxdb && \ mkdir -p /home/influxdb && \ chown -R influxdb:influxdb /home/influxdb +RUN gpg --yes --batch \ + --keyserver hkps://keyserver.ubuntu.com:443 \ + --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4 \ + 8C2D403D3C3BDB81A4C27C883C3E4B7317FFE40A + # Install gosu for easy step-down from root. # https://github.com/tianon/gosu/releases ENV GOSU_VER 1.12 @@ -12,11 +17,8 @@ RUN set -eux; \ dpkgArch="$(dpkg --print-architecture)" && \ wget -O /usr/local/bin/gosu "https://github.com/tianon/gosu/releases/download/$GOSU_VER/gosu-$dpkgArch" && \ wget -O /usr/local/bin/gosu.asc "https://github.com/tianon/gosu/releases/download/$GOSU_VER/gosu-$dpkgArch.asc" && \ - export GNUPGHOME="$(mktemp -d)" && \ - gpg --batch --keyserver hkps://keys.openpgp.org --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4 && \ gpg --batch --verify /usr/local/bin/gosu.asc /usr/local/bin/gosu && \ - gpgconf --kill all && \ - rm -rf "$GNUPGHOME" /usr/local/bin/gosu.asc && \ + rm /usr/local/bin/gosu.asc && \ chmod +x /usr/local/bin/gosu && \ gosu --version && \ gosu nobody true @@ -32,14 +34,10 @@ RUN set -eux && \ esac && \ wget --no-verbose https://dl.influxdata.com/influxdb/releases/influxdb2-${INFLUXDB_VERSION}-linux-${ARCH}.tar.gz.asc && \ wget --no-verbose https://dl.influxdata.com/influxdb/releases/influxdb2-${INFLUXDB_VERSION}-linux-${ARCH}.tar.gz && \ - export GNUPGHOME="$(mktemp -d)" && \ - echo "disable-ipv6" >> $GNUPGHOME/dirmngr.conf && \ - gpg --batch --keyserver keys.openpgp.org --recv-keys 8C2D403D3C3BDB81A4C27C883C3E4B7317FFE40A && \ gpg --batch --verify influxdb2-${INFLUXDB_VERSION}-linux-${ARCH}.tar.gz.asc influxdb2-${INFLUXDB_VERSION}-linux-${ARCH}.tar.gz && \ tar xzf influxdb2-${INFLUXDB_VERSION}-linux-${ARCH}.tar.gz && \ cp influxdb2-${INFLUXDB_VERSION}-linux-${ARCH}/influxd /usr/local/bin/influxd && \ - gpgconf --kill all && \ - rm -rf "$GNUPGHOME" influxdb2.key influxdb2-${INFLUXDB_VERSION}-linux-${ARCH}* && \ + rm -rf influxdb2-${INFLUXDB_VERSION}-linux-${ARCH}* && \ influxd version # Install the influx CLI @@ -53,14 +51,10 @@ RUN set -eux && \ esac && \ wget --no-verbose https://dl.influxdata.com/influxdb/releases/influxdb2-client-${INFLUX_CLI_VERSION}-linux-${ARCH}.tar.gz.asc && \ wget --no-verbose https://dl.influxdata.com/influxdb/releases/influxdb2-client-${INFLUX_CLI_VERSION}-linux-${ARCH}.tar.gz && \ - export GNUPGHOME="$(mktemp -d)" && \ - echo "disable-ipv6" >> $GNUPGHOME/dirmngr.conf && \ - gpg --batch --keyserver keys.openpgp.org --recv-keys 8C2D403D3C3BDB81A4C27C883C3E4B7317FFE40A && \ gpg --batch --verify influxdb2-client-${INFLUX_CLI_VERSION}-linux-${ARCH}.tar.gz.asc influxdb2-client-${INFLUX_CLI_VERSION}-linux-${ARCH}.tar.gz && \ tar xzf influxdb2-client-${INFLUX_CLI_VERSION}-linux-${ARCH}.tar.gz && \ cp influxdb2-client-${INFLUX_CLI_VERSION}-linux-${ARCH}/influx /usr/local/bin/influx && \ - gpgconf --kill all && \ - rm -rf "$GNUPGHOME" influxdb2.key influxdb2-client-${INFLUX_CLI_VERSION}-linux-${ARCH}* && \ + rm -rf influxdb2-client-${INFLUX_CLI_VERSION}-linux-${ARCH}* && \ influx version # Create standard directories expected by the entry-point. diff --git a/influxdb/2.1/alpine/Dockerfile b/influxdb/2.1/alpine/Dockerfile index 260a8fb66..c9994c649 100644 --- a/influxdb/2.1/alpine/Dockerfile +++ b/influxdb/2.1/alpine/Dockerfile @@ -1,4 +1,4 @@ -FROM alpine:3.14 +FROM alpine:latest RUN echo 'hosts: files dns' >> /etc/nsswitch.conf RUN apk add --no-cache tzdata bash ca-certificates gnupg run-parts su-exec && \ @@ -9,6 +9,10 @@ RUN addgroup -S -g 1000 influxdb && \ mkdir -p /home/influxdb && \ chown -R influxdb:influxdb /home/influxdb +RUN gpg --yes --batch \ + --keyserver hkps://keyserver.ubuntu.com:443 \ + --recv-keys 8C2D403D3C3BDB81A4C27C883C3E4B7317FFE40A + # Install the infuxd server ENV INFLUXDB_VERSION 2.1.1 RUN set -eux && \ @@ -22,14 +26,10 @@ RUN set -eux && \ fi && \ wget --no-verbose https://dl.influxdata.com/influxdb/releases/influxdb2-${INFLUXDB_VERSION}-linux-${ARCH}.tar.gz.asc && \ wget --no-verbose https://dl.influxdata.com/influxdb/releases/influxdb2-${INFLUXDB_VERSION}-linux-${ARCH}.tar.gz && \ - export GNUPGHOME="$(mktemp -d)" && \ - echo "disable-ipv6" >> $GNUPGHOME/dirmngr.conf && \ - gpg --keyserver keys.openpgp.org --recv-keys 8C2D403D3C3BDB81A4C27C883C3E4B7317FFE40A && \ gpg --batch --verify influxdb2-${INFLUXDB_VERSION}-linux-${ARCH}.tar.gz.asc influxdb2-${INFLUXDB_VERSION}-linux-${ARCH}.tar.gz && \ tar xzf influxdb2-${INFLUXDB_VERSION}-linux-${ARCH}.tar.gz && \ cp influxdb2-${INFLUXDB_VERSION}-linux-${ARCH}/influxd /usr/local/bin/influxd && \ - gpgconf --kill all && \ - rm -rf "$GNUPGHOME" influxdb2.key influxdb2-${INFLUXDB_VERSION}-linux-${ARCH}* && \ + rm -rf influxdb2-${INFLUXDB_VERSION}-linux-${ARCH}* && \ influxd version # Install the influx CLI @@ -45,14 +45,10 @@ RUN set -eux && \ fi && \ wget --no-verbose https://dl.influxdata.com/influxdb/releases/influxdb2-client-${INFLUX_CLI_VERSION}-linux-${ARCH}.tar.gz.asc && \ wget --no-verbose https://dl.influxdata.com/influxdb/releases/influxdb2-client-${INFLUX_CLI_VERSION}-linux-${ARCH}.tar.gz && \ - export GNUPGHOME="$(mktemp -d)" && \ - echo "disable-ipv6" >> $GNUPGHOME/dirmngr.conf && \ - gpg --keyserver keys.openpgp.org --recv-keys 8C2D403D3C3BDB81A4C27C883C3E4B7317FFE40A && \ gpg --batch --verify influxdb2-client-${INFLUX_CLI_VERSION}-linux-${ARCH}.tar.gz.asc influxdb2-client-${INFLUX_CLI_VERSION}-linux-${ARCH}.tar.gz && \ tar xzf influxdb2-client-${INFLUX_CLI_VERSION}-linux-${ARCH}.tar.gz && \ cp influxdb2-client-${INFLUX_CLI_VERSION}-linux-${ARCH}/influx /usr/local/bin/influx && \ - gpgconf --kill all && \ - rm -rf "$GNUPGHOME" influxdb2.key influxdb2-client-${INFLUX_CLI_VERSION}-linux-${ARCH}* && \ + rm -rf influxdb2-client-${INFLUX_CLI_VERSION}-linux-${ARCH}* && \ influx version # Create standard directories expected by the entry-point. diff --git a/influxdb/2.2/Dockerfile b/influxdb/2.2/Dockerfile index ece8710c9..a56c29b02 100644 --- a/influxdb/2.2/Dockerfile +++ b/influxdb/2.2/Dockerfile @@ -1,10 +1,15 @@ -FROM buildpack-deps:buster-curl +FROM buildpack-deps:bullseye-curl RUN groupadd -r influxdb --gid=1000 && \ useradd -r -g influxdb --uid=1000 --home-dir=/home/influxdb --shell=/bin/bash influxdb && \ mkdir -p /home/influxdb && \ chown -R influxdb:influxdb /home/influxdb +RUN gpg --yes --batch \ + --keyserver hkps://keyserver.ubuntu.com:443 \ + --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4 \ + 8C2D403D3C3BDB81A4C27C883C3E4B7317FFE40A + # Install gosu for easy step-down from root. # https://github.com/tianon/gosu/releases ENV GOSU_VER 1.12 @@ -12,11 +17,8 @@ RUN set -eux; \ dpkgArch="$(dpkg --print-architecture)" && \ wget -O /usr/local/bin/gosu "https://github.com/tianon/gosu/releases/download/$GOSU_VER/gosu-$dpkgArch" && \ wget -O /usr/local/bin/gosu.asc "https://github.com/tianon/gosu/releases/download/$GOSU_VER/gosu-$dpkgArch.asc" && \ - export GNUPGHOME="$(mktemp -d)" && \ - gpg --batch --keyserver hkps://keys.openpgp.org --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4 && \ gpg --batch --verify /usr/local/bin/gosu.asc /usr/local/bin/gosu && \ - gpgconf --kill all && \ - rm -rf "$GNUPGHOME" /usr/local/bin/gosu.asc && \ + rm /usr/local/bin/gosu.asc && \ chmod +x /usr/local/bin/gosu && \ gosu --version && \ gosu nobody true @@ -32,14 +34,10 @@ RUN set -eux && \ esac && \ wget --no-verbose https://dl.influxdata.com/influxdb/releases/influxdb2-${INFLUXDB_VERSION}-linux-${ARCH}.tar.gz.asc && \ wget --no-verbose https://dl.influxdata.com/influxdb/releases/influxdb2-${INFLUXDB_VERSION}-linux-${ARCH}.tar.gz && \ - export GNUPGHOME="$(mktemp -d)" && \ - echo "disable-ipv6" >> $GNUPGHOME/dirmngr.conf && \ - gpg --batch --keyserver keys.openpgp.org --recv-keys 8C2D403D3C3BDB81A4C27C883C3E4B7317FFE40A && \ gpg --batch --verify influxdb2-${INFLUXDB_VERSION}-linux-${ARCH}.tar.gz.asc influxdb2-${INFLUXDB_VERSION}-linux-${ARCH}.tar.gz && \ tar xzf influxdb2-${INFLUXDB_VERSION}-linux-${ARCH}.tar.gz && \ cp influxdb2-${INFLUXDB_VERSION}-linux-${ARCH}/influxd /usr/local/bin/influxd && \ - gpgconf --kill all && \ - rm -rf "$GNUPGHOME" influxdb2.key influxdb2-${INFLUXDB_VERSION}-linux-${ARCH}* && \ + rm -rf influxdb2-${INFLUXDB_VERSION}-linux-${ARCH}* && \ influxd version # Install the influx CLI @@ -53,14 +51,10 @@ RUN set -eux && \ esac && \ wget --no-verbose https://dl.influxdata.com/influxdb/releases/influxdb2-client-${INFLUX_CLI_VERSION}-linux-${ARCH}.tar.gz.asc && \ wget --no-verbose https://dl.influxdata.com/influxdb/releases/influxdb2-client-${INFLUX_CLI_VERSION}-linux-${ARCH}.tar.gz && \ - export GNUPGHOME="$(mktemp -d)" && \ - echo "disable-ipv6" >> $GNUPGHOME/dirmngr.conf && \ - gpg --batch --keyserver keys.openpgp.org --recv-keys 8C2D403D3C3BDB81A4C27C883C3E4B7317FFE40A && \ gpg --batch --verify influxdb2-client-${INFLUX_CLI_VERSION}-linux-${ARCH}.tar.gz.asc influxdb2-client-${INFLUX_CLI_VERSION}-linux-${ARCH}.tar.gz && \ tar xzf influxdb2-client-${INFLUX_CLI_VERSION}-linux-${ARCH}.tar.gz && \ cp influxdb2-client-${INFLUX_CLI_VERSION}-linux-${ARCH}/influx /usr/local/bin/influx && \ - gpgconf --kill all && \ - rm -rf "$GNUPGHOME" influxdb2.key influxdb2-client-${INFLUX_CLI_VERSION}-linux-${ARCH}* && \ + rm -rf influxdb2-client-${INFLUX_CLI_VERSION}-linux-${ARCH}* && \ influx version # Create standard directories expected by the entry-point. diff --git a/influxdb/2.2/alpine/Dockerfile b/influxdb/2.2/alpine/Dockerfile index 3baff7512..b5fe535be 100644 --- a/influxdb/2.2/alpine/Dockerfile +++ b/influxdb/2.2/alpine/Dockerfile @@ -1,4 +1,4 @@ -FROM alpine:3.14 +FROM alpine:latest RUN echo 'hosts: files dns' >> /etc/nsswitch.conf RUN apk add --no-cache tzdata bash ca-certificates gnupg run-parts su-exec && \ @@ -9,6 +9,10 @@ RUN addgroup -S -g 1000 influxdb && \ mkdir -p /home/influxdb && \ chown -R influxdb:influxdb /home/influxdb +RUN gpg --yes --batch \ + --keyserver hkps://keyserver.ubuntu.com:443 \ + --recv-keys 8C2D403D3C3BDB81A4C27C883C3E4B7317FFE40A + # Install the infuxd server ENV INFLUXDB_VERSION 2.2.0 RUN set -eux && \ @@ -22,14 +26,10 @@ RUN set -eux && \ fi && \ wget --no-verbose https://dl.influxdata.com/influxdb/releases/influxdb2-${INFLUXDB_VERSION}-linux-${ARCH}.tar.gz.asc && \ wget --no-verbose https://dl.influxdata.com/influxdb/releases/influxdb2-${INFLUXDB_VERSION}-linux-${ARCH}.tar.gz && \ - export GNUPGHOME="$(mktemp -d)" && \ - echo "disable-ipv6" >> $GNUPGHOME/dirmngr.conf && \ - gpg --keyserver keys.openpgp.org --recv-keys 8C2D403D3C3BDB81A4C27C883C3E4B7317FFE40A && \ gpg --batch --verify influxdb2-${INFLUXDB_VERSION}-linux-${ARCH}.tar.gz.asc influxdb2-${INFLUXDB_VERSION}-linux-${ARCH}.tar.gz && \ tar xzf influxdb2-${INFLUXDB_VERSION}-linux-${ARCH}.tar.gz && \ cp influxdb2-${INFLUXDB_VERSION}-linux-${ARCH}/influxd /usr/local/bin/influxd && \ - gpgconf --kill all && \ - rm -rf "$GNUPGHOME" influxdb2.key influxdb2-${INFLUXDB_VERSION}-linux-${ARCH}* && \ + rm -rf influxdb2-${INFLUXDB_VERSION}-linux-${ARCH}* && \ influxd version # Install the influx CLI @@ -45,14 +45,10 @@ RUN set -eux && \ fi && \ wget --no-verbose https://dl.influxdata.com/influxdb/releases/influxdb2-client-${INFLUX_CLI_VERSION}-linux-${ARCH}.tar.gz.asc && \ wget --no-verbose https://dl.influxdata.com/influxdb/releases/influxdb2-client-${INFLUX_CLI_VERSION}-linux-${ARCH}.tar.gz && \ - export GNUPGHOME="$(mktemp -d)" && \ - echo "disable-ipv6" >> $GNUPGHOME/dirmngr.conf && \ - gpg --keyserver keys.openpgp.org --recv-keys 8C2D403D3C3BDB81A4C27C883C3E4B7317FFE40A && \ gpg --batch --verify influxdb2-client-${INFLUX_CLI_VERSION}-linux-${ARCH}.tar.gz.asc influxdb2-client-${INFLUX_CLI_VERSION}-linux-${ARCH}.tar.gz && \ tar xzf influxdb2-client-${INFLUX_CLI_VERSION}-linux-${ARCH}.tar.gz && \ cp influxdb2-client-${INFLUX_CLI_VERSION}-linux-${ARCH}/influx /usr/local/bin/influx && \ - gpgconf --kill all && \ - rm -rf "$GNUPGHOME" influxdb2.key influxdb2-client-${INFLUX_CLI_VERSION}-linux-${ARCH}* && \ + rm -rf influxdb2-client-${INFLUX_CLI_VERSION}-linux-${ARCH}* && \ influx version # Create standard directories expected by the entry-point. diff --git a/influxdb/2.3/Dockerfile b/influxdb/2.3/Dockerfile index 0a3d97936..73b8ddd32 100644 --- a/influxdb/2.3/Dockerfile +++ b/influxdb/2.3/Dockerfile @@ -1,10 +1,15 @@ -FROM buildpack-deps:buster-curl +FROM buildpack-deps:bullseye-curl RUN groupadd -r influxdb --gid=1000 && \ useradd -r -g influxdb --uid=1000 --home-dir=/home/influxdb --shell=/bin/bash influxdb && \ mkdir -p /home/influxdb && \ chown -R influxdb:influxdb /home/influxdb +RUN gpg --yes --batch \ + --keyserver hkps://keyserver.ubuntu.com:443 \ + --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4 \ + 8C2D403D3C3BDB81A4C27C883C3E4B7317FFE40A + # Install gosu for easy step-down from root. # https://github.com/tianon/gosu/releases ENV GOSU_VER 1.12 @@ -12,11 +17,8 @@ RUN set -eux; \ dpkgArch="$(dpkg --print-architecture)" && \ wget -O /usr/local/bin/gosu "https://github.com/tianon/gosu/releases/download/$GOSU_VER/gosu-$dpkgArch" && \ wget -O /usr/local/bin/gosu.asc "https://github.com/tianon/gosu/releases/download/$GOSU_VER/gosu-$dpkgArch.asc" && \ - export GNUPGHOME="$(mktemp -d)" && \ - gpg --batch --keyserver hkps://keys.openpgp.org --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4 && \ gpg --batch --verify /usr/local/bin/gosu.asc /usr/local/bin/gosu && \ - gpgconf --kill all && \ - rm -rf "$GNUPGHOME" /usr/local/bin/gosu.asc && \ + rm /usr/local/bin/gosu.asc && \ chmod +x /usr/local/bin/gosu && \ gosu --version && \ gosu nobody true @@ -32,14 +34,10 @@ RUN set -eux && \ esac && \ wget --no-verbose https://dl.influxdata.com/influxdb/releases/influxdb2-${INFLUXDB_VERSION}-linux-${ARCH}.tar.gz.asc && \ wget --no-verbose https://dl.influxdata.com/influxdb/releases/influxdb2-${INFLUXDB_VERSION}-linux-${ARCH}.tar.gz && \ - export GNUPGHOME="$(mktemp -d)" && \ - echo "disable-ipv6" >> $GNUPGHOME/dirmngr.conf && \ - gpg --batch --keyserver keys.openpgp.org --recv-keys 8C2D403D3C3BDB81A4C27C883C3E4B7317FFE40A && \ gpg --batch --verify influxdb2-${INFLUXDB_VERSION}-linux-${ARCH}.tar.gz.asc influxdb2-${INFLUXDB_VERSION}-linux-${ARCH}.tar.gz && \ tar xzf influxdb2-${INFLUXDB_VERSION}-linux-${ARCH}.tar.gz && \ cp influxdb2_linux_${ARCH}/influxd /usr/local/bin/influxd && \ - gpgconf --kill all && \ - rm -rf "$GNUPGHOME" influxdb2.key influxdb2-${INFLUXDB_VERSION}-linux-${ARCH}* && \ + rm -rf influxdb2-${INFLUXDB_VERSION}-linux-${ARCH}* && \ influxd version # Install the influx CLI @@ -53,14 +51,10 @@ RUN set -eux && \ esac && \ wget --no-verbose https://dl.influxdata.com/influxdb/releases/influxdb2-client-${INFLUX_CLI_VERSION}-linux-${ARCH}.tar.gz.asc && \ wget --no-verbose https://dl.influxdata.com/influxdb/releases/influxdb2-client-${INFLUX_CLI_VERSION}-linux-${ARCH}.tar.gz && \ - export GNUPGHOME="$(mktemp -d)" && \ - echo "disable-ipv6" >> $GNUPGHOME/dirmngr.conf && \ - gpg --batch --keyserver keys.openpgp.org --recv-keys 8C2D403D3C3BDB81A4C27C883C3E4B7317FFE40A && \ gpg --batch --verify influxdb2-client-${INFLUX_CLI_VERSION}-linux-${ARCH}.tar.gz.asc influxdb2-client-${INFLUX_CLI_VERSION}-linux-${ARCH}.tar.gz && \ tar xzf influxdb2-client-${INFLUX_CLI_VERSION}-linux-${ARCH}.tar.gz && \ cp influxdb2-client-${INFLUX_CLI_VERSION}-linux-${ARCH}/influx /usr/local/bin/influx && \ - gpgconf --kill all && \ - rm -rf "$GNUPGHOME" influxdb2.key influxdb2-client-${INFLUX_CLI_VERSION}-linux-${ARCH}* && \ + rm -rf influxdb2-client-${INFLUX_CLI_VERSION}-linux-${ARCH}* && \ influx version # Create standard directories expected by the entry-point. diff --git a/influxdb/2.3/alpine/Dockerfile b/influxdb/2.3/alpine/Dockerfile index 991698d72..666238c8d 100644 --- a/influxdb/2.3/alpine/Dockerfile +++ b/influxdb/2.3/alpine/Dockerfile @@ -1,4 +1,4 @@ -FROM alpine:3.14 +FROM alpine:latest RUN echo 'hosts: files dns' >> /etc/nsswitch.conf RUN apk add --no-cache tzdata bash ca-certificates gnupg run-parts su-exec && \ @@ -9,6 +9,10 @@ RUN addgroup -S -g 1000 influxdb && \ mkdir -p /home/influxdb && \ chown -R influxdb:influxdb /home/influxdb +RUN gpg --yes --batch \ + --keyserver hkps://keyserver.ubuntu.com:443 \ + --recv-keys 8C2D403D3C3BDB81A4C27C883C3E4B7317FFE40A + # Install the infuxd server ENV INFLUXDB_VERSION 2.3.0 RUN set -eux && \ @@ -22,14 +26,10 @@ RUN set -eux && \ fi && \ wget --no-verbose https://dl.influxdata.com/influxdb/releases/influxdb2-${INFLUXDB_VERSION}-linux-${ARCH}.tar.gz.asc && \ wget --no-verbose https://dl.influxdata.com/influxdb/releases/influxdb2-${INFLUXDB_VERSION}-linux-${ARCH}.tar.gz && \ - export GNUPGHOME="$(mktemp -d)" && \ - echo "disable-ipv6" >> $GNUPGHOME/dirmngr.conf && \ - gpg --keyserver keys.openpgp.org --recv-keys 8C2D403D3C3BDB81A4C27C883C3E4B7317FFE40A && \ gpg --batch --verify influxdb2-${INFLUXDB_VERSION}-linux-${ARCH}.tar.gz.asc influxdb2-${INFLUXDB_VERSION}-linux-${ARCH}.tar.gz && \ tar xzf influxdb2-${INFLUXDB_VERSION}-linux-${ARCH}.tar.gz && \ cp influxdb2_linux_${ARCH}/influxd /usr/local/bin/influxd && \ - gpgconf --kill all && \ - rm -rf "$GNUPGHOME" influxdb2.key influxdb2-${INFLUXDB_VERSION}-linux-${ARCH}* && \ + rm -rf influxdb2-${INFLUXDB_VERSION}-linux-${ARCH}* && \ influxd version # Install the influx CLI @@ -45,14 +45,10 @@ RUN set -eux && \ fi && \ wget --no-verbose https://dl.influxdata.com/influxdb/releases/influxdb2-client-${INFLUX_CLI_VERSION}-linux-${ARCH}.tar.gz.asc && \ wget --no-verbose https://dl.influxdata.com/influxdb/releases/influxdb2-client-${INFLUX_CLI_VERSION}-linux-${ARCH}.tar.gz && \ - export GNUPGHOME="$(mktemp -d)" && \ - echo "disable-ipv6" >> $GNUPGHOME/dirmngr.conf && \ - gpg --keyserver keys.openpgp.org --recv-keys 8C2D403D3C3BDB81A4C27C883C3E4B7317FFE40A && \ gpg --batch --verify influxdb2-client-${INFLUX_CLI_VERSION}-linux-${ARCH}.tar.gz.asc influxdb2-client-${INFLUX_CLI_VERSION}-linux-${ARCH}.tar.gz && \ tar xzf influxdb2-client-${INFLUX_CLI_VERSION}-linux-${ARCH}.tar.gz && \ cp influxdb2-client-${INFLUX_CLI_VERSION}-linux-${ARCH}/influx /usr/local/bin/influx && \ - gpgconf --kill all && \ - rm -rf "$GNUPGHOME" influxdb2.key influxdb2-client-${INFLUX_CLI_VERSION}-linux-${ARCH}* && \ + rm -rf influxdb2-client-${INFLUX_CLI_VERSION}-linux-${ARCH}* && \ influx version # Create standard directories expected by the entry-point. diff --git a/influxdb/2.4/Dockerfile b/influxdb/2.4/Dockerfile index c996cec8e..b9a9d6132 100644 --- a/influxdb/2.4/Dockerfile +++ b/influxdb/2.4/Dockerfile @@ -1,10 +1,15 @@ -FROM buildpack-deps:buster-curl +FROM buildpack-deps:bullseye-curl RUN groupadd -r influxdb --gid=1000 && \ useradd -r -g influxdb --uid=1000 --home-dir=/home/influxdb --shell=/bin/bash influxdb && \ mkdir -p /home/influxdb && \ chown -R influxdb:influxdb /home/influxdb +RUN gpg --yes --batch \ + --keyserver hkps://keyserver.ubuntu.com:443 \ + --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4 \ + 8C2D403D3C3BDB81A4C27C883C3E4B7317FFE40A + # Install gosu for easy step-down from root. # https://github.com/tianon/gosu/releases ENV GOSU_VER 1.12 @@ -12,11 +17,8 @@ RUN set -eux; \ dpkgArch="$(dpkg --print-architecture)" && \ wget -O /usr/local/bin/gosu "https://github.com/tianon/gosu/releases/download/$GOSU_VER/gosu-$dpkgArch" && \ wget -O /usr/local/bin/gosu.asc "https://github.com/tianon/gosu/releases/download/$GOSU_VER/gosu-$dpkgArch.asc" && \ - export GNUPGHOME="$(mktemp -d)" && \ - gpg --batch --keyserver hkps://keys.openpgp.org --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4 && \ gpg --batch --verify /usr/local/bin/gosu.asc /usr/local/bin/gosu && \ - gpgconf --kill all && \ - rm -rf "$GNUPGHOME" /usr/local/bin/gosu.asc && \ + rm /usr/local/bin/gosu.asc && \ chmod +x /usr/local/bin/gosu && \ gosu --version && \ gosu nobody true @@ -32,14 +34,10 @@ RUN set -eux && \ esac && \ wget --no-verbose https://dl.influxdata.com/influxdb/releases/influxdb2-${INFLUXDB_VERSION}-linux-${ARCH}.tar.gz.asc && \ wget --no-verbose https://dl.influxdata.com/influxdb/releases/influxdb2-${INFLUXDB_VERSION}-linux-${ARCH}.tar.gz && \ - export GNUPGHOME="$(mktemp -d)" && \ - echo "disable-ipv6" >> $GNUPGHOME/dirmngr.conf && \ - gpg --batch --keyserver keys.openpgp.org --recv-keys 8C2D403D3C3BDB81A4C27C883C3E4B7317FFE40A && \ gpg --batch --verify influxdb2-${INFLUXDB_VERSION}-linux-${ARCH}.tar.gz.asc influxdb2-${INFLUXDB_VERSION}-linux-${ARCH}.tar.gz && \ tar xzf influxdb2-${INFLUXDB_VERSION}-linux-${ARCH}.tar.gz && \ cp influxdb2_linux_${ARCH}/influxd /usr/local/bin/influxd && \ - gpgconf --kill all && \ - rm -rf "$GNUPGHOME" influxdb2.key influxdb2-${INFLUXDB_VERSION}-linux-${ARCH}* && \ + rm -rf influxdb2-${INFLUXDB_VERSION}-linux-${ARCH}* && \ influxd version # Install the influx CLI @@ -53,14 +51,10 @@ RUN set -eux && \ esac && \ wget --no-verbose https://dl.influxdata.com/influxdb/releases/influxdb2-client-${INFLUX_CLI_VERSION}-linux-${ARCH}.tar.gz.asc && \ wget --no-verbose https://dl.influxdata.com/influxdb/releases/influxdb2-client-${INFLUX_CLI_VERSION}-linux-${ARCH}.tar.gz && \ - export GNUPGHOME="$(mktemp -d)" && \ - echo "disable-ipv6" >> $GNUPGHOME/dirmngr.conf && \ - gpg --batch --keyserver keys.openpgp.org --recv-keys 8C2D403D3C3BDB81A4C27C883C3E4B7317FFE40A && \ gpg --batch --verify influxdb2-client-${INFLUX_CLI_VERSION}-linux-${ARCH}.tar.gz.asc influxdb2-client-${INFLUX_CLI_VERSION}-linux-${ARCH}.tar.gz && \ tar xzf influxdb2-client-${INFLUX_CLI_VERSION}-linux-${ARCH}.tar.gz && \ cp influxdb2-client-${INFLUX_CLI_VERSION}-linux-${ARCH}/influx /usr/local/bin/influx && \ - gpgconf --kill all && \ - rm -rf "$GNUPGHOME" influxdb2.key influxdb2-client-${INFLUX_CLI_VERSION}-linux-${ARCH}* && \ + rm -rf influxdb2-client-${INFLUX_CLI_VERSION}-linux-${ARCH}* && \ influx version # Create standard directories expected by the entry-point. diff --git a/influxdb/2.4/alpine/Dockerfile b/influxdb/2.4/alpine/Dockerfile index aade1c593..163c7b115 100644 --- a/influxdb/2.4/alpine/Dockerfile +++ b/influxdb/2.4/alpine/Dockerfile @@ -1,4 +1,4 @@ -FROM alpine:3.14 +FROM alpine:latest RUN echo 'hosts: files dns' >> /etc/nsswitch.conf RUN apk add --no-cache tzdata bash ca-certificates gnupg run-parts su-exec && \ @@ -9,6 +9,10 @@ RUN addgroup -S -g 1000 influxdb && \ mkdir -p /home/influxdb && \ chown -R influxdb:influxdb /home/influxdb +RUN gpg --yes --batch \ + --keyserver hkps://keyserver.ubuntu.com:443 \ + --recv-keys 8C2D403D3C3BDB81A4C27C883C3E4B7317FFE40A + # Install the infuxd server ENV INFLUXDB_VERSION 2.4.0 RUN set -eux && \ @@ -22,14 +26,10 @@ RUN set -eux && \ fi && \ wget --no-verbose https://dl.influxdata.com/influxdb/releases/influxdb2-${INFLUXDB_VERSION}-linux-${ARCH}.tar.gz.asc && \ wget --no-verbose https://dl.influxdata.com/influxdb/releases/influxdb2-${INFLUXDB_VERSION}-linux-${ARCH}.tar.gz && \ - export GNUPGHOME="$(mktemp -d)" && \ - echo "disable-ipv6" >> $GNUPGHOME/dirmngr.conf && \ - gpg --keyserver keys.openpgp.org --recv-keys 8C2D403D3C3BDB81A4C27C883C3E4B7317FFE40A && \ gpg --batch --verify influxdb2-${INFLUXDB_VERSION}-linux-${ARCH}.tar.gz.asc influxdb2-${INFLUXDB_VERSION}-linux-${ARCH}.tar.gz && \ tar xzf influxdb2-${INFLUXDB_VERSION}-linux-${ARCH}.tar.gz && \ cp influxdb2_linux_${ARCH}/influxd /usr/local/bin/influxd && \ - gpgconf --kill all && \ - rm -rf "$GNUPGHOME" influxdb2.key influxdb2-${INFLUXDB_VERSION}-linux-${ARCH}* && \ + rm -rf influxdb2-${INFLUXDB_VERSION}-linux-${ARCH}* && \ influxd version # Install the influx CLI @@ -45,14 +45,10 @@ RUN set -eux && \ fi && \ wget --no-verbose https://dl.influxdata.com/influxdb/releases/influxdb2-client-${INFLUX_CLI_VERSION}-linux-${ARCH}.tar.gz.asc && \ wget --no-verbose https://dl.influxdata.com/influxdb/releases/influxdb2-client-${INFLUX_CLI_VERSION}-linux-${ARCH}.tar.gz && \ - export GNUPGHOME="$(mktemp -d)" && \ - echo "disable-ipv6" >> $GNUPGHOME/dirmngr.conf && \ - gpg --keyserver keys.openpgp.org --recv-keys 8C2D403D3C3BDB81A4C27C883C3E4B7317FFE40A && \ gpg --batch --verify influxdb2-client-${INFLUX_CLI_VERSION}-linux-${ARCH}.tar.gz.asc influxdb2-client-${INFLUX_CLI_VERSION}-linux-${ARCH}.tar.gz && \ tar xzf influxdb2-client-${INFLUX_CLI_VERSION}-linux-${ARCH}.tar.gz && \ cp influxdb2-client-${INFLUX_CLI_VERSION}-linux-${ARCH}/influx /usr/local/bin/influx && \ - gpgconf --kill all && \ - rm -rf "$GNUPGHOME" influxdb2.key influxdb2-client-${INFLUX_CLI_VERSION}-linux-${ARCH}* && \ + rm -rf influxdb2-client-${INFLUX_CLI_VERSION}-linux-${ARCH}* && \ influx version # Create standard directories expected by the entry-point. diff --git a/kapacitor/1.4/Dockerfile b/kapacitor/1.4/Dockerfile index ad48f417d..89f2bdad0 100644 --- a/kapacitor/1.4/Dockerfile +++ b/kapacitor/1.4/Dockerfile @@ -1,18 +1,13 @@ -FROM buildpack-deps:stretch-curl +FROM buildpack-deps:bullseye-curl RUN DEBIAN_FRONTEND=noninteractive apt-get update && \ DEBIAN_FRONTEND=noninteractive apt-get install -y bash-completion && \ awk 'f{if(sub(/^#/,"",$0)==0){f=0}};/^# enable bash completion/{f=1};{print;}' /etc/bash.bashrc > /etc/bash.bashrc.new && \ mv /etc/bash.bashrc.new /etc/bash.bashrc -RUN set -ex && \ - mkdir ~/.gnupg; \ - echo "disable-ipv6" >> ~/.gnupg/dirmngr.conf; \ - for key in \ - 05CE15085FC09D18E99EFB22684A14CF2582E0C5 ; \ - do \ - gpg --keyserver hkp://keyserver.ubuntu.com --recv-keys "$key" ; \ - done +RUN gpg --yes --batch \ + --keyserver hkps://keyserver.ubuntu.com:443 \ + --recv-keys 05CE15085FC09D18E99EFB22684A14CF2582E0C5 ENV KAPACITOR_VERSION 1.4.1 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" && \ diff --git a/kapacitor/1.4/alpine/Dockerfile b/kapacitor/1.4/alpine/Dockerfile index b88406ce3..858b16510 100644 --- a/kapacitor/1.4/alpine/Dockerfile +++ b/kapacitor/1.4/alpine/Dockerfile @@ -1,20 +1,17 @@ -FROM alpine:3.14 +FROM alpine:latest RUN echo 'hosts: files dns' >> /etc/nsswitch.conf -RUN apk add --no-cache ca-certificates && \ +RUN apk add --no-cache ca-certificates gnupg && \ update-ca-certificates +RUN gpg --yes --batch \ + --keyserver hkps://keyserver.ubuntu.com:443 \ + --recv-keys 05CE15085FC09D18E99EFB22684A14CF2582E0C5 + ENV KAPACITOR_VERSION 1.4.1 RUN set -ex && \ - mkdir ~/.gnupg; \ - echo "disable-ipv6" >> ~/.gnupg/dirmngr.conf; \ - apk add --no-cache --virtual .build-deps wget gnupg tar && \ - for key in \ - 05CE15085FC09D18E99EFB22684A14CF2582E0C5 ; \ - do \ - gpg --keyserver hkp://keyserver.ubuntu.com --recv-keys "$key" ; \ - done && \ + apk add --no-cache --virtual .build-deps wget tar && \ wget --no-verbose https://dl.influxdata.com/kapacitor/releases/kapacitor-${KAPACITOR_VERSION}-static_linux_amd64.tar.gz.asc && \ wget --no-verbose https://dl.influxdata.com/kapacitor/releases/kapacitor-${KAPACITOR_VERSION}-static_linux_amd64.tar.gz && \ gpg --batch --verify kapacitor-${KAPACITOR_VERSION}-static_linux_amd64.tar.gz.asc kapacitor-${KAPACITOR_VERSION}-static_linux_amd64.tar.gz && \ @@ -23,8 +20,7 @@ RUN set -ex && \ rm -f /usr/src/kapacitor-*/kapacitor.conf && \ chmod +x /usr/src/kapacitor-*/* && \ cp -a /usr/src/kapacitor-*/* /usr/bin/ && \ - gpgconf --kill all && \ - rm -rf *.tar.gz* /usr/src /root/.gnupg && \ + rm -rf *.tar.gz* /usr/src && \ apk del .build-deps COPY kapacitor.conf /etc/kapacitor/kapacitor.conf diff --git a/kapacitor/1.5/Dockerfile b/kapacitor/1.5/Dockerfile index e5fe7afc5..beb82afe1 100644 --- a/kapacitor/1.5/Dockerfile +++ b/kapacitor/1.5/Dockerfile @@ -1,18 +1,13 @@ -FROM buildpack-deps:stretch-curl +FROM buildpack-deps:bullseye-curl RUN DEBIAN_FRONTEND=noninteractive apt-get update && \ DEBIAN_FRONTEND=noninteractive apt-get install -y bash-completion && \ awk 'f{if(sub(/^#/,"",$0)==0){f=0}};/^# enable bash completion/{f=1};{print;}' /etc/bash.bashrc > /etc/bash.bashrc.new && \ mv /etc/bash.bashrc.new /etc/bash.bashrc -RUN set -ex && \ - mkdir ~/.gnupg; \ - echo "disable-ipv6" >> ~/.gnupg/dirmngr.conf; \ - for key in \ - 05CE15085FC09D18E99EFB22684A14CF2582E0C5 ; \ - do \ - gpg --keyserver hkp://keyserver.ubuntu.com --recv-keys "$key" ; \ - done +RUN gpg --yes --batch \ + --keyserver hkps://keyserver.ubuntu.com:443 \ + --recv-keys 05CE15085FC09D18E99EFB22684A14CF2582E0C5 ENV KAPACITOR_VERSION 1.5.9 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" && \ diff --git a/kapacitor/1.5/alpine/Dockerfile b/kapacitor/1.5/alpine/Dockerfile index 8560e6225..bbaab4100 100644 --- a/kapacitor/1.5/alpine/Dockerfile +++ b/kapacitor/1.5/alpine/Dockerfile @@ -1,20 +1,17 @@ -FROM alpine:3.14 +FROM alpine:latest RUN echo 'hosts: files dns' >> /etc/nsswitch.conf -RUN apk add --no-cache ca-certificates && \ +RUN apk add --no-cache ca-certificates gnupg && \ update-ca-certificates +RUN gpg --yes --batch \ + --keyserver hkps://keyserver.ubuntu.com:443 \ + --recv-keys 05CE15085FC09D18E99EFB22684A14CF2582E0C5 + ENV KAPACITOR_VERSION 1.5.9 RUN set -ex && \ - mkdir ~/.gnupg; \ - echo "disable-ipv6" >> ~/.gnupg/dirmngr.conf; \ - apk add --no-cache --virtual .build-deps wget gnupg tar && \ - for key in \ - 05CE15085FC09D18E99EFB22684A14CF2582E0C5 ; \ - do \ - gpg --keyserver hkp://keyserver.ubuntu.com --recv-keys "$key" ; \ - done && \ + apk add --no-cache --virtual .build-deps wget tar && \ wget --no-verbose https://dl.influxdata.com/kapacitor/releases/kapacitor-${KAPACITOR_VERSION}-static_linux_amd64.tar.gz.asc && \ wget --no-verbose https://dl.influxdata.com/kapacitor/releases/kapacitor-${KAPACITOR_VERSION}-static_linux_amd64.tar.gz && \ gpg --batch --verify kapacitor-${KAPACITOR_VERSION}-static_linux_amd64.tar.gz.asc kapacitor-${KAPACITOR_VERSION}-static_linux_amd64.tar.gz && \ @@ -23,8 +20,7 @@ RUN set -ex && \ rm -f /usr/src/kapacitor-*/kapacitor.conf && \ chmod +x /usr/src/kapacitor-*/* && \ cp -a /usr/src/kapacitor-*/* /usr/bin/ && \ - gpgconf --kill all && \ - rm -rf *.tar.gz* /usr/src /root/.gnupg && \ + rm -rf *.tar.gz* /usr/src && \ apk del .build-deps COPY kapacitor.conf /etc/kapacitor/kapacitor.conf diff --git a/kapacitor/1.6/Dockerfile b/kapacitor/1.6/Dockerfile index bbb034400..14c560d1c 100644 --- a/kapacitor/1.6/Dockerfile +++ b/kapacitor/1.6/Dockerfile @@ -5,6 +5,10 @@ RUN DEBIAN_FRONTEND=noninteractive apt-get update && \ awk 'f{if(sub(/^#/,"",$0)==0){f=0}};/^# enable bash completion/{f=1};{print;}' /etc/bash.bashrc > /etc/bash.bashrc.new && \ mv /etc/bash.bashrc.new /etc/bash.bashrc +RUN gpg --yes --batch \ + --keyserver hkps://keyserver.ubuntu.com:443 \ + --recv-keys 05CE15085FC09D18E99EFB22684A14CF2582E0C5 + ENV KAPACITOR_VERSION 1.6.5 RUN set -eux && \ @@ -16,13 +20,8 @@ RUN set -eux && \ esac && \ wget --no-verbose https://dl.influxdata.com/kapacitor/releases/kapacitor_${KAPACITOR_VERSION}-1_${ARCH}.deb.asc && \ wget --no-verbose https://dl.influxdata.com/kapacitor/releases/kapacitor_${KAPACITOR_VERSION}-1_${ARCH}.deb && \ - export GNUPGHOME="$(mktemp -d)" && \ - echo "disable-ipv6" >> $GNUPGHOME/dirmngr.conf && \ - gpg --batch --keyserver hkp://keyserver.ubuntu.com --recv-keys 05CE15085FC09D18E99EFB22684A14CF2582E0C5 && \ gpg --batch --verify kapacitor_${KAPACITOR_VERSION}-1_${ARCH}.deb.asc kapacitor_${KAPACITOR_VERSION}-1_${ARCH}.deb && \ - rm -rf "$GNUPGHOME" && \ dpkg -i kapacitor_${KAPACITOR_VERSION}-1_${ARCH}.deb && \ - gpgconf --kill all && \ rm -f kapacitor_${KAPACITOR_VERSION}-1_${ARCH}.deb* COPY kapacitor.conf /etc/kapacitor/kapacitor.conf diff --git a/kapacitor/1.6/alpine/Dockerfile b/kapacitor/1.6/alpine/Dockerfile index 934c2c32b..5c06f8d26 100644 --- a/kapacitor/1.6/alpine/Dockerfile +++ b/kapacitor/1.6/alpine/Dockerfile @@ -1,28 +1,24 @@ -FROM alpine:3.16 +FROM alpine:latest RUN echo 'hosts: files dns' >> /etc/nsswitch.conf -RUN apk add --no-cache ca-certificates && \ +RUN apk add --no-cache ca-certificates gnupg && \ update-ca-certificates +RUN gpg --yes --batch \ + --keyserver hkps://keyserver.ubuntu.com:443 \ + --recv-keys 05CE15085FC09D18E99EFB22684A14CF2582E0C5 + ENV KAPACITOR_VERSION 1.6.5 RUN set -ex && \ - mkdir ~/.gnupg; \ - echo "disable-ipv6" >> ~/.gnupg/dirmngr.conf; \ - apk add --no-cache --virtual .build-deps wget gnupg tar && \ - for key in \ - 05CE15085FC09D18E99EFB22684A14CF2582E0C5 ; \ - do \ - gpg --keyserver hkp://keyserver.ubuntu.com --recv-keys "$key" ; \ - done && \ + apk add --no-cache --virtual .build-deps wget tar && \ wget --no-verbose https://dl.influxdata.com/kapacitor/releases/kapacitor-${KAPACITOR_VERSION}_linux_amd64.tar.gz.asc && \ wget --no-verbose https://dl.influxdata.com/kapacitor/releases/kapacitor-${KAPACITOR_VERSION}_linux_amd64.tar.gz && \ gpg --batch --verify kapacitor-${KAPACITOR_VERSION}_linux_amd64.tar.gz.asc kapacitor-${KAPACITOR_VERSION}_linux_amd64.tar.gz && \ mkdir -p /usr/src && \ tar -C /usr/src -xzf kapacitor-${KAPACITOR_VERSION}_linux_amd64.tar.gz && \ cp -ar /usr/src/kapacitor-*/* / && \ - gpgconf --kill all && \ - rm -rf *.tar.gz* /usr/src /root/.gnupg && \ + rm -rf *.tar.gz* /usr/src && \ apk del .build-deps COPY kapacitor.conf /etc/kapacitor/kapacitor.conf EXPOSE 9092 diff --git a/telegraf/1.21/Dockerfile b/telegraf/1.21/Dockerfile index 272f24388..53f16b73c 100644 --- a/telegraf/1.21/Dockerfile +++ b/telegraf/1.21/Dockerfile @@ -1,17 +1,19 @@ FROM buildpack-deps:bullseye-curl -RUN DEBIAN_FRONTEND=noninteractive apt-get update && \ - DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends iputils-ping snmp procps lm-sensors libcap2-bin && \ - rm -rf /var/lib/apt/lists/* +RUN export DEBIAN_FRONTEND=noninteractive && \ + apt-get update && \ + apt-get install \ + --yes --no-install-recommends \ + iputils-ping \ + libcap2-bin \ + lm-sensors \ + procps \ + snmp && \ + rm -rf /var/lib/apt/lists -RUN set -ex && \ - mkdir ~/.gnupg; \ - echo "disable-ipv6" >> ~/.gnupg/dirmngr.conf; \ - for key in \ - 05CE15085FC09D18E99EFB22684A14CF2582E0C5 ; \ - do \ - gpg --keyserver hkp://keyserver.ubuntu.com --recv-keys "$key" ; \ - done +RUN gpg --yes --batch \ + --keyserver hkps://keyserver.ubuntu.com:443 \ + --recv-keys 05CE15085FC09D18E99EFB22684A14CF2582E0C5 ENV TELEGRAF_VERSION 1.21.4 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" && \ diff --git a/telegraf/1.21/alpine/Dockerfile b/telegraf/1.21/alpine/Dockerfile index 9bd24647f..4e79cc832 100644 --- a/telegraf/1.21/alpine/Dockerfile +++ b/telegraf/1.21/alpine/Dockerfile @@ -1,20 +1,26 @@ -FROM alpine:3.15 +FROM alpine:latest RUN echo 'hosts: files dns' >> /etc/nsswitch.conf -RUN apk add --no-cache iputils ca-certificates net-snmp-tools procps lm_sensors tzdata su-exec libcap && \ +RUN apk add --no-cache \ + ca-certificates \ + gnupg \ + iputils \ + libcap \ + lm_sensors \ + net-snmp-tools \ + procps \ + su-exec \ + tzdata && \ update-ca-certificates +RUN gpg --yes --batch \ + --keyserver hkps://keyserver.ubuntu.com:443 \ + --recv-keys 05CE15085FC09D18E99EFB22684A14CF2582E0C5 + ENV TELEGRAF_VERSION 1.21.4 RUN set -ex && \ - mkdir ~/.gnupg; \ - echo "disable-ipv6" >> ~/.gnupg/dirmngr.conf; \ - apk add --no-cache --virtual .build-deps wget gnupg tar && \ - for key in \ - 05CE15085FC09D18E99EFB22684A14CF2582E0C5 ; \ - do \ - gpg --keyserver hkp://keyserver.ubuntu.com --recv-keys "$key" ; \ - done && \ + apk add --no-cache --virtual .build-deps wget tar && \ wget --no-verbose https://dl.influxdata.com/telegraf/releases/telegraf-${TELEGRAF_VERSION}_static_linux_amd64.tar.gz.asc && \ wget --no-verbose https://dl.influxdata.com/telegraf/releases/telegraf-${TELEGRAF_VERSION}_static_linux_amd64.tar.gz && \ gpg --batch --verify telegraf-${TELEGRAF_VERSION}_static_linux_amd64.tar.gz.asc telegraf-${TELEGRAF_VERSION}_static_linux_amd64.tar.gz && \ @@ -23,8 +29,7 @@ RUN set -ex && \ mv /usr/src/telegraf*/etc/telegraf/telegraf.conf /etc/telegraf/ && \ mkdir /etc/telegraf/telegraf.d && \ cp -a /usr/src/telegraf*/usr/bin/telegraf /usr/bin/ && \ - gpgconf --kill all && \ - rm -rf *.tar.gz* /usr/src /root/.gnupg && \ + rm -rf *.tar.gz* /usr/src && \ apk del .build-deps && \ addgroup -S telegraf && \ adduser -S telegraf -G telegraf && \ diff --git a/telegraf/1.22/Dockerfile b/telegraf/1.22/Dockerfile index a9fff0463..81e401fe2 100644 --- a/telegraf/1.22/Dockerfile +++ b/telegraf/1.22/Dockerfile @@ -1,17 +1,19 @@ FROM buildpack-deps:bullseye-curl -RUN DEBIAN_FRONTEND=noninteractive apt-get update && \ - DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends iputils-ping snmp procps lm-sensors libcap2-bin && \ - rm -rf /var/lib/apt/lists/* +RUN export DEBIAN_FRONTEND=noninteractive && \ + apt-get update && \ + apt-get install \ + --yes --no-install-recommends \ + iputils-ping \ + libcap2-bin \ + lm-sensors \ + procps \ + snmp && \ + rm -rf /var/lib/apt/lists -RUN set -ex && \ - mkdir ~/.gnupg; \ - echo "disable-ipv6" >> ~/.gnupg/dirmngr.conf; \ - for key in \ - 05CE15085FC09D18E99EFB22684A14CF2582E0C5 ; \ - do \ - gpg --keyserver hkp://keyserver.ubuntu.com --recv-keys "$key" ; \ - done +RUN gpg --yes --batch \ + --keyserver hkps://keyserver.ubuntu.com:443 \ + --recv-keys 05CE15085FC09D18E99EFB22684A14CF2582E0C5 ENV TELEGRAF_VERSION 1.22.4 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" && \ diff --git a/telegraf/1.22/alpine/Dockerfile b/telegraf/1.22/alpine/Dockerfile index c9f746987..eccd55e35 100644 --- a/telegraf/1.22/alpine/Dockerfile +++ b/telegraf/1.22/alpine/Dockerfile @@ -1,20 +1,26 @@ -FROM alpine:3.16 +FROM alpine:latest RUN echo 'hosts: files dns' >> /etc/nsswitch.conf -RUN apk add --no-cache iputils ca-certificates net-snmp-tools procps lm_sensors tzdata su-exec libcap && \ +RUN apk add --no-cache \ + ca-certificates \ + gnupg \ + iputils \ + libcap \ + lm_sensors \ + net-snmp-tools \ + procps \ + su-exec \ + tzdata && \ update-ca-certificates +RUN gpg --yes --batch \ + --keyserver hkps://keyserver.ubuntu.com:443 \ + --recv-keys 05CE15085FC09D18E99EFB22684A14CF2582E0C5 + ENV TELEGRAF_VERSION 1.22.4 RUN set -ex && \ - mkdir ~/.gnupg; \ - echo "disable-ipv6" >> ~/.gnupg/dirmngr.conf; \ - apk add --no-cache --virtual .build-deps wget gnupg tar && \ - for key in \ - 05CE15085FC09D18E99EFB22684A14CF2582E0C5 ; \ - do \ - gpg --keyserver hkp://keyserver.ubuntu.com --recv-keys "$key" ; \ - done && \ + apk add --no-cache --virtual .build-deps wget tar && \ wget --no-verbose https://dl.influxdata.com/telegraf/releases/telegraf-${TELEGRAF_VERSION}_static_linux_amd64.tar.gz.asc && \ wget --no-verbose https://dl.influxdata.com/telegraf/releases/telegraf-${TELEGRAF_VERSION}_static_linux_amd64.tar.gz && \ gpg --batch --verify telegraf-${TELEGRAF_VERSION}_static_linux_amd64.tar.gz.asc telegraf-${TELEGRAF_VERSION}_static_linux_amd64.tar.gz && \ @@ -23,8 +29,7 @@ RUN set -ex && \ mv /usr/src/telegraf*/etc/telegraf/telegraf.conf /etc/telegraf/ && \ mkdir /etc/telegraf/telegraf.d && \ cp -a /usr/src/telegraf*/usr/bin/telegraf /usr/bin/ && \ - gpgconf --kill all && \ - rm -rf *.tar.gz* /usr/src /root/.gnupg && \ + rm -rf *.tar.gz* /usr/src && \ apk del .build-deps && \ addgroup -S telegraf && \ adduser -S telegraf -G telegraf && \ diff --git a/telegraf/1.23/Dockerfile b/telegraf/1.23/Dockerfile index dacd15240..c79b7464c 100644 --- a/telegraf/1.23/Dockerfile +++ b/telegraf/1.23/Dockerfile @@ -1,17 +1,19 @@ FROM buildpack-deps:bullseye-curl -RUN DEBIAN_FRONTEND=noninteractive apt-get update && \ - DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends iputils-ping snmp procps lm-sensors libcap2-bin && \ - rm -rf /var/lib/apt/lists/* +RUN export DEBIAN_FRONTEND=noninteractive && \ + apt-get update && \ + apt-get install \ + --yes --no-install-recommends \ + iputils-ping \ + libcap2-bin \ + lm-sensors \ + procps \ + snmp && \ + rm -rf /var/lib/apt/lists -RUN set -ex && \ - mkdir ~/.gnupg; \ - echo "disable-ipv6" >> ~/.gnupg/dirmngr.conf; \ - for key in \ - 05CE15085FC09D18E99EFB22684A14CF2582E0C5 ; \ - do \ - gpg --keyserver hkp://keyserver.ubuntu.com --recv-keys "$key" ; \ - done +RUN gpg --yes --batch \ + --keyserver hkps://keyserver.ubuntu.com:443 \ + --recv-keys 05CE15085FC09D18E99EFB22684A14CF2582E0C5 ENV TELEGRAF_VERSION 1.23.4 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" && \ diff --git a/telegraf/1.23/alpine/Dockerfile b/telegraf/1.23/alpine/Dockerfile index de7360c7d..c375fb2b3 100644 --- a/telegraf/1.23/alpine/Dockerfile +++ b/telegraf/1.23/alpine/Dockerfile @@ -1,20 +1,26 @@ -FROM alpine:3.16 +FROM alpine:latest RUN echo 'hosts: files dns' >> /etc/nsswitch.conf -RUN apk add --no-cache iputils ca-certificates net-snmp-tools procps lm_sensors tzdata su-exec libcap && \ +RUN apk add --no-cache \ + ca-certificates \ + gnupg \ + iputils \ + libcap \ + lm_sensors \ + net-snmp-tools \ + procps \ + su-exec \ + tzdata && \ update-ca-certificates +RUN gpg --yes --batch \ + --keyserver hkps://keyserver.ubuntu.com:443 \ + --recv-keys 05CE15085FC09D18E99EFB22684A14CF2582E0C5 + ENV TELEGRAF_VERSION 1.23.4 RUN set -ex && \ - mkdir ~/.gnupg; \ - echo "disable-ipv6" >> ~/.gnupg/dirmngr.conf; \ - apk add --no-cache --virtual .build-deps wget gnupg tar && \ - for key in \ - 05CE15085FC09D18E99EFB22684A14CF2582E0C5 ; \ - do \ - gpg --keyserver hkp://keyserver.ubuntu.com --recv-keys "$key" ; \ - done && \ + apk add --no-cache --virtual .build-deps wget tar && \ wget --no-verbose https://dl.influxdata.com/telegraf/releases/telegraf-${TELEGRAF_VERSION}_static_linux_amd64.tar.gz.asc && \ wget --no-verbose https://dl.influxdata.com/telegraf/releases/telegraf-${TELEGRAF_VERSION}_static_linux_amd64.tar.gz && \ gpg --batch --verify telegraf-${TELEGRAF_VERSION}_static_linux_amd64.tar.gz.asc telegraf-${TELEGRAF_VERSION}_static_linux_amd64.tar.gz && \ @@ -23,8 +29,7 @@ RUN set -ex && \ mv /usr/src/telegraf*/etc/telegraf/telegraf.conf /etc/telegraf/ && \ mkdir /etc/telegraf/telegraf.d && \ cp -a /usr/src/telegraf*/usr/bin/telegraf /usr/bin/ && \ - gpgconf --kill all && \ - rm -rf *.tar.gz* /usr/src /root/.gnupg && \ + rm -rf *.tar.gz* /usr/src && \ apk del .build-deps && \ addgroup -S telegraf && \ adduser -S telegraf -G telegraf && \ diff --git a/telegraf/nightly/alpine/Dockerfile b/telegraf/nightly/alpine/Dockerfile index a58ce247b..dcb851702 100644 --- a/telegraf/nightly/alpine/Dockerfile +++ b/telegraf/nightly/alpine/Dockerfile @@ -1,4 +1,4 @@ -FROM alpine:3.16 +FROM alpine:latest RUN echo 'hosts: files dns' >> /etc/nsswitch.conf RUN apk add --no-cache iputils ca-certificates net-snmp-tools procps lm_sensors tzdata su-exec libcap && \