diff --git a/docker-socket-proxy/build.yaml b/docker-socket-proxy/build.yaml index 2b502bf..404f4b6 100644 --- a/docker-socket-proxy/build.yaml +++ b/docker-socket-proxy/build.yaml @@ -1,9 +1,9 @@ build_from: - aarch64: ghcr.io/hassio-addons/base:16.1.2 - amd64: ghcr.io/hassio-addons/base:16.1.2 - armhf: ghcr.io/hassio-addons/base:16.1.2 - armv7: ghcr.io/hassio-addons/base:16.1.2 - i386: ghcr.io/hassio-addons/base:16.1.2 + aarch64: ghcr.io/hassio-addons/base:16.3.6 + amd64: ghcr.io/hassio-addons/base:16.3.6 + armhf: ghcr.io/hassio-addons/base:16.3.6 + armv7: ghcr.io/hassio-addons/base:16.3.6 + i386: ghcr.io/hassio-addons/base:16.3.6 args: - HAPROXY_VERSION: 2.8.10 - HAPROXY_SHA256: 0d63cd46d9d10ac7dbc02f3c6769c1908f221e0a5c5b655a194655f7528d612a \ No newline at end of file + HAPROXY_VERSION: 2.8.12 + HAPROXY_SHA256: 16c16c1d7ba6793c89a8fae7f20c595d19497bb18d75fedd9f2db77741b1fa75 \ No newline at end of file diff --git a/docker-socket-proxy/config.yaml b/docker-socket-proxy/config.yaml index 0c5e86c..4b6cc54 100644 --- a/docker-socket-proxy/config.yaml +++ b/docker-socket-proxy/config.yaml @@ -1,6 +1,6 @@ --- name: Docker-Socket-Proxy -version: 2.8.10_1 +version: 2.8.12_1 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/promtail/build.yaml b/promtail/build.yaml index ba54a47..426bb58 100644 --- a/promtail/build.yaml +++ b/promtail/build.yaml @@ -1,10 +1,10 @@ --- build_from: - aarch64: ghcr.io/hassio-addons/debian-base:7.3.5 - amd64: ghcr.io/hassio-addons/debian-base:7.3.5 - armhf: ghcr.io/hassio-addons/debian-base:7.3.5 - armv7: ghcr.io/hassio-addons/debian-base:7.3.5 - i386: ghcr.io/hassio-addons/debian-base:7.3.5 + aarch64: ghcr.io/hassio-addons/debian-base:7.6.0 + amd64: ghcr.io/hassio-addons/debian-base:7.6.0 + armhf: ghcr.io/hassio-addons/debian-base:7.6.0 + armv7: ghcr.io/hassio-addons/debian-base:7.6.0 + i386: ghcr.io/hassio-addons/debian-base:7.6.0 args: - YQ_VERSION: 4.44.2 - PROMTAIL_VERSION: 3.1.0 \ No newline at end of file + YQ_VERSION: 4.44.5 + PROMTAIL_VERSION: 3.3.0 \ No newline at end of file diff --git a/promtail/config.yaml b/promtail/config.yaml index 011f9d3..eb823a3 100644 --- a/promtail/config.yaml +++ b/promtail/config.yaml @@ -1,7 +1,7 @@ --- name: Promtail url: https://gitea.bonelle-family.dscloud.biz/francois.bonelle/hassio-repo.git -version: 3.1.0 +version: 3.3.0 slug: hassio_promtail arch: - aarch64 diff --git a/telegraf/Dockerfile b/telegraf/Dockerfile deleted file mode 100755 index d0c6663..0000000 --- a/telegraf/Dockerfile +++ /dev/null @@ -1,67 +0,0 @@ -ARG BUILD_FROM -FROM ${BUILD_FROM} - -# Build arguments -ARG BUILD_ARCH -ARG BUILD_DATE -ARG BUILD_DESCRIPTION -ARG BUILD_NAME -ARG BUILD_REF -ARG BUILD_REPOSITORY -ARG BUILD_VERSION -ARG TELEGRAF_VERSION - -# Environment variables -ENV \ - HOME="/root" \ - LANG="C.UTF-8" \ - PS1="$(whoami)@$(hostname):$(pwd)$ " \ - TERM="xterm-256color" - -# Copy root filesystem -COPY rootfs / - -# 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 bash ca-certificates curl jq tzdata xz-utils iputils-ping snmp procps lm-sensors libcap2-bin wget gnupg && \ - c_rehash && \ - rm -rf /var/lib/apt/lists/* - -ENV TELEGRAF_VERSION ${TELEGRAF_VERSION} -RUN set -ex && \ - mkdir ~/.gnupg && \ - chmod 600 ~/.gnupg/* && \ - chmod 700 ~/.gnupg && \ - echo "disable-ipv6" >> ~/.gnupg/dirmngr.conf; \ - wget -q https://repos.influxdata.com/influxdata-archive_compat.key && \ - echo '393e8779c89ac8d958f81f942f9ad7fb82a25e133faddaf92e15b16e6ac9ce4c influxdata-archive_compat.key' | sha256sum -c && cat influxdata-archive_compat.key | gpg --dearmor | tee /etc/apt/trusted.gpg.d/influxdata-archive_compat.gpg > /dev/null && \ - echo 'deb [signed-by=/etc/apt/trusted.gpg.d/influxdata-archive_compat.gpg] https://repos.influxdata.com/debian stable main' | tee /etc/apt/sources.list.d/influxdata.list && \ - apt-get update && \ - apt-get install telegraf=${TELEGRAF_VERSION} && \ - rm -rf /var/lib/apt/lists/* - -EXPOSE 8125/udp 8092/udp 8094 - -COPY entrypoint.sh /entrypoint.sh -COPY settings.sh /settings.sh -ENTRYPOINT ["/entrypoint.sh"] -CMD ["telegraf"] - -# Labels -LABEL \ - io.hass.name="${BUILD_NAME}" \ - io.hass.description="${BUILD_DESCRIPTION}" \ - io.hass.arch="${BUILD_ARCH}" \ - io.hass.type="addon" \ - io.hass.version=${BUILD_VERSION} \ - maintainer="fbonelle" \ - org.opencontainers.image.title="${BUILD_NAME}" \ - org.opencontainers.image.description="${BUILD_DESCRIPTION}" \ - org.opencontainers.image.vendor="fbonelle's addons" \ - org.opencontainers.image.authors="fbonelle" \ - org.opencontainers.image.licenses="MIT" \ - org.opencontainers.image.created=${BUILD_DATE} \ - org.opencontainers.image.revision=${BUILD_REF} \ - org.opencontainers.image.version=${BUILD_VERSION} diff --git a/telegraf/apparmor.txt b/telegraf/apparmor.txt deleted file mode 100644 index 3e887c3..0000000 --- a/telegraf/apparmor.txt +++ /dev/null @@ -1,52 +0,0 @@ -#include - -profile hassio_telegraf flags=(attach_disconnected,mediate_deleted) { - #include - - # Capabilities - file, - signal (send) set=(kill,term,int,hup,cont), - - # S6-Overlay - /init ix, - /bin/** ix, - /usr/bin/** ix, - /run/{s6,s6-rc*,service}/** ix, - /package/** ix, - /command/** ix, - /etc/services.d/** rwix, - /etc/cont-init.d/** rwix, - /etc/cont-finish.d/** rwix, - /run/{,**} rwk, - /dev/tty rw, - - # Bashio - /usr/lib/bashio/** ix, - /tmp/** rwk, - - # Access to options.json and other files within your addon - /data/** rw, - - # Start new profile for service - /usr/bin/myprogram cx -> myprogram, - - profile myprogram flags=(attach_disconnected,mediate_deleted) { - #include - - # Receive signals from S6-Overlay - signal (receive) peer=*_ADDON_SLUG, - - # Access to options.json and other files within your addon - /data/** rw, - - # Access to mapped volumes specified in config.json - /share/** rw, - - # Access required for service functionality - /usr/bin/myprogram r, - /bin/bash rix, - /bin/echo ix, - /etc/passwd r, - /dev/tty rw, - } -} \ No newline at end of file diff --git a/telegraf/build.yaml b/telegraf/build.yaml deleted file mode 100644 index 3ef9ee9..0000000 --- a/telegraf/build.yaml +++ /dev/null @@ -1,8 +0,0 @@ -build_from: - aarch64: ghcr.io/hassio-addons/debian-base:7.3.5 - amd64: ghcr.io/hassio-addons/debian-base:7.3.5 - armhf: ghcr.io/hassio-addons/debian-base:7.3.5 - armv7: ghcr.io/hassio-addons/debian-base:7.3.5 - i386: ghcr.io/hassio-addons/debian-base:7.3.5 -args: - TELEGRAF_VERSION: 1.31.1-1 diff --git a/telegraf/config.yaml b/telegraf/config.yaml deleted file mode 100644 index 2e3078d..0000000 --- a/telegraf/config.yaml +++ /dev/null @@ -1,39 +0,0 @@ ---- -name: Telegraf -version: 1.31.1-1 -slug: hassio_telegraf -description: An addon to add telegraf to hassio. -url: https://gitea.bonelle-family.dscloud.biz/francois.bonelle/hassio-repo.git -init: false -arch: - - aarch64 - - amd64 - - armhf - - armv7 - - i386 -ports: - 9273/tcp: 9273 -hassio_api: true -hassio_role: default -host_network: true -auth_api: true -privileged: -- SYS_ADMIN -apparmor: false -map: -- config:rw -- ssl:rw -- addons:rw -- backup:rw -- share:rw -startup: services -boot: manual -docker_api: true -host_pid: true -full_access: true -options: - custom_conf: - location: "/config/telegraf.conf" -schema: - custom_conf: - location: str diff --git a/telegraf/entrypoint.sh b/telegraf/entrypoint.sh deleted file mode 100755 index f2f0b0c..0000000 --- a/telegraf/entrypoint.sh +++ /dev/null @@ -1,17 +0,0 @@ -#!/bin/bash -set -e - -bashio /settings.sh - -if [ "${1:0:1}" = '-' ]; then - set -- telegraf "$@" -fi - -if [ $EUID -ne 0 ]; then - exec "$@" -else - # Allow telegraf to send ICMP packets and bind to privliged ports - setcap cap_net_raw,cap_net_bind_service+ep /usr/bin/telegraf || echo "Failed to set additional capabilities on /usr/bin/telegraf" - - exec setpriv --reuid root --init-groups "$@" -fi \ No newline at end of file diff --git a/telegraf/icon.png b/telegraf/icon.png deleted file mode 100644 index ad8e00f..0000000 Binary files a/telegraf/icon.png and /dev/null differ diff --git a/telegraf/logo.png b/telegraf/logo.png deleted file mode 100644 index 8e2e64c..0000000 Binary files a/telegraf/logo.png and /dev/null differ diff --git a/telegraf/rootfs/etc/conf-init.d/00-banner.sh b/telegraf/rootfs/etc/conf-init.d/00-banner.sh deleted file mode 100755 index c031ad8..0000000 --- a/telegraf/rootfs/etc/conf-init.d/00-banner.sh +++ /dev/null @@ -1,37 +0,0 @@ -#!/command/with-contenv bashio -# ============================================================================== -# Home Assistant Community Add-on: Base Images -# Displays a simple add-on banner on startup -# ============================================================================== -if bashio::supervisor.ping; then - bashio::log.blue \ - '-----------------------------------------------------------' - bashio::log.blue " Add-on: $(bashio::addon.name)" - bashio::log.blue " $(bashio::addon.description)" - bashio::log.blue \ - '-----------------------------------------------------------' - - bashio::log.blue " Add-on version: $(bashio::addon.version)" - if bashio::var.true "$(bashio::addon.update_available)"; then - bashio::log.magenta ' There is an update available for this add-on!' - bashio::log.magenta \ - " Latest add-on version: $(bashio::addon.version_latest)" - bashio::log.magenta ' Please consider upgrading as soon as possible.' - else - bashio::log.green ' You are running the latest version of this add-on.' - fi - - bashio::log.blue " System: $(bashio::info.operating_system)" \ - " ($(bashio::info.arch) / $(bashio::info.machine))" - bashio::log.blue " Home Assistant Core: $(bashio::info.homeassistant)" - bashio::log.blue " Home Assistant Supervisor: $(bashio::info.supervisor)" - - bashio::log.blue \ - '-----------------------------------------------------------' - bashio::log.blue \ - ' Please, share the above information when looking for help' - bashio::log.blue \ - ' or support in, e.g., GitHub, forums or the Discord chat.' - bashio::log.blue \ - '-----------------------------------------------------------' -fi \ No newline at end of file diff --git a/telegraf/rootfs/etc/conf-init.d/01-log-level.sh b/telegraf/rootfs/etc/conf-init.d/01-log-level.sh deleted file mode 100755 index 47b46eb..0000000 --- a/telegraf/rootfs/etc/conf-init.d/01-log-level.sh +++ /dev/null @@ -1,46 +0,0 @@ -#!/command/with-contenv bashio -# ============================================================================== -# Home Assistant Community Add-on: Base Images -# Sets the log level correctly -# ============================================================================== -declare log_level - -# Check if the log level configuration option exists -if bashio::config.exists log_level; then - - # Find the matching LOG_LEVEL - log_level=$(bashio::string.lower "$(bashio::config log_level)") - case "${log_level}" in - all) - log_level="${__BASHIO_LOG_LEVEL_ALL}" - ;; - trace) - log_level="${__BASHIO_LOG_LEVEL_TRACE}" - ;; - debug) - log_level="${__BASHIO_LOG_LEVEL_DEBUG}" - ;; - info) - log_level="${__BASHIO_LOG_LEVEL_INFO}" - ;; - notice) - log_level="${__BASHIO_LOG_LEVEL_NOTICE}" - ;; - warning) - log_level="${__BASHIO_LOG_LEVEL_WARNING}" - ;; - error) - log_level="${__BASHIO_LOG_LEVEL_ERROR}" - ;; - fatal) - log_level="${__BASHIO_LOG_LEVEL_FATAL}" - ;; - off) - log_level="${__BASHIO_LOG_LEVEL_OFF}" - ;; - *) - bashio::exit.nok "Unknown log_level: ${log_level}" - esac - - bashio::log.blue "Log level is set to ${__BASHIO_LOG_LEVELS[$log_level]}" -fi \ No newline at end of file diff --git a/telegraf/rootfs/etc/conf-init.d/02-set-timezone.sh b/telegraf/rootfs/etc/conf-init.d/02-set-timezone.sh deleted file mode 100755 index 35b0336..0000000 --- a/telegraf/rootfs/etc/conf-init.d/02-set-timezone.sh +++ /dev/null @@ -1,11 +0,0 @@ -#!/command/with-contenv bashio -# ============================================================================== -# Home Assistant Community Add-on: Base Images -# Configures the timezone -# ============================================================================== -if ! bashio::var.is_empty "${TZ}"; then - bashio::log.info "Configuring timezone" - - ln --symbolic --no-dereference --force "/usr/share/zoneinfo/${TZ}" /etc/localtime - echo "${TZ}" > /etc/timezone -fi \ No newline at end of file diff --git a/telegraf/settings.sh b/telegraf/settings.sh deleted file mode 100755 index c1c28a9..0000000 --- a/telegraf/settings.sh +++ /dev/null @@ -1,13 +0,0 @@ -#!/usr/bin/env bashio -declare hostname -bashio::require.unprotected - -readonly CONFIG="/etc/telegraf/telegraf.conf" - -CUSTOM_CONF=$(bashio::config 'custom_conf.location') - -bashio::log.info "Using custom conf file" -rm /etc/telegraf/telegraf.conf -cp "${CUSTOM_CONF}" /etc/telegraf/telegraf.conf - -bashio::log.info "Finished updating config, Starting Telegraf" \ No newline at end of file