Skip to content

Commit d87251c

Browse files
author
Sebastian Spaink
committed
no asc files for nightly
1 parent 0c3c0b1 commit d87251c

File tree

2 files changed

+2
-21
lines changed

2 files changed

+2
-21
lines changed

telegraf/nightly/Dockerfile

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -4,15 +4,6 @@ RUN DEBIAN_FRONTEND=noninteractive apt-get update && \
44
DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends iputils-ping snmp procps lm-sensors && \
55
rm -rf /var/lib/apt/lists/*
66

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-
167
ENV TELEGRAF_VERSION nightly
178
RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" && \
189
case "${dpkgArch##*-}" in \
@@ -22,9 +13,7 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" && \
2213
armel) ARCH='armel';; \
2314
*) echo "Unsupported architecture: ${dpkgArch}"; exit 1;; \
2415
esac && \
25-
wget --no-verbose https://dl.influxdata.com/telegraf/releases/telegraf_${TELEGRAF_VERSION}_${ARCH}.deb.asc && \
2616
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 && \
2817
dpkg -i telegraf_${TELEGRAF_VERSION}_${ARCH}.deb && \
2918
rm -f telegraf_${TELEGRAF_VERSION}_${ARCH}.deb*
3019

telegraf/nightly/alpine/Dockerfile

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -8,24 +8,16 @@ RUN apk add --no-cache iputils ca-certificates net-snmp-tools procps lm_sensors
88
ENV TELEGRAF_VERSION nightly
99

1010
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 && \
1912
wget --no-verbose https://dl.influxdata.com/telegraf/nightlies/telegraf-static-${TELEGRAF_VERSION}_linux_amd64.tar.gz.asc && \
2013
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 && \
2214
mkdir -p /usr/src /etc/telegraf && \
2315
tar -C /usr/src -xzf telegraf-static-${TELEGRAF_VERSION}_linux_amd64.tar.gz && \
2416
mv /usr/src/telegraf*/etc/telegraf/telegraf.conf /etc/telegraf/ && \
2517
mkdir /etc/telegraf/telegraf.d && \
2618
cp -a /usr/src/telegraf*/usr/bin/telegraf /usr/bin/ && \
2719
gpgconf --kill all && \
28-
rm -rf *.tar.gz* /usr/src /root/.gnupg && \
20+
rm -rf *.tar.gz* /usr/src && \
2921
apk del .build-deps && \
3022
addgroup -S telegraf && \
3123
adduser -S telegraf -G telegraf && \

0 commit comments

Comments
 (0)