Skip to content

Commit c6d5a6d

Browse files
tiredofittiredofit
committed
Release 3.3.6 - See CHANGELOG.md
1 parent 6b1f90a commit c6d5a6d

File tree

6 files changed

+88
-96
lines changed

6 files changed

+88
-96
lines changed

‎CHANGELOG.md

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,11 @@
1+
## 3.3.6 2025-01-28 <dave at tiredofit dot ca>
2+
3+
### Added
4+
- Switch to PHP 8.3 for WebUI
5+
- Zabbix 7.2.3
6+
- Start building Zabbix Agent and Agent 2 overtop of image to account for any version differences
7+
8+
19
## 3.3.5 2024-10-22 <dave at tiredofit dot ca>
210

311
### Added

‎Dockerfile

Lines changed: 76 additions & 92 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
1-
ARG PHP_BASE=8.2
1+
ARG PHP_BASE=8.3
22
ARG DISTRO="alpine"
33

4-
FROM docker.io/tiredofit/nginx-php-fpm:${PHP_BASE}-${DISTRO}-7.7.13
4+
FROM docker.io/tiredofit/nginx-php-fpm:${PHP_BASE}-${DISTRO}-7.7.17
55
LABEL maintainer="Dave Conroy (github.com/tiredofit)"
66

77
ARG ZABBIX_VERSION
88

