From 1a90cc5a4aa9776becc88810354966c9876f7487 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Franc=CC=A7ois=20Bonelle?= Date: Sat, 18 Jun 2022 20:03:15 +0200 Subject: [PATCH] fix --- telegraf/Dockerfile | 23 ++++++++++++++++++++++- telegraf/build.yaml | 4 +++- 2 files changed, 25 insertions(+), 2 deletions(-) diff --git a/telegraf/Dockerfile b/telegraf/Dockerfile index 4b23f42..4aafafc 100755 --- a/telegraf/Dockerfile +++ b/telegraf/Dockerfile @@ -10,9 +10,14 @@ ARG BUILD_REF ARG BUILD_REPOSITORY ARG BUILD_VERSION ARG TELEGRAF_VERSION +ARG BASHIO_VERSION +ARG TEMPIO_VERSION + +# Set shell +SHELL ["/bin/bash", "-o", "pipefail", "-c"] 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 && \ + DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends bash ca-certificates curl jq tzdata xz-utils iputils-ping snmp procps lm-sensors libcap2-bin && \ rm -rf /var/lib/apt/lists/* RUN set -ex && \ @@ -39,6 +44,22 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" && \ dpkg -i telegraf_${TELEGRAF_VERSION}-1_${ARCH}.deb && \ rm -f telegraf_${TELEGRAF_VERSION}-1_${ARCH}.deb* +RUN curl -J -L -o /tmp/bashio.tar.gz \ + "https://github.com/hassio-addons/bashio/archive/${BASHIO_VERSION}.tar.gz" \ + && mkdir /tmp/bashio \ + && tar zxvf \ + /tmp/bashio.tar.gz \ + --strip 1 -C /tmp/bashio \ + \ + && mv /tmp/bashio/lib /usr/lib/bashio \ + && ln -s /usr/lib/bashio/bashio /usr/bin/bashio \ + \ + && curl -L -s -o /usr/bin/tempio \ + "https://github.com/home-assistant/tempio/releases/download/${TEMPIO_VERSION}/tempio_${BUILD_ARCH}" \ + && chmod a+x /usr/bin/tempio \ + && rm -fr \ + /tmp/* + EXPOSE 8125/udp 8092/udp 8094 COPY entrypoint.sh /entrypoint.sh diff --git a/telegraf/build.yaml b/telegraf/build.yaml index 8efb67d..cb51c9d 100644 --- a/telegraf/build.yaml +++ b/telegraf/build.yaml @@ -5,4 +5,6 @@ build_from: armv7: library/buildpack-deps:bullseye-curl i386: library/buildpack-deps:bullseye-curl args: - TELEGRAF_VERSION: 1.23.0 \ No newline at end of file + TELEGRAF_VERSION: 1.23.0 + BASHIO_VERSION: v0.14.3 + TEMPIO_VERSION: 2021.09.0 \ No newline at end of file