File tree Expand file tree Collapse file tree 2 files changed +2
-21
lines changed Expand file tree Collapse file tree 2 files changed +2
-21
lines changed Original file line number Diff line number Diff line change @@ -4,15 +4,6 @@ RUN DEBIAN_FRONTEND=noninteractive apt-get update && \
4
4
DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends iputils-ping snmp procps lm-sensors && \
5
5
rm -rf /var/lib/apt/lists/*
6
6
7
- RUN set -ex && \
8
- mkdir ~/.gnupg; \
9
- echo "disable-ipv6" >> ~/.gnupg/dirmngr.conf; \
10
- for key in \
11
- 05CE15085FC09D18E99EFB22684A14CF2582E0C5 ; \
12
- do \
13
- gpg --keyserver hkp://keyserver.ubuntu.com --recv-keys "$key" ; \
14
- done
15
-
16
7
ENV TELEGRAF_VERSION nightly
17
8
RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" && \
18
9
case "${dpkgArch##*-}" in \
@@ -22,9 +13,7 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" && \
22
13
armel) ARCH='armel' ;; \
23
14
*) echo "Unsupported architecture: ${dpkgArch}" ; exit 1;; \
24
15
esac && \
25
- wget --no-verbose https://dl.influxdata.com/telegraf/releases/telegraf_${TELEGRAF_VERSION}_${ARCH}.deb.asc && \
26
16
wget --no-verbose https://dl.influxdata.com/telegraf/releases/telegraf_${TELEGRAF_VERSION}_${ARCH}.deb && \
27
- gpg --batch --verify telegraf_${TELEGRAF_VERSION}_${ARCH}.deb.asc telegraf_${TELEGRAF_VERSION}_${ARCH}.deb && \
28
17
dpkg -i telegraf_${TELEGRAF_VERSION}_${ARCH}.deb && \
29
18
rm -f telegraf_${TELEGRAF_VERSION}_${ARCH}.deb*
30
19
Original file line number Diff line number Diff line change @@ -8,24 +8,16 @@ RUN apk add --no-cache iputils ca-certificates net-snmp-tools procps lm_sensors
8
8
ENV TELEGRAF_VERSION nightly
9
9
10
10
RUN set -ex && \
11
- mkdir ~/.gnupg; \
12
- echo "disable-ipv6" >> ~/.gnupg/dirmngr.conf; \
13
- apk add --no-cache --virtual .build-deps wget gnupg tar && \
14
- for key in \
15
- 05CE15085FC09D18E99EFB22684A14CF2582E0C5 ; \
16
- do \
17
- gpg --keyserver hkp://keyserver.ubuntu.com --recv-keys "$key" ; \
18
- done && \
11
+ apk add --no-cache --virtual .build-deps wget tar && \
19
12
wget --no-verbose https://dl.influxdata.com/telegraf/nightlies/telegraf-static-${TELEGRAF_VERSION}_linux_amd64.tar.gz.asc && \
20
13
wget --no-verbose https://dl.influxdata.com/telegraf/nightlies/telegraf-static-${TELEGRAF_VERSION}_linux_amd64.tar.gz && \
21
- gpg --batch --verify telegraf-static-${TELEGRAF_VERSION}_linux_amd64.tar.gz.asc telegraf-static-${TELEGRAF_VERSION}_linux_amd64.tar.gz && \
22
14
mkdir -p /usr/src /etc/telegraf && \
23
15
tar -C /usr/src -xzf telegraf-static-${TELEGRAF_VERSION}_linux_amd64.tar.gz && \
24
16
mv /usr/src/telegraf*/etc/telegraf/telegraf.conf /etc/telegraf/ && \
25
17
mkdir /etc/telegraf/telegraf.d && \
26
18
cp -a /usr/src/telegraf*/usr/bin/telegraf /usr/bin/ && \
27
19
gpgconf --kill all && \
28
- rm -rf *.tar.gz* /usr/src /root/.gnupg && \
20
+ rm -rf *.tar.gz* /usr/src && \
29
21
apk del .build-deps && \
30
22
addgroup -S telegraf && \
31
23
adduser -S telegraf -G telegraf && \
You can’t perform that action at this time.
0 commit comments