9-
ENV ZABBIX_VERSION=${ZABBIX_VERSION:-"7.0.5"} \
9+
ENV ZABBIX_VERSION=7.2.3 \
1010
PHP_ENABLE_LDAP=TRUE \
1111
PHP_ENABLE_CREATE_SAMPLE_PHP=FALSE \
1212
PHP_ENABLE_SOCKETS=TRUE \
@@ -23,51 +23,51 @@ RUN source /assets/functions/00-container && \
2323
package update && \
2424
package upgrade && \
2525
package install .zabbix-build-deps \
26-
alpine-sdk \
27-
autoconf \
28-
automake \
29-
coreutils \
30-
curl-dev \
31-
g++ \
32-
git \
33-
go \
34-
libevent-dev \
35-
libssh-dev \
36-
libxml2-dev \
37-
linux-headers \
38-
make \
39-
net-snmp-dev \
40-
openipmi-dev \
41-
openldap-dev \
42-
pcre-dev \
43-
postgresql-dev \
44-
sqlite-dev \
45-
unixodbc-dev \
46-
&& \
26+
alpine-sdk \
27+
autoconf \
28+
automake \
29+
coreutils \
30+
curl-dev \
31+
g++ \
32+
git \
33+
go \
34+
libevent-dev \
35+
libssh-dev \
36+
libxml2-dev \
37+
linux-headers \
38+
make \
39+
net-snmp-dev \
40+
openipmi-dev \
41+
openldap-dev \
42+
pcre-dev \
43+
postgresql-dev \
44+
sqlite-dev \
45+
unixodbc-dev \
46+
&& \
4747
package install .zabbix-run-deps \
48-
chromium \
49-
fping \
50-
iputils \
51-
libcurl \
52-
libevent \
53-
libldap \
54-
libssh \
55-
libxml2 \
56-
net-snmp-agent-libs \
57-
nmap \
58-
openipmi-libs \
59-
openssl \
60-
pcre \
61-
postgresql-client \
62-
postgresql-libs \
63-
py3-openssl \
64-
py3-pip \
65-
py3-requests \
66-
python3 \
67-
sqlite-libs \
68-
unixodbc \
69-
whois \
70-
&& \
48+
chromium \
49+
fping \
50+
iputils \
51+
libcurl \
52+
libevent \
53+
libldap \
54+
libssh \
55+
libxml2 \
56+
net-snmp-agent-libs \
57+
nmap \
58+
openipmi-libs \
59+
openssl \
60+
pcre \
61+
postgresql-client \
62+
postgresql-libs \
63+
py3-openssl \
64+
py3-pip \
65+
py3-requests \
66+
python3 \
67+
sqlite-libs \
68+
unixodbc \
69+
whois \
70+
&& \
7171
\
7272
mkdir -p \
7373
/etc/zabbix \
@@ -86,49 +86,32 @@ RUN source /assets/functions/00-container && \
8686
/var/lib/zabbix/ssl/keys \
8787
/var/lib/zabbix/ssl/ssl_ca \
8888
&& \
89-
\
89+
\
9090
clone_git_repo https://github.com/zabbix/zabbix ${ZABBIX_VERSION} && \
9191
sed -i "s|{ZABBIX_REVISION}|$(git log | head -n 1 | awk '{print $2}')|g" include/version.h && \
9292
./bootstrap.sh && \
9393
export CFLAGS="-fPIC -pie -Wl,-z,relro -Wl,-z,now" && \
94+
sed -i "s|CGO_CFLAGS=\"\${CGO_CFLAGS}\"| CGO_CFLAGS=\"-D_LARGEFILE64_SOURCE \${CGO_CFLAGS}\"|g" /usr/src/zabbix/src/go/Makefile.am && \
9495
./configure \
95-
--datadir=/usr/lib \
96-
--libdir=/usr/lib/zabbix \
97-
--prefix=/usr \
98-
--sysconfdir=/etc/zabbix \
99-
--enable-agent \
100-
--enable-server \
101-
--enable-webservice \
102-
--with-postgresql \
103-
--with-ldap \
104-
--with-libcurl \
105-
--with-libxml2 \
106-
--with-net-snmp \
107-
--with-openipmi \
108-
--with-openssl \
109-
--with-ssh \
110-
--with-unixodbc \
111-
--enable-ipv6 \
112-
--silent && \
113-
make -j"$(nproc)" -s dbschema && \
114-
make -j"$(nproc)" -s && \
115-
./configure \
116-
--datadir=/usr/lib \
117-
--libdir=/usr/lib/zabbix \
118-
--prefix=/usr \
119-
--sysconfdir=/etc/zabbix \
120-
--enable-proxy \
121-
--with-sqlite3 \
122-
--with-ldap \
123-
--with-libcurl \
124-
--with-libxml2 \
125-
--with-net-snmp \
126-
--with-openipmi \
127-
--with-openssl \
128-
--with-ssh \
129-
--with-unixodbc \
130-
--enable-ipv6 \
131-
--silent && \
96+
--datadir=/usr/lib \
97+
--libdir=/usr/lib/zabbix \
98+
--prefix=/usr \
99+
--sysconfdir=/etc/zabbix \
100+
--enable-agent \
101+
--enable-agent2 \
102+
--enable-server \
103+
--enable-webservice \
104+
--with-postgresql \
105+
--with-ldap \
106+
--with-libcurl \
107+
--with-libxml2 \
108+
--with-net-snmp \
109+
--with-openipmi \
110+
--with-openssl \
111+
--with-ssh \
112+
--with-unixodbc \
113+
--enable-ipv6 \
114+
--silent && \
132115
make -j"$(nproc)" -s dbschema && \
133116
make -j"$(nproc)" -s && \
134117
cp src/zabbix_proxy/zabbix_proxy /usr/sbin/zabbix_proxy && \
@@ -140,16 +123,17 @@ RUN source /assets/functions/00-container && \
140123
mv ui ${NGINX_WEBROOT} && \
141124
chown -R ${NGINX_USER}:${NGINX_GROUP} ${NGINX_WEBROOT} && \
142125
rm -rf /usr/src/* \
143-
/tmp/* && \
126+
/tmp/* \
127+
&& \
144128
chown --quiet -R zabbix:root \
145-
/etc/zabbix/ \
146-
/var/lib/zabbix/ && \
129+
/etc/zabbix/ \
130+
/var/lib/zabbix/ && \
147131
chgrp -R 0 \
148-
/etc/zabbix/ \
149-
/var/lib/zabbix/ && \
132+
/etc/zabbix/ \
133+
/var/lib/zabbix/ && \
150134
chmod -R g=u \
151-
/etc/zabbix/ \
152-
/var/lib/zabbix/ && \
135+
/etc/zabbix/ \
136+
/var/lib/zabbix/ && \
153137
package remove .zabbix-build-deps && \
154138
package cleanup
155139

‎install/etc/cont-init.d/30-zabbix

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ source /assets/functions/00-container
44
source /assets/defaults/zabbix
55
source /assets/functions/30-zabbix
66

7-
PROCESS_NAME="zabbix"
7+
SERVICE_NAME="zabbix"
88

99
transform_file_var \
1010
DB_HOST \

‎install/etc/services.available/30-zabbix-proxy/run

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
source /assets/functions/00-container
44
source /assets/defaults/zabbix
55
source /assets/defaults/zabbix-proxy
6-
PROCESS_NAME="zabbix-proxy"
6+
SERVICE_NAME="zabbix-proxy"
77

88
check_container_initialized
99
liftoff

‎install/etc/services.available/30-zabbix-server/run

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
source /assets/functions/00-container
44
source /assets/defaults/zabbix
55
source /assets/defaults/zabbix-server
6-
PROCESS_NAME="zabbix-server"
6+
SERVICE_NAME="zabbix-server"
77

88
check_container_initialized
99
liftoff

‎install/etc/services.available/30-zabbix-webservice/run

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
source /assets/functions/00-container
44
source /assets/defaults/zabbix
55
source /assets/defaults/zabbix-webservice
6-
PROCESS_NAME="zabbix-webservice"
6+
SERVICE_NAME="zabbix-webservice"
77

88
check_container_initialized
99
liftoff

0 commit comments

Comments
 (0)