diff --git a/zabbix-agent2/Dockerfile b/zabbix-agent2/Dockerfile index 1900d17..a56742e 100644 --- a/zabbix-agent2/Dockerfile +++ b/zabbix-agent2/Dockerfile @@ -2,12 +2,13 @@ ARG MAJOR_VERSION=7.0 ARG ZBX_VERSION=${MAJOR_VERSION}.0 ARG BUILD_BASE_IMAGE=zabbix/zabbix-build-mysql:alpine-${ZBX_VERSION} # ARG BUILD_FROM +ARG BUILD_FROM=ghcr.io/hassio-addons/base:16.1.0 FROM ${BUILD_BASE_IMAGE} AS builder # FROM $BUILD_FROM # FROM alpine:3.19 -FROM ghcr.io/hassio-addons/base:16.1.0 +FROM ${BUILD_FROM} ARG MAJOR_VERSION ARG ZBX_VERSION @@ -68,7 +69,7 @@ RUN set -eux && \ chmod a+x /etc/services.d/zabbix_agent2/finish && \ chmod a+x /run.sh -EXPOSE 10050/TCP 31999/TCP +EXPOSE 10050/TCP WORKDIR /var/lib/zabbix @@ -76,9 +77,9 @@ WORKDIR /var/lib/zabbix # RUN chown --quiet -R zabbix:root /run.sh && chmod a+x /run.sh # COPY ["docker-entrypoint.sh", "/usr/bin/"] +ENTRYPOINT [] +CMD ["/run.sh"] USER 1997 # CMD ["/usr/sbin/zabbix_agent2", "--foreground", "-c", "/config/zabbix_agent2.conf"] -ENTRYPOINT [] -CMD ["/run.sh"] diff --git a/zabbix-agent2/config.yaml b/zabbix-agent2/config.yaml index dbfbc3e..955a5d6 100644 --- a/zabbix-agent2/config.yaml +++ b/zabbix-agent2/config.yaml @@ -5,14 +5,9 @@ slug: zabbix-agent2 description: Zabbix agent 2 url: https://gitea.sinav-lab.com/sinav/haos-addons arch: - - armhf - - armv7 - - aarch64 - amd64 - - i386 -startup: system +startup: services boot: auto -init: false apparmor: false full_access: true host_ipc: true