extern/zabbix-docker
1
0
Fork 0
mirror of https://github.com/zabbix/zabbix-docker.git synced 2025-01-03 12:19:16 +01:00
Code Issues Packages Projects Releases Wiki Activity

Updated Alpine images

Browse Source
This commit is contained in:
Alexey Pustovalov 2020-04-25 22:01:11 +03:00
parent 4c277961c7
commit f2644247bd
14 changed files with 163 additions and 122 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
docker-compose_v3_alpine_mysql_latest.yaml
View File

@ -37,7 +37,6 @@ services:
- MYSQL_USER - MYSQL_USER
- MYSQL_PASSWORD - MYSQL_PASSWORD
- MYSQL_ROOT_PASSWORD - MYSQL_ROOT_PASSWORD
user: root
depends_on: depends_on:
- mysql-server - mysql-server
- zabbix-java-gateway - zabbix-java-gateway
@ -97,7 +96,6 @@ services:
env_file: env_file:
- .env_prx - .env_prx
- .env_prx_sqlite3 - .env_prx_sqlite3
user: root
depends_on: depends_on:
- zabbix-java-gateway - zabbix-java-gateway
- zabbix-snmptraps - zabbix-snmptraps
@ -149,7 +147,6 @@ services:
- .env_db_mysql_proxy - .env_db_mysql_proxy
- .env_prx - .env_prx
- .env_prx_mysql - .env_prx_mysql
user: root
depends_on: depends_on:
- mysql-server - mysql-server
- zabbix-java-gateway - zabbix-java-gateway
@ -172,8 +169,8 @@ services:
zabbix-web-apache-mysql: zabbix-web-apache-mysql:
image: zabbix/zabbix-web-apache-mysql:alpine-latest image: zabbix/zabbix-web-apache-mysql:alpine-latest
ports: ports:
- "80:80" - "80:8080"
- "443:443" - "443:8443"
links: links:
- mysql-server:mysql-server - mysql-server:mysql-server
- zabbix-server:zabbix-server - zabbix-server:zabbix-server
@ -195,12 +192,11 @@ services:
secrets: secrets:
- MYSQL_USER - MYSQL_USER
- MYSQL_PASSWORD - MYSQL_PASSWORD
user: root
depends_on: depends_on:
- mysql-server - mysql-server
- zabbix-server - zabbix-server
healthcheck: healthcheck:
test: ["CMD", "curl", "-f", "http://localhost"] test: ["CMD", "curl", "-f", "http://localhost:8080/"]
interval: 10s interval: 10s
timeout: 5s timeout: 5s
retries: 3 retries: 3
@ -226,8 +222,8 @@ services:
zabbix-web-nginx-mysql: zabbix-web-nginx-mysql:
image: zabbix/zabbix-web-nginx-mysql:alpine-latest image: zabbix/zabbix-web-nginx-mysql:alpine-latest
ports: ports:
- "8081:80" - "8081:8080"
- "8443:443" - "8443:8443"
links: links:
- mysql-server:mysql-server - mysql-server:mysql-server
- zabbix-server:zabbix-server - zabbix-server:zabbix-server
@ -249,12 +245,11 @@ services:
secrets: secrets:
- MYSQL_USER - MYSQL_USER
- MYSQL_PASSWORD - MYSQL_PASSWORD
user: root
depends_on: depends_on:
- mysql-server - mysql-server
- zabbix-server - zabbix-server
healthcheck: healthcheck:
test: ["CMD", "curl", "-f", "http://localhost"] test: ["CMD", "curl", "-f", "http://localhost:8080/"]
interval: 10s interval: 10s
timeout: 5s timeout: 5s
retries: 3 retries: 3
@ -301,7 +296,6 @@ services:
mode: global mode: global
env_file: env_file:
- .env_agent - .env_agent
user: root
privileged: true privileged: true
pid: "host" pid: "host"
networks: networks:
@ -331,7 +325,6 @@ services:
memory: 256M memory: 256M
env_file: env_file:
- .env_java - .env_java
user: root
networks: networks:
zbx_net_backend: zbx_net_backend:
aliases: aliases:
@ -358,7 +351,6 @@ services:
reservations: reservations:
cpus: '0.25' cpus: '0.25'
memory: 128M memory: 128M
user: root
networks: networks:
zbx_net_frontend: zbx_net_frontend:
aliases: aliases:
@ -382,7 +374,6 @@ services:
- MYSQL_USER - MYSQL_USER
- MYSQL_PASSWORD - MYSQL_PASSWORD
- MYSQL_ROOT_PASSWORD - MYSQL_ROOT_PASSWORD
user: root
stop_grace_period: 1m stop_grace_period: 1m
networks: networks:
zbx_net_backend: zbx_net_backend:

21
docker-compose_v3_alpine_mysql_local.yaml
View File

