From 0ded6f19a08110a19ea2089d2dd58be7c2d67a3d Mon Sep 17 00:00:00 2001 From: sinav Date: Sat, 7 Nov 2026 08:25:04 +0300 Subject: [PATCH] Update add-ons and persist Vector data --- coredns/Dockerfile | 13 ++++++------- coredns/build.yaml | 5 ----- coredns/config.yaml | 2 +- vector/Dockerfile | 19 ++++++++----------- vector/build.yaml | 5 ----- vector/config.yaml | 2 +- .../rootfs/etc/s6-overlay/s6-rc.d/vector/run | 1 + vector/rootfs/vector.yaml | 2 +- zabbix-agent2/Dockerfile | 12 +++++------- zabbix-agent2/build.yaml | 5 ----- zabbix-agent2/config.yaml | 3 +-- 11 files changed, 24 insertions(+), 45 deletions(-) delete mode 100644 coredns/build.yaml delete mode 100644 vector/build.yaml delete mode 100644 zabbix-agent2/build.yaml diff --git a/coredns/Dockerfile b/coredns/Dockerfile index 208fbb5..a8a0129 100644 --- a/coredns/Dockerfile +++ b/coredns/Dockerfile @@ -1,20 +1,19 @@ -ARG BUILD_FROM=ghcr.io/hassio-addons/debian-base:9.2.0 -# hadolint ignore=DL3006 -FROM ${BUILD_FROM} +FROM ghcr.io/hassio-addons/debian-base:9.5.2 SHELL ["/bin/bash", "-o", "pipefail", "-c"] -ARG COREDNS_VERSION=1.14.6 +ARG COREDNS_VERSION=1.15.0 WORKDIR /coredns RUN apt-get update \ - && apt-get install -y ca-certificates libcap2-bin \ + && apt-get install -y --no-install-recommends ca-certificates \ && apt-get clean \ - && curl -sSL -o coredns.tgz \ + && curl -fsSL -o coredns.tgz \ https://github.com/coredns/coredns/releases/download/v${COREDNS_VERSION}/coredns_${COREDNS_VERSION}_linux_amd64.tgz \ && tar -xvf coredns.tgz \ - && chmod +x coredns + && chmod +x coredns \ + && rm -rf coredns.tgz /var/lib/apt/lists/* LABEL \ org.opencontainers.image.title="CoreDNS Add-on" \ diff --git a/coredns/build.yaml b/coredns/build.yaml deleted file mode 100644 index e70191f..0000000 --- a/coredns/build.yaml +++ /dev/null @@ -1,5 +0,0 @@ ---- -build_from: - amd64: ghcr.io/hassio-addons/debian-base/amd64:9.3.0 -codenotary: - base_image: codenotary@frenck.dev diff --git a/coredns/config.yaml b/coredns/config.yaml index fbc0955..d28a511 100644 --- a/coredns/config.yaml +++ b/coredns/config.yaml @@ -1,5 +1,5 @@ name: "Coredns" -version: "1.14.6" +version: "1.15.0" slug: "coredns" description: "CoreDNS is a DNS server that chains plugins " url: "https://coredns.io/" diff --git a/vector/Dockerfile b/vector/Dockerfile index d07c50a..5e2d6da 100644 --- a/vector/Dockerfile +++ b/vector/Dockerfile @@ -1,21 +1,18 @@ -ARG BUILD_FROM=ghcr.io/hassio-addons/debian-base:9.2.0 -# hadolint ignore=DL3006 -FROM ${BUILD_FROM} +FROM ghcr.io/hassio-addons/debian-base:9.5.2 SHELL ["/bin/bash", "-o", "pipefail", "-c"] -ARG VECTOR_VERSION=0.57.0 - -WORKDIR /vector +ARG VECTOR_VERSION=0.61.0 RUN apt-get update \ && apt-get install -y --no-install-recommends systemd \ && apt-get clean \ - && mkdir -p /var/lib/vector \ - && curl -sSL -o vector.tar.gz \ - https://github.com/vectordotdev/vector/releases/download/v${VECTOR_VERSION}/vector-${VECTOR_VERSION}-x86_64-unknown-linux-musl.tar.gz \ - && tar -xvf vector.tar.gz --strip-components=2 \ - && cp /vector/bin/* /usr/local/bin/ + && mkdir -p /tmp/vector \ + && curl -fsSL "https://github.com/vectordotdev/vector/releases/download/v${VECTOR_VERSION}/vector-${VECTOR_VERSION}-x86_64-unknown-linux-musl.tar.gz" \ + | tar -xz -C /tmp/vector --strip-components=2 \ + && mv /tmp/vector/bin/vector /usr/local/bin/vector \ + && rm -rf /tmp/vector /var/lib/apt/lists/* \ + && ln -sT /data/vector /var/lib/vector LABEL \ org.opencontainers.image.title="Vector Add-on" \ diff --git a/vector/build.yaml b/vector/build.yaml deleted file mode 100644 index e70191f..0000000 --- a/vector/build.yaml +++ /dev/null @@ -1,5 +0,0 @@ ---- -build_from: - amd64: ghcr.io/hassio-addons/debian-base/amd64:9.3.0 -codenotary: - base_image: codenotary@frenck.dev diff --git a/vector/config.yaml b/vector/config.yaml index d30661d..2198fa3 100644 --- a/vector/config.yaml +++ b/vector/config.yaml @@ -1,5 +1,5 @@ name: "Vector" -version: "0.57.0" +version: "0.61.0" slug: "vector" description: "Vector log processor" url: "https://vector.dev" diff --git a/vector/rootfs/etc/s6-overlay/s6-rc.d/vector/run b/vector/rootfs/etc/s6-overlay/s6-rc.d/vector/run index d76b245..c0b429f 100644 --- a/vector/rootfs/etc/s6-overlay/s6-rc.d/vector/run +++ b/vector/rootfs/etc/s6-overlay/s6-rc.d/vector/run @@ -23,4 +23,5 @@ else bashio::log.info "Using existing configuration at $CONFIG_PATH" fi +mkdir -p /data/vector || exit 1 exec /usr/local/bin/vector --config /config/vector.yaml diff --git a/vector/rootfs/vector.yaml b/vector/rootfs/vector.yaml index 6cbe3ac..75c6faa 100644 --- a/vector/rootfs/vector.yaml +++ b/vector/rootfs/vector.yaml @@ -1,4 +1,4 @@ -data_dir: /var/lib/vector +data_dir: /data/vector sources: demo: diff --git a/zabbix-agent2/Dockerfile b/zabbix-agent2/Dockerfile index c4475ab..b91c420 100644 --- a/zabbix-agent2/Dockerfile +++ b/zabbix-agent2/Dockerfile @@ -1,13 +1,11 @@ -ARG BUILD_FROM=ghcr.io/hassio-addons/debian-base:9.2.0 -# hadolint ignore=DL3006 -FROM ${BUILD_FROM} +FROM ghcr.io/hassio-addons/debian-base:9.5.2 SHELL ["/bin/bash", "-o", "pipefail", "-c"] -ARG MAJOR_VERSION=7.4 -ARG ZABBIX_VERSION=${MAJOR_VERSION}.13 +ARG MAJOR_VERSION=8.0 +ARG ZABBIX_VERSION=${MAJOR_VERSION}.0 ARG ZABBIX_DEB_URL="https://repo.zabbix.com/zabbix/${MAJOR_VERSION}/release/debian/pool/main/z/zabbix-release" -ARG ZABBIX_DEB_PKG="zabbix-release_latest_${MAJOR_VERSION}+debian12_all.deb" +ARG ZABBIX_DEB_PKG="zabbix-release_latest_${MAJOR_VERSION}+debian13_all.deb" RUN apt-get update && \ apt-get install -y wget gnupg2 lsb-release && \ @@ -15,7 +13,7 @@ RUN apt-get update && \ dpkg -i /tmp/zabbix-release.deb && \ apt-get update && \ apt-get install -y \ - zabbix-agent2=1:${ZABBIX_VERSION}* \ + zabbix-agent2=2:${ZABBIX_VERSION}-* \ smartmontools \ sudo \ iputils-ping && \ diff --git a/zabbix-agent2/build.yaml b/zabbix-agent2/build.yaml deleted file mode 100644 index e70191f..0000000 --- a/zabbix-agent2/build.yaml +++ /dev/null @@ -1,5 +0,0 @@ ---- -build_from: - amd64: ghcr.io/hassio-addons/debian-base/amd64:9.3.0 -codenotary: - base_image: codenotary@frenck.dev diff --git a/zabbix-agent2/config.yaml b/zabbix-agent2/config.yaml index 2eeed6a..5eddced 100644 --- a/zabbix-agent2/config.yaml +++ b/zabbix-agent2/config.yaml @@ -1,6 +1,6 @@ --- name: zabbix-agent2 -version: "7.4.13" +version: "8.0.0" slug: zabbix-agent2 description: Zabbix agent 2 url: https://gitea.sinav-lab.com/sinav/haos-addons @@ -18,7 +18,6 @@ options: {} schema: {} ports: 10050/tcp: 10050 - 10051/tcp: 10051 devices: - /dev/nvme0 privileged: