Release 3.3.6 - See CHANGELOG.md

tiredofit · Jan 28, 2025 · c6d5a6d · c6d5a6d
1 parent 6b1f90a
commit c6d5a6d
Show file tree

Hide file tree

Showing 6 changed files with 88 additions and 96 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,11 @@
+## 3.3.6 2025-01-28 <dave at tiredofit dot ca>
+
+   ### Added
+      - Switch to PHP 8.3 for WebUI
+      - Zabbix 7.2.3
+      - Start building Zabbix Agent and Agent 2 overtop of image to account for any version differences
+
+
 ## 3.3.5 2024-10-22 <dave at tiredofit dot ca>
 
    ### Added

diff --git a/Dockerfile b/Dockerfile
@@ -1,12 +1,12 @@
-ARG PHP_BASE=8.2
+ARG PHP_BASE=8.3
 ARG DISTRO="alpine"
 
-FROM docker.io/tiredofit/nginx-php-fpm:${PHP_BASE}-${DISTRO}-7.7.13
+FROM docker.io/tiredofit/nginx-php-fpm:${PHP_BASE}-${DISTRO}-7.7.17
 LABEL maintainer="Dave Conroy (github.com/tiredofit)"
 
 ARG ZABBIX_VERSION
 
-ENV ZABBIX_VERSION=${ZABBIX_VERSION:-"7.0.5"} \
+ENV ZABBIX_VERSION=7.2.3 \
     PHP_ENABLE_LDAP=TRUE \
     PHP_ENABLE_CREATE_SAMPLE_PHP=FALSE \
     PHP_ENABLE_SOCKETS=TRUE \
@@ -23,51 +23,51 @@ RUN source /assets/functions/00-container && \
     package update && \
     package upgrade && \
     package install .zabbix-build-deps \
-                alpine-sdk \
-                autoconf \
-                automake \
-                coreutils \
-                curl-dev \
-                g++ \
-                git \
-                go \
-                libevent-dev \
-                libssh-dev \
-                libxml2-dev \
-                linux-headers \
-                make \
-                net-snmp-dev \
-                openipmi-dev \
-                openldap-dev \
-                pcre-dev \
-                postgresql-dev \
-                sqlite-dev \
-                unixodbc-dev \
-                && \
+                    alpine-sdk \
+                    autoconf \
+                    automake \
+                    coreutils \
+                    curl-dev \
+                    g++ \
+                    git \
+                    go \
+                    libevent-dev \
+                    libssh-dev \
+                    libxml2-dev \
+                    linux-headers \
+                    make \
+                    net-snmp-dev \
+                    openipmi-dev \
+                    openldap-dev \
+                    pcre-dev \
+                    postgresql-dev \
+                    sqlite-dev \
+                    unixodbc-dev \
+                    && \
     package install .zabbix-run-deps \
-                chromium \
-                fping \
-                iputils \
-                libcurl \
-                libevent \
-                libldap \
-                libssh \
-                libxml2 \
-                net-snmp-agent-libs \
-                nmap \
-                openipmi-libs \
-                openssl \
-                pcre \
-                postgresql-client \
-                postgresql-libs \
-                py3-openssl \
-                py3-pip \
-                py3-requests \
-                python3 \
-                sqlite-libs \
-                unixodbc \
-                whois \
-                && \
+                    chromium \
+                    fping \
+                    iputils \
+                    libcurl \
+                    libevent \
+                    libldap \
+                    libssh \
+                    libxml2 \
+                    net-snmp-agent-libs \
+                    nmap \
+                    openipmi-libs \
+                    openssl \
+                    pcre \
+                    postgresql-client \
+                    postgresql-libs \
+                    py3-openssl \
+                    py3-pip \
+                    py3-requests \
+                    python3 \
+                    sqlite-libs \
+                    unixodbc \
+                    whois \
+                    && \
     \
     mkdir -p \
             /etc/zabbix \
@@ -86,49 +86,32 @@ RUN source /assets/functions/00-container && \
             /var/lib/zabbix/ssl/keys \
             /var/lib/zabbix/ssl/ssl_ca \
             && \
-    \
+            \
     clone_git_repo https://github.com/zabbix/zabbix ${ZABBIX_VERSION} && \
     sed -i "s|{ZABBIX_REVISION}|$(git log | head -n 1 | awk '{print $2}')|g" include/version.h  && \
     ./bootstrap.sh && \
     export CFLAGS="-fPIC -pie -Wl,-z,relro -Wl,-z,now" && \
+    sed -i "s|CGO_CFLAGS=\"\${CGO_CFLAGS}\"| CGO_CFLAGS=\"-D_LARGEFILE64_SOURCE \${CGO_CFLAGS}\"|g" /usr/src/zabbix/src/go/Makefile.am && \
     ./configure \