@ -41,7 +41,6 @@ services:
- MYSQL_USER - MYSQL_USER
- MYSQL_PASSWORD - MYSQL_PASSWORD
- MYSQL_ROOT_PASSWORD - MYSQL_ROOT_PASSWORD
user: root
depends_on: depends_on:
- mysql-server - mysql-server
- zabbix-java-gateway - zabbix-java-gateway
@ -105,7 +104,6 @@ services:
env_file: env_file:
- .env_prx - .env_prx
- .env_prx_sqlite3 - .env_prx_sqlite3
user: root
depends_on: depends_on:
- zabbix-java-gateway - zabbix-java-gateway
- zabbix-snmptraps - zabbix-snmptraps
@ -161,7 +159,6 @@ services:
- .env_db_mysql_proxy - .env_db_mysql_proxy
- .env_prx - .env_prx
- .env_prx_mysql - .env_prx_mysql
user: root
depends_on: depends_on:
- mysql-server - mysql-server
- zabbix-java-gateway - zabbix-java-gateway
@ -188,8 +185,8 @@ services:
- alpine:3.10 - alpine:3.10
image: zabbix-web-apache-mysql:alpine-local image: zabbix-web-apache-mysql:alpine-local
ports: ports:
- "80:80" - "80:8080"
- "443:443" - "443:8443"
links: links:
- mysql-server:mysql-server - mysql-server:mysql-server
- zabbix-server:zabbix-server - zabbix-server:zabbix-server
@ -211,12 +208,11 @@ services:
secrets: secrets:
- MYSQL_USER - MYSQL_USER
- MYSQL_PASSWORD - MYSQL_PASSWORD
user: root
depends_on: depends_on:
- mysql-server - mysql-server
- zabbix-server - zabbix-server
healthcheck: healthcheck:
test: ["CMD", "curl", "-f", "http://localhost"] test: ["CMD", "curl", "-f", "http://localhost:8080/"]
interval: 10s interval: 10s
timeout: 5s timeout: 5s
retries: 3 retries: 3
@ -246,8 +242,8 @@ services:
- alpine:3.10 - alpine:3.10
image: zabbix-web-nginx-mysql:alpine-local image: zabbix-web-nginx-mysql:alpine-local
ports: ports:
- "8081:80" - "8081:8080"
- "8443:443" - "8443:8443"
links: links:
- mysql-server:mysql-server - mysql-server:mysql-server
- zabbix-server:zabbix-server - zabbix-server:zabbix-server
@ -269,12 +265,11 @@ services:
secrets: secrets:
- MYSQL_USER - MYSQL_USER
- MYSQL_PASSWORD - MYSQL_PASSWORD
user: root
depends_on: depends_on:
- mysql-server - mysql-server
- zabbix-server - zabbix-server
healthcheck: healthcheck:
test: ["CMD", "curl", "-f", "http://localhost"] test: ["CMD", "curl", "-f", "http://localhost:8080/"]
interval: 10s interval: 10s
timeout: 5s timeout: 5s
retries: 3 retries: 3
@ -325,7 +320,6 @@ services:
mode: global mode: global
env_file: env_file:
- .env_agent - .env_agent
user: root
privileged: true privileged: true
pid: "host" pid: "host"
networks: networks:
@ -359,7 +353,6 @@ services:
memory: 256M memory: 256M
env_file: env_file:
- .env_java - .env_java
user: root
networks: networks:
zbx_net_backend: zbx_net_backend:
aliases: aliases:
@ -390,7 +383,6 @@ services:
reservations: reservations:
cpus: '0.25' cpus: '0.25'
memory: 128M memory: 128M
user: root
networks: networks:
zbx_net_frontend: zbx_net_frontend:
aliases: aliases:
@ -414,7 +406,6 @@ services:
- MYSQL_USER - MYSQL_USER
- MYSQL_PASSWORD - MYSQL_PASSWORD
- MYSQL_ROOT_PASSWORD - MYSQL_ROOT_PASSWORD
user: root
stop_grace_period: 1m stop_grace_period: 1m
networks: networks:
zbx_net_backend: zbx_net_backend:

22
docker-compose_v3_alpine_pgsql_latest.yaml
View File

