From c925be77c57ce55eb8b90fb6ecbc6ad130152feb Mon Sep 17 00:00:00 2001
From: paspo <paolo@asperti.com>
Date: Wed, 31 Jul 2024 11:21:43 +0200
Subject: [PATCH] zabbix 7.0 lts

---
 .drone.yml       | 31 ++++++++++++++++---------------
 Dockerfile.amd64 |  7 ++++---
 Dockerfile.arm   |  7 ++++---
 Dockerfile.arm64 |  7 ++++---
 config.json      |  4 ++--
 5 files changed, 30 insertions(+), 26 deletions(-)

diff --git a/.drone.yml b/.drone.yml
index a6c6351..f24f08c 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -1,3 +1,4 @@
+---
 kind: pipeline
 type: docker
 name: build-amd64
@@ -132,21 +133,21 @@ type: docker
 name: manifest
 
 steps:
-- name: manifest
-  image: plugins/manifest
-  settings:
-    force_tag: true
-    ignore_missing: true
-    spec: manifest.tmpl
-    username:
-      from_secret: docker_username
-    password:
-      from_secret: docker_password
-    tags:
-      - latest
-      - ${DRONE_TAG}
-      - ${DRONE_SEMVER_MAJOR}.${DRONE_SEMVER_MINOR}
-      - ${DRONE_SEMVER_MAJOR}
+  - name: manifest
+    image: plugins/manifest
+    settings:
+      force_tag: true
+      ignore_missing: true
+      spec: manifest.tmpl
+      username:
+        from_secret: docker_username
+      password:
+        from_secret: docker_password
+      tags:
+        - latest
+        - ${DRONE_TAG}
+        - ${DRONE_SEMVER_MAJOR}.${DRONE_SEMVER_MINOR}
+        - ${DRONE_SEMVER_MAJOR}
 
 trigger:
   event:
diff --git a/Dockerfile.amd64 b/Dockerfile.amd64
index e102983..eee7407 100644
--- a/Dockerfile.amd64
+++ b/Dockerfile.amd64
@@ -1,4 +1,4 @@
-ARG BUILD_FROM=ghcr.io/hassio-addons/base/amd64:12.0.0
+ARG BUILD_FROM=ghcr.io/hassio-addons/base/amd64:16.2.0
 FROM $BUILD_FROM
 
 ENV LANG C.UTF-8
@@ -6,11 +6,12 @@ ENV LANG C.UTF-8
 COPY rootfs /
 
 RUN \
-  apk add -U zabbix-agent2=6.0.13-r0 sudo && \
+  apk add --no-cache --repository=https://dl-cdn.alpinelinux.org/alpine/edge/community zabbix-agent2=7.0.2-r0 zabbix-agent2-plugin-postgresql zabbix-agent2-plugin-alpine && \
+  apk add --no-cache sudo && \
   addgroup -g 102 -S docker && \
   addgroup zabbix docker
 
 LABEL \
-  io.hass.version="0.2.6" \
+  io.hass.version="0.3.0" \
   io.hass.type="addon" \
   io.hass.arch="amd64"
\ No newline at end of file
diff --git a/Dockerfile.arm b/Dockerfile.arm
index a036ef3..e71da95 100644
--- a/Dockerfile.arm
+++ b/Dockerfile.arm
@@ -1,4 +1,4 @@
-ARG BUILD_FROM=ghcr.io/hassio-addons/base/armhf:12.0.0
+ARG BUILD_FROM=ghcr.io/hassio-addons/base/armhf:16.2.0
 FROM $BUILD_FROM
 
 ENV LANG C.UTF-8
@@ -6,11 +6,12 @@ ENV LANG C.UTF-8
 COPY rootfs /
 
 RUN \
-  apk add -U zabbix-agent2=6.0.13-r0 sudo && \
+  apk add --no-cache --repository=https://dl-cdn.alpinelinux.org/alpine/edge/community zabbix-agent2=7.0.2-r0 zabbix-agent2-plugin-postgresql zabbix-agent2-plugin-alpine && \
+  apk add --no-cache sudo && \
   addgroup -g 102 -S docker && \
   addgroup zabbix docker
 
 LABEL \
-  io.hass.version="0.2.6" \
+  io.hass.version="0.3.0" \
   io.hass.type="addon" \
   io.hass.arch="armhf"
\ No newline at end of file
diff --git a/Dockerfile.arm64 b/Dockerfile.arm64
index 81c11f6..9c4854b 100644
--- a/Dockerfile.arm64
+++ b/Dockerfile.arm64
@@ -1,4 +1,4 @@
-ARG BUILD_FROM=ghcr.io/hassio-addons/base/aarch64:12.0.0
+ARG BUILD_FROM=ghcr.io/hassio-addons/base/aarch64:16.2.0
 FROM $BUILD_FROM
 
 ENV LANG C.UTF-8
@@ -6,11 +6,12 @@ ENV LANG C.UTF-8
 COPY rootfs /
 
 RUN \
-  apk add -U zabbix-agent2=6.0.13-r0 sudo && \
+  apk add --no-cache --repository=https://dl-cdn.alpinelinux.org/alpine/edge/community zabbix-agent2=7.0.2-r0 zabbix-agent2-plugin-postgresql zabbix-agent2-plugin-alpine && \
+  apk add --no-cache sudo && \
   addgroup -g 102 -S docker && \
   addgroup zabbix docker
 
 LABEL \
-  io.hass.version="0.2.6" \
+  io.hass.version="0.3.0" \
   io.hass.type="addon" \
   io.hass.arch="aarch64"
\ No newline at end of file
diff --git a/config.json b/config.json
index ac74e9c..52054a8 100644
--- a/config.json
+++ b/config.json
@@ -2,9 +2,9 @@
     "name": "Zabbix Agent 2",
     "url": "https://git.asperti.com/paspo/hassio-addons",
     "image": "docker.asperti.com/paspo/hassio-zabbix-agent2",
-    "version": "0.2.6",
+    "version": "0.3.0",
     "slug": "zabbix-agent2",
-    "description": "Zabbix Agent 2 for hass.io",
+    "description": "Zabbix Agent 2 for hass.io (7.0 LTS)",
     "startup": "services",
     "boot": "auto",
     "hassio_api": true,