fix zabbix 7.0

.drone.star

@@ -24,7 +24,7 @@ def pipeline(flavour, arch, ver):
             "image": "plugins/docker:linux-%s" % (arch),
             "settings": {
                 "context": "src",
-                "dockerfile": "src/Dockerfile",
+                "dockerfile": "src/Dockerfile-%s" % (ver),
                 "build_args": [
                     "UPSTREAM_FLAVOUR=" + flavour,
                     "UPSTREAM_VERSION=" + ver

README.md

@@ -17,14 +17,11 @@ These are the supported upstream versions:
 
 | version |
 |---------|
-| 6.4     |
+| 7.0     |
-| 6.2     |
 | 6.0     |
-| 5.0     |
-| 4.0     |
 
-You can use the desired version as image tag (e.g. `docker.asperti.com/paspo/zabbix-proxy-sqlite3-mssql:5.0`), the correct arch will be used.
+You can use the desired version as image tag (e.g. `docker.asperti.com/paspo/zabbix-proxy-sqlite3-mssql:7.0`), the correct arch will be used.
-If you prefer, you can also pin to a specific architecture: `docker.asperti.com/paspo/zabbix-proxy-sqlite3-mssql:5.0-amd64`.
+If you prefer, you can also pin to a specific architecture: `docker.asperti.com/paspo/zabbix-proxy-sqlite3-mssql:7.0-amd64`.
 
 ## Usage with docker compose
 
@@ -33,7 +30,7 @@ version: '3.9'
 
 services:
   zabbix-proxy:
-    image: docker.asperti.com/paspo/zabbix-proxy-mysql-mssql:6.0
+    image: docker.asperti.com/paspo/zabbix-proxy-mysql-mssql:7.0
     restart: always
     ports:
       - '10051:10051'

src/Dockerfile-6.0

@@ -1,6 +1,5 @@
 ARG UPSTREAM_FLAVOUR
-ARG UPSTREAM_VERSION
+FROM zabbix/zabbix-proxy-${UPSTREAM_FLAVOUR}:ubuntu-6.0-latest
-FROM zabbix/zabbix-proxy-${UPSTREAM_FLAVOUR}:ubuntu-${UPSTREAM_VERSION}-latest
 
 USER root
 
@@ -13,6 +12,7 @@ RUN \
   DEBIAN_FRONTEND=noninteractive apt upgrade -y && \
   DEBIAN_FRONTEND=noninteractive apt install -y gnupg && \
   apt-key add "${TMPFILE}" && \
+  apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv EB3E94ADBE1229CF && \
   rm "${TMPFILE}" && \
   source /etc/os-release && \
   wget https://packages.microsoft.com/config/ubuntu/${VERSION_ID}/prod.list -O /etc/apt/sources.list.d/mssql-release.list && \

src/Dockerfile-7.0

@@ -0,0 +1,17 @@
+ARG UPSTREAM_FLAVOUR
+FROM zabbix/zabbix-proxy-${UPSTREAM_FLAVOUR}:ubuntu-7.0-latest
+
+USER root
+
+SHELL ["/bin/bash", "-c"]
+
+RUN \
+  source /etc/os-release && \
+  wget -O "/tmp/a.deb" https://packages.microsoft.com/ubuntu/${VERSION_ID}/prod/pool/main/p/packages-microsoft-prod/packages-microsoft-prod_1.1-ubuntu${VERSION_ID}_all.deb && \
+  DEBIAN_FRONTEND=noninteractive apt install -y /tmp/a.deb && \
+  rm /tmp/a.deb && \
+  DEBIAN_FRONTEND=noninteractive apt update && \
+  DEBIAN_FRONTEND=noninteractive ACCEPT_EULA=Y  apt install -y msodbcsql18 mssql-tools18 && \
+  DEBIAN_FRONTEND=noninteractive apt-get clean
+
+USER zabbix