@ -36,7 +36,6 @@ services:
secrets: secrets:
- POSTGRES_USER - POSTGRES_USER
- POSTGRES_PASSWORD - POSTGRES_PASSWORD
user: root
depends_on: depends_on:
- postgres-server - postgres-server
- zabbix-java-gateway - zabbix-java-gateway
@ -96,7 +95,6 @@ services:
env_file: env_file:
- .env_prx - .env_prx
- .env_prx_sqlite3 - .env_prx_sqlite3
user: root
depends_on: depends_on:
- zabbix-java-gateway - zabbix-java-gateway
- zabbix-snmptraps - zabbix-snmptraps
@ -152,7 +150,6 @@ services:
- MYSQL_USER - MYSQL_USER
- MYSQL_PASSWORD - MYSQL_PASSWORD
- MYSQL_ROOT_PASSWORD - MYSQL_ROOT_PASSWORD
user: root
depends_on: depends_on:
- mysql-server - mysql-server
- zabbix-java-gateway - zabbix-java-gateway
@ -175,8 +172,8 @@ services:
zabbix-web-apache-pgsql: zabbix-web-apache-pgsql:
image: zabbix/zabbix-web-apache-pgsql:alpine-latest image: zabbix/zabbix-web-apache-pgsql:alpine-latest
ports: ports:
- "80:80" - "80:8080"
- "443:443" - "443:8443"
links: links:
- postgres-server:postgres-server - postgres-server:postgres-server
- zabbix-server:zabbix-server - zabbix-server:zabbix-server
@ -198,12 +195,11 @@ services:
secrets: secrets:
- POSTGRES_USER - POSTGRES_USER
- POSTGRES_PASSWORD - POSTGRES_PASSWORD
user: root
depends_on: depends_on:
- postgres-server - postgres-server
- zabbix-server - zabbix-server
healthcheck: healthcheck:
test: ["CMD", "curl", "-f", "http://localhost"] test: ["CMD", "curl", "-f", "http://localhost:8080/"]
interval: 10s interval: 10s
timeout: 5s timeout: 5s
retries: 3 retries: 3
@ -229,8 +225,8 @@ services:
zabbix-web-nginx-pgsql: zabbix-web-nginx-pgsql:
image: zabbix/zabbix-web-nginx-pgsql:alpine-latest image: zabbix/zabbix-web-nginx-pgsql:alpine-latest
ports: ports:
- "8081:80" - "8081:8080"
- "8443:443" - "8443:80443"
links: links:
- postgres-server:postgres-server - postgres-server:postgres-server
- zabbix-server:zabbix-server - zabbix-server:zabbix-server
@ -252,12 +248,11 @@ services:
secrets: secrets:
- POSTGRES_USER - POSTGRES_USER
- POSTGRES_PASSWORD - POSTGRES_PASSWORD
user: root
depends_on: depends_on:
- postgres-server - postgres-server
- zabbix-server - zabbix-server
healthcheck: healthcheck:
test: ["CMD", "curl", "-f", "http://localhost"] test: ["CMD", "curl", "-f", "http://localhost:8080/"]
interval: 10s interval: 10s
timeout: 5s timeout: 5s
retries: 3 retries: 3
@ -304,7 +299,6 @@ services:
mode: global mode: global
env_file: env_file:
- .env_agent - .env_agent
user: root
privileged: true privileged: true
pid: "host" pid: "host"
networks: networks:
@ -334,7 +328,6 @@ services:
memory: 256M memory: 256M
env_file: env_file:
- .env_java - .env_java
user: root
networks: networks:
zbx_net_backend: zbx_net_backend:
aliases: aliases:
@ -361,7 +354,6 @@ services:
reservations: reservations:
cpus: '0.25' cpus: '0.25'
memory: 128M memory: 128M
user: root
networks: networks:
zbx_net_frontend: zbx_net_frontend:
aliases: aliases:
@ -385,7 +377,6 @@ services:
- MYSQL_USER - MYSQL_USER
- MYSQL_PASSWORD - MYSQL_PASSWORD
- MYSQL_ROOT_PASSWORD - MYSQL_ROOT_PASSWORD
user: root
stop_grace_period: 1m stop_grace_period: 1m
networks: networks:
zbx_net_backend: zbx_net_backend:
@ -403,7 +394,6 @@ services:
secrets: secrets:
- POSTGRES_USER - POSTGRES_USER
- POSTGRES_PASSWORD - POSTGRES_PASSWORD
user: root
stop_grace_period: 1m stop_grace_period: 1m
networks: networks:
zbx_net_backend: zbx_net_backend:

22
docker-compose_v3_alpine_pgsql_local.yaml
View File

