Skip to content

Commit 959a293

Browse files
committed
Update go version for telegraf
Use self-built version: influxdata/telegraf#18369 Build instructions in telegraf repo: make ci # Ignore push failure docker run --rm -it -v $PWD:/telegraf -w /telegraf quay.io/influxdb/telegraf-ci:1.25.7 make dep && make package include_packages='amd64.deb linux_amd64.tar.gz' # Copy the files from build/dist to docker
1 parent dfbe061 commit 959a293

File tree

2 files changed

+7
-46
lines changed

2 files changed

+7
-46
lines changed

telegraf/1.37/Dockerfile

Lines changed: 4 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -1,32 +1,12 @@
1-
FROM buildpack-deps:trixie-curl
1+
FROM debian:trixie-slim
22

33
RUN DEBIAN_FRONTEND=noninteractive apt-get update && \
44
DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends iputils-ping snmp procps lm-sensors libcap2-bin && \
5-
rm -rf /var/lib/apt/lists/*
6-
7-
RUN set -ex && \
8-
mkdir ~/.gnupg; \
9-
echo "disable-ipv6" >> ~/.gnupg/dirmngr.conf; \
10-
for key in \
11-
24C975CBA61A024EE1B631787C3D57159FC2F927 ; \
12-
do \
13-
gpg --keyserver hkp://keyserver.ubuntu.com --recv-keys "$key" ; \
14-
done
5+
rm -rf /var/lib/apt/lists/* /usr/share/{doc,info,man,locale}
156

167
ENV TELEGRAF_VERSION=1.37.2
17-
RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" && \
18-
case "${dpkgArch##*-}" in \
19-
amd64) ARCH='amd64';; \
20-
arm64) ARCH='arm64';; \
21-
armhf) ARCH='armhf';; \
22-
armel) ARCH='armel';; \
23-
*) echo "Unsupported architecture: ${dpkgArch}"; exit 1;; \
24-
esac && \
25-
wget --no-verbose https://dl.influxdata.com/telegraf/releases/telegraf_${TELEGRAF_VERSION}-1_${ARCH}.deb.asc && \
26-
wget --no-verbose https://dl.influxdata.com/telegraf/releases/telegraf_${TELEGRAF_VERSION}-1_${ARCH}.deb && \
27-
gpg --batch --verify telegraf_${TELEGRAF_VERSION}-1_${ARCH}.deb.asc telegraf_${TELEGRAF_VERSION}-1_${ARCH}.deb && \
28-
dpkg -i telegraf_${TELEGRAF_VERSION}-1_${ARCH}.deb && \
29-
rm -f telegraf_${TELEGRAF_VERSION}-1_${ARCH}.deb*
8+
RUN --mount=target=/local \
9+
dpkg -i /local/telegraf_${TELEGRAF_VERSION}-0_amd64.deb
3010

3111
EXPOSE 8125/udp 8092/udp 8094
3212

telegraf/1.37/alpine/Dockerfile

Lines changed: 3 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -6,32 +6,13 @@ RUN apk add --no-cache iputils ca-certificates net-snmp-tools procps lm_sensors
66

77
ENV TELEGRAF_VERSION=1.37.2
88

9-
RUN ARCH= && \
10-
case "$(apk --print-arch)" in \
11-
x86_64) ARCH='amd64';; \
12-
aarch64) ARCH='arm64';; \
13-
*) echo "Unsupported architecture: $(apk --print-arch)"; exit 1;; \
14-
esac && \
15-
set -ex && \
16-
mkdir ~/.gnupg; \
17-
echo "disable-ipv6" >> ~/.gnupg/dirmngr.conf; \
18-
apk add --no-cache --virtual .build-deps wget gnupg tar && \
19-
for key in \
20-
24C975CBA61A024EE1B631787C3D57159FC2F927 ; \
21-
do \
22-
gpg --keyserver hkp://keyserver.ubuntu.com --recv-keys "$key" ; \
23-
done && \
24-
wget --no-verbose https://dl.influxdata.com/telegraf/releases/telegraf-${TELEGRAF_VERSION}_linux_${ARCH}.tar.gz.asc && \
25-
wget --no-verbose https://dl.influxdata.com/telegraf/releases/telegraf-${TELEGRAF_VERSION}_linux_${ARCH}.tar.gz && \
26-
gpg --batch --verify telegraf-${TELEGRAF_VERSION}_linux_${ARCH}.tar.gz.asc telegraf-${TELEGRAF_VERSION}_linux_${ARCH}.tar.gz && \
9+
RUN --mount=target=/local \
2710
mkdir -p /usr/src /etc/telegraf && \
28-
tar -C /usr/src -xzf telegraf-${TELEGRAF_VERSION}_linux_${ARCH}.tar.gz && \
11+
tar -C /usr/src -xzf /local/telegraf-${TELEGRAF_VERSION}_linux_amd64.tar.gz && \
2912
mv /usr/src/telegraf*/etc/telegraf/telegraf.conf /etc/telegraf/ && \
3013
mkdir /etc/telegraf/telegraf.d && \
3114
cp -a /usr/src/telegraf*/usr/bin/telegraf /usr/bin/ && \
32-
gpgconf --kill all && \
33-
rm -rf *.tar.gz* /usr/src /root/.gnupg && \
34-
apk del .build-deps && \
15+
rm -rf /usr/src && \
3516
addgroup -S telegraf && \
3617
adduser -S telegraf -G telegraf && \
3718
chown -R telegraf:telegraf /etc/telegraf

0 commit comments

Comments
 (0)