-            --datadir=/usr/lib \
-            --libdir=/usr/lib/zabbix \
-            --prefix=/usr \
-            --sysconfdir=/etc/zabbix \
-            --enable-agent \
-            --enable-server \
-            --enable-webservice \
-            --with-postgresql \
-            --with-ldap \
-            --with-libcurl \
-            --with-libxml2 \
-            --with-net-snmp \
-            --with-openipmi \
-            --with-openssl \
-            --with-ssh \
-            --with-unixodbc \
-            --enable-ipv6 \
-            --silent && \
-    make -j"$(nproc)" -s dbschema && \
-    make -j"$(nproc)" -s && \
-        ./configure \
-            --datadir=/usr/lib \
-            --libdir=/usr/lib/zabbix \
-            --prefix=/usr \
-            --sysconfdir=/etc/zabbix \
-            --enable-proxy \
-            --with-sqlite3 \
-            --with-ldap \
-            --with-libcurl \
-            --with-libxml2 \
-            --with-net-snmp \
-            --with-openipmi \
-            --with-openssl \
-            --with-ssh \
-            --with-unixodbc \
-            --enable-ipv6 \
-            --silent && \
+                --datadir=/usr/lib \
+                --libdir=/usr/lib/zabbix \
+                --prefix=/usr \
+                --sysconfdir=/etc/zabbix \
+                --enable-agent \
+                --enable-agent2 \
+                --enable-server \
+                --enable-webservice \
+                --with-postgresql \
+                --with-ldap \
+                --with-libcurl \
+                --with-libxml2 \
+                --with-net-snmp \
+                --with-openipmi \
+                --with-openssl \
+                --with-ssh \
+                --with-unixodbc \
+                --enable-ipv6 \
+                --silent && \
     make -j"$(nproc)" -s dbschema && \
     make -j"$(nproc)" -s && \
     cp src/zabbix_proxy/zabbix_proxy /usr/sbin/zabbix_proxy && \
@@ -140,16 +123,17 @@ RUN source /assets/functions/00-container && \
     mv ui ${NGINX_WEBROOT} && \
     chown -R ${NGINX_USER}:${NGINX_GROUP} ${NGINX_WEBROOT} && \
     rm -rf /usr/src/* \
-           /tmp/* && \
+            /tmp/* \
+            && \
     chown --quiet -R zabbix:root \
-                       /etc/zabbix/ \
-                       /var/lib/zabbix/ && \
+                        /etc/zabbix/ \
+                        /var/lib/zabbix/ && \
     chgrp -R 0 \
-              /etc/zabbix/ \
-              /var/lib/zabbix/ && \
+                /etc/zabbix/ \
+                /var/lib/zabbix/ && \
     chmod -R g=u \
-              /etc/zabbix/ \
-              /var/lib/zabbix/ && \
+                /etc/zabbix/ \
+                /var/lib/zabbix/ && \
     package remove .zabbix-build-deps && \
     package cleanup
 

diff --git a/install/etc/cont-init.d/30-zabbix b/install/etc/cont-init.d/30-zabbix
@@ -4,7 +4,7 @@ source /assets/functions/00-container
 source /assets/defaults/zabbix
 source /assets/functions/30-zabbix
 
-PROCESS_NAME="zabbix"
+SERVICE_NAME="zabbix"
 
 transform_file_var \
                 DB_HOST \

diff --git a/install/etc/services.available/30-zabbix-proxy/run b/install/etc/services.available/30-zabbix-proxy/run
@@ -3,7 +3,7 @@
 source /assets/functions/00-container
 source /assets/defaults/zabbix
 source /assets/defaults/zabbix-proxy
-PROCESS_NAME="zabbix-proxy"
+SERVICE_NAME="zabbix-proxy"
 
 check_container_initialized
 liftoff

diff --git a/install/etc/services.available/30-zabbix-server/run b/install/etc/services.available/30-zabbix-server/run
@@ -3,7 +3,7 @@
 source /assets/functions/00-container
 source /assets/defaults/zabbix
 source /assets/defaults/zabbix-server
-PROCESS_NAME="zabbix-server"
+SERVICE_NAME="zabbix-server"
 
 check_container_initialized
 liftoff

diff --git a/install/etc/services.available/30-zabbix-webservice/run b/install/etc/services.available/30-zabbix-webservice/run
@@ -3,7 +3,7 @@
 source /assets/functions/00-container
 source /assets/defaults/zabbix
 source /assets/defaults/zabbix-webservice
-PROCESS_NAME="zabbix-webservice"
+SERVICE_NAME="zabbix-webservice"
 
 check_container_initialized
 liftoff