@ -40,7 +40,6 @@ services:
secrets: secrets:
- POSTGRES_USER - POSTGRES_USER
- POSTGRES_PASSWORD - POSTGRES_PASSWORD
user: root
depends_on: depends_on:
- postgres-server - postgres-server
- zabbix-java-gateway - zabbix-java-gateway
@ -104,7 +103,6 @@ services:
env_file: env_file:
- .env_prx - .env_prx
- .env_prx_sqlite3 - .env_prx_sqlite3
user: root
depends_on: depends_on:
- zabbix-java-gateway - zabbix-java-gateway
- zabbix-snmptraps - zabbix-snmptraps
@ -164,7 +162,6 @@ services:
- MYSQL_USER - MYSQL_USER
- MYSQL_PASSWORD - MYSQL_PASSWORD
- MYSQL_ROOT_PASSWORD - MYSQL_ROOT_PASSWORD
user: root
depends_on: depends_on:
- mysql-server - mysql-server
- zabbix-java-gateway - zabbix-java-gateway
@ -192,8 +189,8 @@ services:
- alpine:3.10 - alpine:3.10
image: zabbix-web-apache-pgsql:alpine-local image: zabbix-web-apache-pgsql:alpine-local
ports: ports:
- "80:80" - "80:8080"
- "443:443" - "443:8443"
links: links:
- postgres-server:postgres-server - postgres-server:postgres-server
- zabbix-server:zabbix-server - zabbix-server:zabbix-server
@ -215,12 +212,11 @@ services:
secrets: secrets:
- POSTGRES_USER - POSTGRES_USER
- POSTGRES_PASSWORD - POSTGRES_PASSWORD
user: root
depends_on: depends_on:
- postgres-server - postgres-server
- zabbix-server - zabbix-server
healthcheck: healthcheck:
test: ["CMD", "curl", "-f", "http://localhost"] test: ["CMD", "curl", "-f", "http://localhost:8080/"]
interval: 10s interval: 10s
timeout: 5s timeout: 5s
retries: 3 retries: 3
@ -250,8 +246,8 @@ services:
- alpine:3.10 - alpine:3.10
image: zabbix-web-nginx-pgsql:alpine-local image: zabbix-web-nginx-pgsql:alpine-local
ports: ports:
- "8081:80" - "8081:8080"
- "8443:443" - "8443:8443"
links: links:
- postgres-server:postgres-server - postgres-server:postgres-server
- zabbix-server:zabbix-server - zabbix-server:zabbix-server
@ -273,12 +269,11 @@ services:
secrets: secrets:
- POSTGRES_USER - POSTGRES_USER
- POSTGRES_PASSWORD - POSTGRES_PASSWORD
user: root
depends_on: depends_on:
- postgres-server - postgres-server
- zabbix-server - zabbix-server
healthcheck: healthcheck:
test: ["CMD", "curl", "-f", "http://localhost"] test: ["CMD", "curl", "-f", "http://localhost:8080/"]
interval: 10s interval: 10s
timeout: 5s timeout: 5s
retries: 3 retries: 3
@ -329,7 +324,6 @@ services:
mode: global mode: global
env_file: env_file:
- .env_agent - .env_agent
user: root
privileged: true privileged: true
pid: "host" pid: "host"
networks: networks:
@ -363,7 +357,6 @@ services:
memory: 256M memory: 256M
env_file: env_file:
- .env_java - .env_java
user: root
networks: networks:
zbx_net_backend: zbx_net_backend:
aliases: aliases:
@ -394,7 +387,6 @@ services:
reservations: reservations:
cpus: '0.25' cpus: '0.25'
memory: 128M memory: 128M
user: root
networks: networks:
zbx_net_frontend: zbx_net_frontend:
aliases: aliases:
@ -418,7 +410,6 @@ services:
- MYSQL_USER - MYSQL_USER
- MYSQL_PASSWORD - MYSQL_PASSWORD
- MYSQL_ROOT_PASSWORD - MYSQL_ROOT_PASSWORD
user: root
stop_grace_period: 1m stop_grace_period: 1m
networks: networks:
zbx_net_backend: zbx_net_backend:
@ -436,7 +427,6 @@ services:
secrets: secrets:
- POSTGRES_USER - POSTGRES_USER
- POSTGRES_PASSWORD - POSTGRES_PASSWORD
user: root
stop_grace_period: 1m stop_grace_period: 1m
networks: networks:
zbx_net_backend: zbx_net_backend:

9
snmptraps/alpine/conf/etc/supervisor/supervisord.conf
View File

