From f45a9ae74013eeb25a2815b5fb4052c234ef9873 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Franc=CC=A7ois=20Bonelle?= Date: Mon, 1 May 2023 17:15:28 +0200 Subject: [PATCH] Fix --- docker-socket-proxy/Dockerfile | 32 -------------------------------- docker-socket-proxy/build.yaml | 16 +++++++--------- docker-socket-proxy/config.yaml | 2 +- telegraf/Dockerfile | 16 ---------------- telegraf/build.yaml | 14 ++++++-------- telegraf/config.yaml | 2 +- 6 files changed, 15 insertions(+), 67 deletions(-) diff --git a/docker-socket-proxy/Dockerfile b/docker-socket-proxy/Dockerfile index 5781924..b9f9766 100755 --- a/docker-socket-proxy/Dockerfile +++ b/docker-socket-proxy/Dockerfile @@ -10,8 +10,6 @@ ARG BUILD_REF ARG BUILD_REPOSITORY ARG BUILD_VERSION ARG TELEGRAF_VERSION -ARG BASHIO_VERSION -ARG TEMPIO_VERSION ARG HAPROXY_VERSION ARG HAPROXY_SHA256 @@ -38,36 +36,6 @@ SHELL ["/bin/ash", "-o", "pipefail", "-c"] USER root -RUN \ - set -o pipefail && \ - apk add --no-cache --virtual .build-dependencies \ - tar \ - xz && \ - apk add --no-cache \ - libcrypto1.1 \ - libssl1.1 \ - musl-utils \ - musl && \ - apk add --no-cache \ - bash \ - curl \ - jq \ - tzdata && \ - 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 && \ - apk del --no-cache --purge .build-dependencies && \ - rm -f -r \ - /tmp/* - RUN set -eux; \ addgroup --gid 99 --system haproxy; \ adduser \ diff --git a/docker-socket-proxy/build.yaml b/docker-socket-proxy/build.yaml index 47f358b..e20ebd5 100644 --- a/docker-socket-proxy/build.yaml +++ b/docker-socket-proxy/build.yaml @@ -1,11 +1,9 @@ build_from: - aarch64: library/alpine:3.17 - amd64: library/alpine:3.17 - armhf: library/alpine:3.17 - armv7: library/alpine:3.17 - i386: library/alpine:3.17 + aarch64: ghcr.io/hassio-addons/base:13.2.2 + amd64: ghcr.io/hassio-addons/base:13.2.2 + armhf: ghcr.io/hassio-addons/base:13.2.2 + armv7: ghcr.io/hassio-addons/base:13.2.2 + i386: ghcr.io/hassio-addons/base:13.2.2 args: - BASHIO_VERSION: v0.14.3 - TEMPIO_VERSION: 2021.09.0 - HAPROXY_VERSION: 2.6.11 - HAPROXY_SHA256: e0bc430ac407747b077bc88ee6922b4616fa55a9e0f3ec84438dfb055eb9a715 \ No newline at end of file + HAPROXY_VERSION: 2.6.12 + HAPROXY_SHA256: 58f9edb26bf3288f4b502658399281cc5d6478468bd178eafe579c8f41895854 \ No newline at end of file diff --git a/docker-socket-proxy/config.yaml b/docker-socket-proxy/config.yaml index 3f6fe73..bbb8af2 100644 --- a/docker-socket-proxy/config.yaml +++ b/docker-socket-proxy/config.yaml @@ -1,6 +1,6 @@ --- name: Docker-Socket-Proxy -version: 2.6.11 +version: 2.6.12 slug: hassio_docker_socket_proxy description: An addon to enable TCP docker access. url: https://gitea.bonelle-family.dscloud.biz/francois.bonelle/hassio-repo.git diff --git a/telegraf/Dockerfile b/telegraf/Dockerfile index 5873a32..8cbe1d3 100755 --- a/telegraf/Dockerfile +++ b/telegraf/Dockerfile @@ -10,8 +10,6 @@ ARG BUILD_REF ARG BUILD_REPOSITORY ARG BUILD_VERSION ARG TELEGRAF_VERSION -ARG BASHIO_VERSION -ARG TEMPIO_VERSION # Environment variables ENV \ @@ -44,20 +42,6 @@ RUN set -ex && \ apt-get install telegraf=${TELEGRAF_VERSION} && \ rm -rf /var/lib/apt/lists/* -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 9c1be13..961a564 100644 --- a/telegraf/build.yaml +++ b/telegraf/build.yaml @@ -1,10 +1,8 @@ build_from: - aarch64: library/buildpack-deps:bullseye-curl - amd64: library/buildpack-deps:bullseye-curl - armhf: library/buildpack-deps:bullseye-curl - armv7: library/buildpack-deps:bullseye-curl - i386: library/buildpack-deps:bullseye-curl + aarch64: ghcr.io/hassio-addons/debian-base/amd64:6.2.5 + amd64: ghcr.io/hassio-addons/debian-base/amd64:6.2.5 + armhf: ghcr.io/hassio-addons/debian-base/amd64:6.2.5 + armv7: ghcr.io/hassio-addons/debian-base/amd64:6.2.5 + i386: ghcr.io/hassio-addons/debian-base/amd64:6.2.5 args: - TELEGRAF_VERSION: 1.26.0-1 - BASHIO_VERSION: v0.14.3 - TEMPIO_VERSION: 2021.09.0 \ No newline at end of file + TELEGRAF_VERSION: 1.26.2-1 diff --git a/telegraf/config.yaml b/telegraf/config.yaml index 7f7d3be..5fdf498 100644 --- a/telegraf/config.yaml +++ b/telegraf/config.yaml @@ -1,6 +1,6 @@ --- name: Telegraf -version: 1.26.0-1 +version: 1.26.2-1 slug: hassio_telegraf description: An addon to add telegraf to hassio. url: https://gitea.bonelle-family.dscloud.biz/francois.bonelle/hassio-repo.git