@ -1,17 +1,17 @@
; supervisor config file ; supervisor config file
[unix_http_server] [unix_http_server]
file = /var/run/supervisor.sock ; (the path to the socket file) file = /tmp/supervisor.sock ; (the path to the socket file)
chmod = 0700 ; sockef file mode (default 0700) chmod = 0700 ; sockef file mode (default 0700)
username = zbx username = zbx
password = password password = password
[supervisord] [supervisord]
logfile = /dev/stdout ; (main log file;default $CWD/supervisord.log) logfile = /dev/stdout ; (main log file;default $CWD/supervisord.log)
pidfile = /var/run/supervisord.pid ; (supervisord pidfile;default supervisord.pid) pidfile = /tmp/supervisord.pid ; (supervisord pidfile;default supervisord.pid)
childlogdir = /tmp ; ('AUTO' child log dir, default $TEMP) childlogdir = /tmp ; ('AUTO' child log dir, default $TEMP)
critical = critical critical = critical
user = root ;user = zabbix
logfile_maxbytes = 0 logfile_maxbytes = 0
logfile_backupcount = 0 logfile_backupcount = 0
loglevel = info loglevel = info
@ -23,7 +23,7 @@ loglevel = info
supervisor.rpcinterface_factory = supervisor.rpcinterface:make_main_rpcinterface supervisor.rpcinterface_factory = supervisor.rpcinterface:make_main_rpcinterface
[supervisorctl] [supervisorctl]
serverurl = unix:///var/run/supervisor.sock ; use a unix:// URL for a unix socket serverurl = unix:///tmp/supervisor.sock ; use a unix:// URL for a unix socket
; The [include] section can just contain the "files" setting. This ; The [include] section can just contain the "files" setting. This
; setting can list multiple files (separated by whitespace or ; setting can list multiple files (separated by whitespace or
@ -33,3 +33,4 @@ serverurl = unix:///var/run/supervisor.sock ; use a unix:// URL for a unix sock
[include] [include]
files = /etc/supervisor/conf.d/*.conf files = /etc/supervisor/conf.d/*.conf

7
web-apache-mysql/alpine/Dockerfile
View File

@ -48,9 +48,10 @@ RUN set -eux && \
-e 's!^(\s*ErrorLog)\s+\S+!\1 /proc/self/fd/2!g' \ -e 's!^(\s*ErrorLog)\s+\S+!\1 /proc/self/fd/2!g' \
"/etc/apache2/httpd.conf" && \ "/etc/apache2/httpd.conf" && \
sed -ri \ sed -ri \
-e 's!^(\s*PidFile)\s+\S+!\1 "/var/run/httpd.pid"!g' \ -e 's!^(\s*PidFile)\s+\S+!\1 "/tmp/httpd.pid"!g' \
"/etc/apache2/conf.d/mpm.conf" && \ "/etc/apache2/conf.d/mpm.conf" && \
rm -f "/var/run/apache2/apache2.pid" && \ sed -i 's/Listen 80/Listen 8080/g' /etc/apache2/httpd.conf && \
rm -rf "/var/run/apache2/" && \
rm -rf /var/cache/apk/* rm -rf /var/cache/apk/*
ARG MAJOR_VERSION=master ARG MAJOR_VERSION=master
@ -89,7 +90,7 @@ RUN set -eux && \
build-dependencies && \ build-dependencies && \
rm -rf /var/cache/apk/* rm -rf /var/cache/apk/*
EXPOSE 80/TCP 443/TCP EXPOSE 8080/TCP 8443/TCP
WORKDIR /usr/share/zabbix WORKDIR /usr/share/zabbix

104
web-apache-mysql/alpine/Dockerfile.orig Normal file
View File

@ -0,0 +1,104 @@
FROM alpine:3.11
LABEL org.opencontainers.image.title="Zabbix web-interface (Apache, MySQL)" \
org.opencontainers.image.authors="Alexey Pustovalov <alexey.pustovalov@zabbix.com>" \
org.opencontainers.image.vendor="Zabbix LLC" \
org.opencontainers.image.url="https://zabbix.com/" \
org.opencontainers.image.description="Zabbix web-interface based on Apache2 web server with MySQL database support" \
org.opencontainers.image.licenses="GPL v2.0"
STOPSIGNAL SIGTERM
RUN set -eux && \
addgroup -S -g 1995 zabbix && \
adduser -S \
-D -G zabbix -G root \
-u 1997 \
-h /var/lib/zabbix/ \
-H \
zabbix && \
mkdir -p /etc/zabbix && \
mkdir -p /etc/zabbix/web && \
apk add --clean-protected --no-cache \
apache2 \
bash \
curl \
mariadb-client \
mariadb-connector-c \
php7-apache2 \
php7-bcmath \
php7-ctype \
php7-gd \
php7-gettext \
php7-json \
php7-ldap \
php7-mbstring \
php7-mysqli \
php7-session \
php7-simplexml \
php7-sockets \
php7-fileinfo \
php7-xmlreader \
php7-xmlwriter && \
apk add --clean-protected --no-cache --no-scripts apache2-ssl && \
rm -f "/etc/apache2/conf.d/default.conf" && \
rm -f "/etc/apache2/conf.d/ssl.conf" && \
sed -ri \
-e 's!^(\s*CustomLog)\s+\S+!\1 /proc/self/fd/1!g' \
-e 's!^(\s*ErrorLog)\s+\S+!\1 /proc/self/fd/2!g' \
"/etc/apache2/httpd.conf" && \
sed -ri \
-e 's!^(\s*PidFile)\s+\S+!\1 "/var/run/httpd.pid"!g' \
"/etc/apache2/conf.d/mpm.conf" && \
rm -f "/var/run/apache2/apache2.pid" && \
rm -rf /var/cache/apk/*
ARG MAJOR_VERSION=master
ARG ZBX_VERSION=${MAJOR_VERSION}
ARG ZBX_SOURCES=https://git.zabbix.com/scm/zbx/zabbix.git
ENV TERM=xterm ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES}
LABEL org.opencontainers.image.documentation="https://www.zabbix.com/documentation/${MAJOR_VERSION}/manual/installation/containers" \
org.opencontainers.image.version="${ZBX_VERSION}" \
org.opencontainers.image.source="${ZBX_SOURCES}"
COPY ["conf/etc/", "/etc/"]
RUN set -eux && \
apk add --no-cache --virtual build-dependencies \
gettext \
git && \
cd /usr/share/ && \
git clone ${ZBX_SOURCES} --branch ${ZBX_VERSION} --depth 1 --single-branch zabbix-${ZBX_VERSION} && \
mkdir /usr/share/zabbix/ && \
cp -R /usr/share/zabbix-${ZBX_VERSION}/frontends/php/* /usr/share/zabbix/ && \
rm -rf /usr/share/zabbix-${ZBX_VERSION}/ && \
cd /usr/share/zabbix/ && \
rm -f conf/zabbix.conf.php && \
rm -rf tests && \
./locale/make_mo.sh && \
ln -s "/etc/zabbix/web/zabbix.conf.php" "/usr/share/zabbix/conf/zabbix.conf.php" && \
chown --quiet -R zabbix:root /etc/zabbix/ /usr/share/zabbix/conf/ && \
chgrp -R 0 /etc/zabbix/ /usr/share/zabbix/conf/ && \
chmod -R g=u /etc/zabbix/ /usr/share/zabbix/conf/ && \
chown --quiet -R zabbix:root /etc/apache2/ /etc/php7/ && \
chgrp -R 0 /etc/apache2/ /etc/php7/ && \
chmod -R g=u /etc/apache2/ /etc/php7/ && \
apk del --purge --no-network \
build-dependencies && \
rm -rf /var/cache/apk/*
EXPOSE 80/TCP 443/TCP
WORKDIR /usr/share/zabbix
VOLUME ["/etc/ssl/apache2"]
COPY ["docker-entrypoint.sh", "/usr/bin/"]
USER 1997
ENTRYPOINT ["docker-entrypoint.sh"]
CMD ["/usr/sbin/httpd", "-D", "FOREGROUND"]

2
web-apache-mysql/alpine/conf/etc/zabbix/apache.conf
View File

@ -1,4 +1,4 @@
<VirtualHost *:80> <VirtualHost *:8080>
DocumentRoot /usr/share/zabbix/ DocumentRoot /usr/share/zabbix/
ServerName zabbix ServerName zabbix
DirectoryIndex index.php DirectoryIndex index.php

4
web-apache-mysql/alpine/conf/etc/zabbix/apache_ssl.conf
View File

@ -1,10 +1,10 @@
LoadModule ssl_module modules/mod_ssl.so LoadModule ssl_module modules/mod_ssl.so
LoadModule socache_shmcb_module modules/mod_socache_shmcb.so LoadModule socache_shmcb_module modules/mod_socache_shmcb.so
Listen 443 Listen 8443
<IfModule mod_ssl.c> <IfModule mod_ssl.c>
<VirtualHost *:443> <VirtualHost *:8443>
SSLEngine on SSLEngine on
DocumentRoot /usr/share/zabbix/ DocumentRoot /usr/share/zabbix/

6
web-nginx-mysql/alpine/Dockerfile
View File

@ -41,6 +41,7 @@ RUN set -eux && \
php7-xmlreader \ php7-xmlreader \
php7-xmlwriter \ php7-xmlwriter \
supervisor && \ supervisor && \
rm -rf /etc/php7/php-fpm.d/www.conf && \
rm -f /etc/nginx/conf.d/*.conf && \ rm -f /etc/nginx/conf.d/*.conf && \
rm -rf /var/cache/apk/* rm -rf /var/cache/apk/*
@ -77,11 +78,14 @@ RUN set -eux && \
chown --quiet -R zabbix:root /etc/nginx/ /etc/php7/ && \ chown --quiet -R zabbix:root /etc/nginx/ /etc/php7/ && \
chgrp -R 0 /etc/nginx/ /etc/php7/ && \ chgrp -R 0 /etc/nginx/ /etc/php7/ && \
chmod -R g=u /etc/nginx/ /etc/php7/ && \ chmod -R g=u /etc/nginx/ /etc/php7/ && \
chown --quiet -R zabbix:root /var/log/nginx/ /var/lib/nginx/ && \
chgrp -R 0 /var/log/nginx/ /var/lib/nginx/ && \
chmod -R g=u /var/log/nginx/ /var/lib/nginx/ && \
apk del --purge --no-network \ apk del --purge --no-network \
build-dependencies && \ build-dependencies && \
rm -rf /var/cache/apk/* rm -rf /var/cache/apk/*
EXPOSE 80/TCP 443/TCP EXPOSE 8080/TCP 8443/TCP
WORKDIR /usr/share/zabbix WORKDIR /usr/share/zabbix

4
web-nginx-mysql/alpine/conf/etc/nginx/nginx.conf
View File

@ -1,10 +1,10 @@
user zabbix; #user nginx;
worker_processes 5; worker_processes 5;
worker_rlimit_nofile 256000; worker_rlimit_nofile 256000;
error_log /dev/fd/2 warn; error_log /dev/fd/2 warn;
pid /var/run/nginx.pid; pid /tmp/nginx.pid;
events { events {
worker_connections 5120; worker_connections 5120;

7
web-nginx-mysql/alpine/conf/etc/php7/php-fpm.conf
View File

@ -12,7 +12,6 @@
; Relative path can also be used. They will be prefixed by: ; Relative path can also be used. They will be prefixed by:
; - the global prefix if it's been set (-p argument) ; - the global prefix if it's been set (-p argument)
; - /usr otherwise ; - /usr otherwise
include = /etc/php7/php-fpm.d/*.conf
;;;;;;;;;;;;;;;;;; ;;;;;;;;;;;;;;;;;;
; Global Options ; ; Global Options ;
@ -29,7 +28,7 @@ include = /etc/php7/php-fpm.d/*.conf
; in a local file. ; in a local file.
; Note: the default prefix is /var ; Note: the default prefix is /var
; Default Value: log/php-fpm.log ; Default Value: log/php-fpm.log
error_log = /var/log/php-fpm.log error_log = /dev/fd/2
; syslog_facility is used to specify what type of program is logging the ; syslog_facility is used to specify what type of program is logging the
; message. This lets syslogd specify that messages from different facilities ; message. This lets syslogd specify that messages from different facilities
@ -172,8 +171,8 @@ listen = /tmp/php-fpm.sock
; BSD-derived systems allow connections regardless of permissions. ; BSD-derived systems allow connections regardless of permissions.
; Default Values: user and group are set as the running user ; Default Values: user and group are set as the running user
; mode is set to 0660 ; mode is set to 0660
listen.owner = nginx ;listen.owner = nginx
listen.group = nginx ;listen.group = nginx
;listen.mode = 0660 ;listen.mode = 0660
; When POSIX Access Control Lists are supported you can set them using ; When POSIX Access Control Lists are supported you can set them using
; these options, value is a comma separated list of user/group names. ; these options, value is a comma separated list of user/group names.

2
web-nginx-mysql/alpine/conf/etc/zabbix/nginx.conf
View File

@ -1,5 +1,5 @@
server { server {
listen 80; listen 8080;
server_name zabbix; server_name zabbix;
index index.php; index index.php;

38
web-nginx-mysql/alpine/docker-entrypoint.sh
View File

@ -1,6 +1,6 @@
#!/bin/bash #!/bin/bash
set -eo pipefail set -o pipefail
set +e set +e
@ -190,7 +190,7 @@ check_variables_mysql() {
fi fi
} }
check_db_connect_mysql() { check_db_connect() {
echo "********************" echo "********************"
echo "* DB_SERVER_HOST: ${DB_SERVER_HOST}" echo "* DB_SERVER_HOST: ${DB_SERVER_HOST}"
echo "* DB_SERVER_PORT: ${DB_SERVER_PORT}" echo "* DB_SERVER_PORT: ${DB_SERVER_PORT}"
@ -215,10 +215,9 @@ check_db_connect_mysql() {
done done
} }
prepare_web_server_nginx() { prepare_web_server() {
NGINX_CONFD_DIR="/etc/nginx/conf.d" NGINX_CONFD_DIR="/etc/nginx/conf.d"
NGINX_SSL_CONFIG="/etc/ssl/nginx" NGINX_SSL_CONFIG="/etc/ssl/nginx"
PHP_SESSIONS_DIR="/var/lib/php5"
echo "** Adding Zabbix virtual host (HTTP)" echo "** Adding Zabbix virtual host (HTTP)"
if [ -f "$ZABBIX_ETC_DIR/nginx.conf" ]; then if [ -f "$ZABBIX_ETC_DIR/nginx.conf" ]; then
@ -238,12 +237,8 @@ prepare_web_server_nginx() {
echo "**** Impossible to enable SSL support for Nginx. Certificates are missed." echo "**** Impossible to enable SSL support for Nginx. Certificates are missed."
fi fi
if [ -d "/var/log/nginx/" ]; then
ln -sf /dev/fd/2 /var/log/nginx/error.log ln -sf /dev/fd/2 /var/log/nginx/error.log
fi ln -sf /dev/fd/1 /var/log/php-fpm.log
ln -sf /dev/fd/2 /var/log/php5-fpm.log
ln -sf /dev/fd/2 /var/log/php7.2-fpm.log
} }
clear_deploy() { clear_deploy() {
@ -263,37 +258,14 @@ prepare_zbx_web_config() {
ln -s "$ZBX_WEB_CONFIG" "/usr/share/zabbix/conf/zabbix.conf.php" ln -s "$ZBX_WEB_CONFIG" "/usr/share/zabbix/conf/zabbix.conf.php"
# Different places of PHP configuration file
if [ -f "/etc/php5/conf.d/99-zabbix.ini" ]; then
PHP_CONFIG_FILE="/etc/php5/conf.d/99-zabbix.ini"
elif [ -f "/etc/php5/fpm/conf.d/99-zabbix.ini" ]; then
PHP_CONFIG_FILE="/etc/php5/fpm/conf.d/99-zabbix.ini"
elif [ -f "/etc/php5/apache2/conf.d/99-zabbix.ini" ]; then
PHP_CONFIG_FILE="/etc/php5/apache2/conf.d/99-zabbix.ini"
elif [ -f "/etc/php/7.0/apache2/conf.d/99-zabbix.ini" ]; then
PHP_CONFIG_FILE="/etc/php/7.0/apache2/conf.d/99-zabbix.ini"
elif [ -f "/etc/php/7.0/fpm/conf.d/99-zabbix.ini" ]; then
PHP_CONFIG_FILE="/etc/php/7.0/fpm/conf.d/99-zabbix.ini"
elif [ -f "/etc/php.d/99-zabbix.ini" ]; then
PHP_CONFIG_FILE="/etc/php.d/99-zabbix.ini"
elif [ -f "/etc/php7/conf.d/99-zabbix.ini" ]; then
PHP_CONFIG_FILE="/etc/php7/conf.d/99-zabbix.ini" PHP_CONFIG_FILE="/etc/php7/conf.d/99-zabbix.ini"
elif [ -f "/etc/php/7.2/fpm/conf.d/99-zabbix.ini" ]; then
PHP_CONFIG_FILE="/etc/php/7.2/fpm/conf.d/99-zabbix.ini"
elif [ -f "/etc/php/7.2/apache2/conf.d/99-zabbix.ini" ]; then
PHP_CONFIG_FILE="/etc/php/7.2/apache2/conf.d/99-zabbix.ini"
fi
if [ -n "$PHP_CONFIG_FILE" ]; then
update_config_var "$PHP_CONFIG_FILE" "max_execution_time" "${ZBX_MAXEXECUTIONTIME:-"600"}" update_config_var "$PHP_CONFIG_FILE" "max_execution_time" "${ZBX_MAXEXECUTIONTIME:-"600"}"
update_config_var "$PHP_CONFIG_FILE" "memory_limit" "${ZBX_MEMORYLIMIT:-"128M"}" update_config_var "$PHP_CONFIG_FILE" "memory_limit" "${ZBX_MEMORYLIMIT:-"128M"}"
update_config_var "$PHP_CONFIG_FILE" "post_max_size" "${ZBX_POSTMAXSIZE:-"16M"}" update_config_var "$PHP_CONFIG_FILE" "post_max_size" "${ZBX_POSTMAXSIZE:-"16M"}"
update_config_var "$PHP_CONFIG_FILE" "upload_max_filesize" "${ZBX_UPLOADMAXFILESIZE:-"2M"}" update_config_var "$PHP_CONFIG_FILE" "upload_max_filesize" "${ZBX_UPLOADMAXFILESIZE:-"2M"}"
update_config_var "$PHP_CONFIG_FILE" "max_input_time" "${ZBX_MAXINPUTTIME:-"300"}" update_config_var "$PHP_CONFIG_FILE" "max_input_time" "${ZBX_MAXINPUTTIME:-"300"}"
update_config_var "$PHP_CONFIG_FILE" "date.timezone" "${PHP_TZ}" update_config_var "$PHP_CONFIG_FILE" "date.timezone" "${PHP_TZ}"
else
echo "**** Zabbix related PHP configuration file not found"
fi
# Escaping characters in parameter value # Escaping characters in parameter value
server_name=$(escape_spec_char "${ZBX_SERVER_NAME}") server_name=$(escape_spec_char "${ZBX_SERVER_NAME}")
@ -311,8 +283,6 @@ prepare_zbx_web_config() {
-e "s/{ZBX_SERVER_PORT}/${ZBX_SERVER_PORT}/g" \ -e "s/{ZBX_SERVER_PORT}/${ZBX_SERVER_PORT}/g" \
-e "s/{ZBX_SERVER_NAME}/$server_name/g" \ -e "s/{ZBX_SERVER_NAME}/$server_name/g" \
"$ZBX_WEB_CONFIG" "$ZBX_WEB_CONFIG"
[ "$db_type" = "postgresql" ] && sed -i "s/MYSQL/POSTGRESQL/g" "$ZBX_WEB_CONFIG"
} }
prepare_web() { prepare_web() {