From f2644247bd2e162a8b4c4c9f54636a5c0ade9c3a Mon Sep 17 00:00:00 2001 From: Alexey Pustovalov Date: Sat, 25 Apr 2020 22:01:11 +0300 Subject: [PATCH] Updated Alpine images --- docker-compose_v3_alpine_mysql_latest.yaml | 21 +--- docker-compose_v3_alpine_mysql_local.yaml | 21 +--- docker-compose_v3_alpine_pgsql_latest.yaml | 22 +--- docker-compose_v3_alpine_pgsql_local.yaml | 22 +--- .../conf/etc/supervisor/supervisord.conf | 9 +- web-apache-mysql/alpine/Dockerfile | 7 +- web-apache-mysql/alpine/Dockerfile.orig | 104 ++++++++++++++++++ .../alpine/conf/etc/zabbix/apache.conf | 2 +- .../alpine/conf/etc/zabbix/apache_ssl.conf | 4 +- web-nginx-mysql/alpine/Dockerfile | 6 +- .../alpine/conf/etc/nginx/nginx.conf | 4 +- .../alpine/conf/etc/php7/php-fpm.conf | 7 +- .../alpine/conf/etc/zabbix/nginx.conf | 2 +- web-nginx-mysql/alpine/docker-entrypoint.sh | 54 ++------- 14 files changed, 163 insertions(+), 122 deletions(-) create mode 100644 web-apache-mysql/alpine/Dockerfile.orig diff --git a/docker-compose_v3_alpine_mysql_latest.yaml b/docker-compose_v3_alpine_mysql_latest.yaml index 93b3fffa6..fd295be35 100644 --- a/docker-compose_v3_alpine_mysql_latest.yaml +++ b/docker-compose_v3_alpine_mysql_latest.yaml @@ -37,7 +37,6 @@ services: - MYSQL_USER - MYSQL_PASSWORD - MYSQL_ROOT_PASSWORD - user: root depends_on: - mysql-server - zabbix-java-gateway @@ -97,7 +96,6 @@ services: env_file: - .env_prx - .env_prx_sqlite3 - user: root depends_on: - zabbix-java-gateway - zabbix-snmptraps @@ -149,7 +147,6 @@ services: - .env_db_mysql_proxy - .env_prx - .env_prx_mysql - user: root depends_on: - mysql-server - zabbix-java-gateway @@ -172,8 +169,8 @@ services: zabbix-web-apache-mysql: image: zabbix/zabbix-web-apache-mysql:alpine-latest ports: - - "80:80" - - "443:443" + - "80:8080" + - "443:8443" links: - mysql-server:mysql-server - zabbix-server:zabbix-server @@ -195,12 +192,11 @@ services: secrets: - MYSQL_USER - MYSQL_PASSWORD - user: root depends_on: - mysql-server - zabbix-server healthcheck: - test: ["CMD", "curl", "-f", "http://localhost"] + test: ["CMD", "curl", "-f", "http://localhost:8080/"] interval: 10s timeout: 5s retries: 3 @@ -226,8 +222,8 @@ services: zabbix-web-nginx-mysql: image: zabbix/zabbix-web-nginx-mysql:alpine-latest ports: - - "8081:80" - - "8443:443" + - "8081:8080" + - "8443:8443" links: - mysql-server:mysql-server - zabbix-server:zabbix-server @@ -249,12 +245,11 @@ services: secrets: - MYSQL_USER - MYSQL_PASSWORD - user: root depends_on: - mysql-server - zabbix-server healthcheck: - test: ["CMD", "curl", "-f", "http://localhost"] + test: ["CMD", "curl", "-f", "http://localhost:8080/"] interval: 10s timeout: 5s retries: 3 @@ -301,7 +296,6 @@ services: mode: global env_file: - .env_agent - user: root privileged: true pid: "host" networks: @@ -331,7 +325,6 @@ services: memory: 256M env_file: - .env_java - user: root networks: zbx_net_backend: aliases: @@ -358,7 +351,6 @@ services: reservations: cpus: '0.25' memory: 128M - user: root networks: zbx_net_frontend: aliases: @@ -382,7 +374,6 @@ services: - MYSQL_USER - MYSQL_PASSWORD - MYSQL_ROOT_PASSWORD - user: root stop_grace_period: 1m networks: zbx_net_backend: diff --git a/docker-compose_v3_alpine_mysql_local.yaml b/docker-compose_v3_alpine_mysql_local.yaml index 17cd913ee..6e69362e6 100644 --- a/docker-compose_v3_alpine_mysql_local.yaml +++ b/docker-compose_v3_alpine_mysql_local.yaml @@ -41,7 +41,6 @@ services: - MYSQL_USER - MYSQL_PASSWORD - MYSQL_ROOT_PASSWORD - user: root depends_on: - mysql-server - zabbix-java-gateway @@ -105,7 +104,6 @@ services: env_file: - .env_prx - .env_prx_sqlite3 - user: root depends_on: - zabbix-java-gateway - zabbix-snmptraps @@ -161,7 +159,6 @@ services: - .env_db_mysql_proxy - .env_prx - .env_prx_mysql - user: root depends_on: - mysql-server - zabbix-java-gateway @@ -188,8 +185,8 @@ services: - alpine:3.10 image: zabbix-web-apache-mysql:alpine-local ports: - - "80:80" - - "443:443" + - "80:8080" + - "443:8443" links: - mysql-server:mysql-server - zabbix-server:zabbix-server @@ -211,12 +208,11 @@ services: secrets: - MYSQL_USER - MYSQL_PASSWORD - user: root depends_on: - mysql-server - zabbix-server healthcheck: - test: ["CMD", "curl", "-f", "http://localhost"] + test: ["CMD", "curl", "-f", "http://localhost:8080/"] interval: 10s timeout: 5s retries: 3 @@ -246,8 +242,8 @@ services: - alpine:3.10 image: zabbix-web-nginx-mysql:alpine-local ports: - - "8081:80" - - "8443:443" + - "8081:8080" + - "8443:8443" links: - mysql-server:mysql-server - zabbix-server:zabbix-server @@ -269,12 +265,11 @@ services: secrets: - MYSQL_USER - MYSQL_PASSWORD - user: root depends_on: - mysql-server - zabbix-server healthcheck: - test: ["CMD", "curl", "-f", "http://localhost"] + test: ["CMD", "curl", "-f", "http://localhost:8080/"] interval: 10s timeout: 5s retries: 3 @@ -325,7 +320,6 @@ services: mode: global env_file: - .env_agent - user: root privileged: true pid: "host" networks: @@ -359,7 +353,6 @@ services: memory: 256M env_file: - .env_java - user: root networks: zbx_net_backend: aliases: @@ -390,7 +383,6 @@ services: reservations: cpus: '0.25' memory: 128M - user: root networks: zbx_net_frontend: aliases: @@ -414,7 +406,6 @@ services: - MYSQL_USER - MYSQL_PASSWORD - MYSQL_ROOT_PASSWORD - user: root stop_grace_period: 1m networks: zbx_net_backend: diff --git a/docker-compose_v3_alpine_pgsql_latest.yaml b/docker-compose_v3_alpine_pgsql_latest.yaml index 88c43486a..943a4cb14 100644 --- a/docker-compose_v3_alpine_pgsql_latest.yaml +++ b/docker-compose_v3_alpine_pgsql_latest.yaml @@ -36,7 +36,6 @@ services: secrets: - POSTGRES_USER - POSTGRES_PASSWORD - user: root depends_on: - postgres-server - zabbix-java-gateway @@ -96,7 +95,6 @@ services: env_file: - .env_prx - .env_prx_sqlite3 - user: root depends_on: - zabbix-java-gateway - zabbix-snmptraps @@ -152,7 +150,6 @@ services: - MYSQL_USER - MYSQL_PASSWORD - MYSQL_ROOT_PASSWORD - user: root depends_on: - mysql-server - zabbix-java-gateway @@ -175,8 +172,8 @@ services: zabbix-web-apache-pgsql: image: zabbix/zabbix-web-apache-pgsql:alpine-latest ports: - - "80:80" - - "443:443" + - "80:8080" + - "443:8443" links: - postgres-server:postgres-server - zabbix-server:zabbix-server @@ -198,12 +195,11 @@ services: secrets: - POSTGRES_USER - POSTGRES_PASSWORD - user: root depends_on: - postgres-server - zabbix-server healthcheck: - test: ["CMD", "curl", "-f", "http://localhost"] + test: ["CMD", "curl", "-f", "http://localhost:8080/"] interval: 10s timeout: 5s retries: 3 @@ -229,8 +225,8 @@ services: zabbix-web-nginx-pgsql: image: zabbix/zabbix-web-nginx-pgsql:alpine-latest ports: - - "8081:80" - - "8443:443" + - "8081:8080" + - "8443:80443" links: - postgres-server:postgres-server - zabbix-server:zabbix-server @@ -252,12 +248,11 @@ services: secrets: - POSTGRES_USER - POSTGRES_PASSWORD - user: root depends_on: - postgres-server - zabbix-server healthcheck: - test: ["CMD", "curl", "-f", "http://localhost"] + test: ["CMD", "curl", "-f", "http://localhost:8080/"] interval: 10s timeout: 5s retries: 3 @@ -304,7 +299,6 @@ services: mode: global env_file: - .env_agent - user: root privileged: true pid: "host" networks: @@ -334,7 +328,6 @@ services: memory: 256M env_file: - .env_java - user: root networks: zbx_net_backend: aliases: @@ -361,7 +354,6 @@ services: reservations: cpus: '0.25' memory: 128M - user: root networks: zbx_net_frontend: aliases: @@ -385,7 +377,6 @@ services: - MYSQL_USER - MYSQL_PASSWORD - MYSQL_ROOT_PASSWORD - user: root stop_grace_period: 1m networks: zbx_net_backend: @@ -403,7 +394,6 @@ services: secrets: - POSTGRES_USER - POSTGRES_PASSWORD - user: root stop_grace_period: 1m networks: zbx_net_backend: diff --git a/docker-compose_v3_alpine_pgsql_local.yaml b/docker-compose_v3_alpine_pgsql_local.yaml index 592d5c7ca..4dd23c3a5 100644 --- a/docker-compose_v3_alpine_pgsql_local.yaml +++ b/docker-compose_v3_alpine_pgsql_local.yaml @@ -40,7 +40,6 @@ services: secrets: - POSTGRES_USER - POSTGRES_PASSWORD - user: root depends_on: - postgres-server - zabbix-java-gateway @@ -104,7 +103,6 @@ services: env_file: - .env_prx - .env_prx_sqlite3 - user: root depends_on: - zabbix-java-gateway - zabbix-snmptraps @@ -164,7 +162,6 @@ services: - MYSQL_USER - MYSQL_PASSWORD - MYSQL_ROOT_PASSWORD - user: root depends_on: - mysql-server - zabbix-java-gateway @@ -192,8 +189,8 @@ services: - alpine:3.10 image: zabbix-web-apache-pgsql:alpine-local ports: - - "80:80" - - "443:443" + - "80:8080" + - "443:8443" links: - postgres-server:postgres-server - zabbix-server:zabbix-server @@ -215,12 +212,11 @@ services: secrets: - POSTGRES_USER - POSTGRES_PASSWORD - user: root depends_on: - postgres-server - zabbix-server healthcheck: - test: ["CMD", "curl", "-f", "http://localhost"] + test: ["CMD", "curl", "-f", "http://localhost:8080/"] interval: 10s timeout: 5s retries: 3 @@ -250,8 +246,8 @@ services: - alpine:3.10 image: zabbix-web-nginx-pgsql:alpine-local ports: - - "8081:80" - - "8443:443" + - "8081:8080" + - "8443:8443" links: - postgres-server:postgres-server - zabbix-server:zabbix-server @@ -273,12 +269,11 @@ services: secrets: - POSTGRES_USER - POSTGRES_PASSWORD - user: root depends_on: - postgres-server - zabbix-server healthcheck: - test: ["CMD", "curl", "-f", "http://localhost"] + test: ["CMD", "curl", "-f", "http://localhost:8080/"] interval: 10s timeout: 5s retries: 3 @@ -329,7 +324,6 @@ services: mode: global env_file: - .env_agent - user: root privileged: true pid: "host" networks: @@ -363,7 +357,6 @@ services: memory: 256M env_file: - .env_java - user: root networks: zbx_net_backend: aliases: @@ -394,7 +387,6 @@ services: reservations: cpus: '0.25' memory: 128M - user: root networks: zbx_net_frontend: aliases: @@ -418,7 +410,6 @@ services: - MYSQL_USER - MYSQL_PASSWORD - MYSQL_ROOT_PASSWORD - user: root stop_grace_period: 1m networks: zbx_net_backend: @@ -436,7 +427,6 @@ services: secrets: - POSTGRES_USER - POSTGRES_PASSWORD - user: root stop_grace_period: 1m networks: zbx_net_backend: diff --git a/snmptraps/alpine/conf/etc/supervisor/supervisord.conf b/snmptraps/alpine/conf/etc/supervisor/supervisord.conf index 925bb1838..a1abd35a0 100644 --- a/snmptraps/alpine/conf/etc/supervisor/supervisord.conf +++ b/snmptraps/alpine/conf/etc/supervisor/supervisord.conf @@ -1,17 +1,17 @@ ; supervisor config file [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) username = zbx password = password [supervisord] 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) critical = critical -user = root +;user = zabbix logfile_maxbytes = 0 logfile_backupcount = 0 loglevel = info @@ -23,7 +23,7 @@ loglevel = info supervisor.rpcinterface_factory = supervisor.rpcinterface:make_main_rpcinterface [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 ; 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] files = /etc/supervisor/conf.d/*.conf + diff --git a/web-apache-mysql/alpine/Dockerfile b/web-apache-mysql/alpine/Dockerfile index b2d32bd9d..b9de349cc 100644 --- a/web-apache-mysql/alpine/Dockerfile +++ b/web-apache-mysql/alpine/Dockerfile @@ -48,9 +48,10 @@ RUN set -eux && \ -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' \ + -e 's!^(\s*PidFile)\s+\S+!\1 "/tmp/httpd.pid"!g' \ "/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/* ARG MAJOR_VERSION=master @@ -89,7 +90,7 @@ RUN set -eux && \ build-dependencies && \ rm -rf /var/cache/apk/* -EXPOSE 80/TCP 443/TCP +EXPOSE 8080/TCP 8443/TCP WORKDIR /usr/share/zabbix diff --git a/web-apache-mysql/alpine/Dockerfile.orig b/web-apache-mysql/alpine/Dockerfile.orig new file mode 100644 index 000000000..b2d32bd9d --- /dev/null +++ b/web-apache-mysql/alpine/Dockerfile.orig @@ -0,0 +1,104 @@ +FROM alpine:3.11 + +LABEL org.opencontainers.image.title="Zabbix web-interface (Apache, MySQL)" \ + org.opencontainers.image.authors="Alexey Pustovalov " \ + 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"] diff --git a/web-apache-mysql/alpine/conf/etc/zabbix/apache.conf b/web-apache-mysql/alpine/conf/etc/zabbix/apache.conf index 2a5aedc30..36def0c29 100644 --- a/web-apache-mysql/alpine/conf/etc/zabbix/apache.conf +++ b/web-apache-mysql/alpine/conf/etc/zabbix/apache.conf @@ -1,4 +1,4 @@ - + DocumentRoot /usr/share/zabbix/ ServerName zabbix DirectoryIndex index.php diff --git a/web-apache-mysql/alpine/conf/etc/zabbix/apache_ssl.conf b/web-apache-mysql/alpine/conf/etc/zabbix/apache_ssl.conf index 74fd226b5..63005b0e1 100644 --- a/web-apache-mysql/alpine/conf/etc/zabbix/apache_ssl.conf +++ b/web-apache-mysql/alpine/conf/etc/zabbix/apache_ssl.conf @@ -1,10 +1,10 @@ LoadModule ssl_module modules/mod_ssl.so LoadModule socache_shmcb_module modules/mod_socache_shmcb.so -Listen 443 +Listen 8443 - + SSLEngine on DocumentRoot /usr/share/zabbix/ diff --git a/web-nginx-mysql/alpine/Dockerfile b/web-nginx-mysql/alpine/Dockerfile index 17875bbb5..6e9329891 100644 --- a/web-nginx-mysql/alpine/Dockerfile +++ b/web-nginx-mysql/alpine/Dockerfile @@ -41,6 +41,7 @@ RUN set -eux && \ php7-xmlreader \ php7-xmlwriter \ supervisor && \ + rm -rf /etc/php7/php-fpm.d/www.conf && \ rm -f /etc/nginx/conf.d/*.conf && \ rm -rf /var/cache/apk/* @@ -77,11 +78,14 @@ RUN set -eux && \ chown --quiet -R zabbix:root /etc/nginx/ /etc/php7/ && \ chgrp -R 0 /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 \ build-dependencies && \ rm -rf /var/cache/apk/* -EXPOSE 80/TCP 443/TCP +EXPOSE 8080/TCP 8443/TCP WORKDIR /usr/share/zabbix diff --git a/web-nginx-mysql/alpine/conf/etc/nginx/nginx.conf b/web-nginx-mysql/alpine/conf/etc/nginx/nginx.conf index c8e600ce8..98bd9afaa 100644 --- a/web-nginx-mysql/alpine/conf/etc/nginx/nginx.conf +++ b/web-nginx-mysql/alpine/conf/etc/nginx/nginx.conf @@ -1,10 +1,10 @@ -user zabbix; +#user nginx; worker_processes 5; worker_rlimit_nofile 256000; error_log /dev/fd/2 warn; -pid /var/run/nginx.pid; +pid /tmp/nginx.pid; events { worker_connections 5120; diff --git a/web-nginx-mysql/alpine/conf/etc/php7/php-fpm.conf b/web-nginx-mysql/alpine/conf/etc/php7/php-fpm.conf index c74b529fe..b88fd8295 100644 --- a/web-nginx-mysql/alpine/conf/etc/php7/php-fpm.conf +++ b/web-nginx-mysql/alpine/conf/etc/php7/php-fpm.conf @@ -12,7 +12,6 @@ ; Relative path can also be used. They will be prefixed by: ; - the global prefix if it's been set (-p argument) ; - /usr otherwise -include = /etc/php7/php-fpm.d/*.conf ;;;;;;;;;;;;;;;;;; ; Global Options ; @@ -29,7 +28,7 @@ include = /etc/php7/php-fpm.d/*.conf ; in a local file. ; Note: the default prefix is /var ; 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 ; 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. ; Default Values: user and group are set as the running user ; mode is set to 0660 -listen.owner = nginx -listen.group = nginx +;listen.owner = nginx +;listen.group = nginx ;listen.mode = 0660 ; When POSIX Access Control Lists are supported you can set them using ; these options, value is a comma separated list of user/group names. diff --git a/web-nginx-mysql/alpine/conf/etc/zabbix/nginx.conf b/web-nginx-mysql/alpine/conf/etc/zabbix/nginx.conf index e057f03cf..62c9be112 100644 --- a/web-nginx-mysql/alpine/conf/etc/zabbix/nginx.conf +++ b/web-nginx-mysql/alpine/conf/etc/zabbix/nginx.conf @@ -1,5 +1,5 @@ server { - listen 80; + listen 8080; server_name zabbix; index index.php; diff --git a/web-nginx-mysql/alpine/docker-entrypoint.sh b/web-nginx-mysql/alpine/docker-entrypoint.sh index ec4720a32..692e50af9 100755 --- a/web-nginx-mysql/alpine/docker-entrypoint.sh +++ b/web-nginx-mysql/alpine/docker-entrypoint.sh @@ -1,6 +1,6 @@ #!/bin/bash -set -eo pipefail +set -o pipefail set +e @@ -190,7 +190,7 @@ check_variables_mysql() { fi } -check_db_connect_mysql() { +check_db_connect() { echo "********************" echo "* DB_SERVER_HOST: ${DB_SERVER_HOST}" echo "* DB_SERVER_PORT: ${DB_SERVER_PORT}" @@ -215,10 +215,9 @@ check_db_connect_mysql() { done } -prepare_web_server_nginx() { +prepare_web_server() { NGINX_CONFD_DIR="/etc/nginx/conf.d" NGINX_SSL_CONFIG="/etc/ssl/nginx" - PHP_SESSIONS_DIR="/var/lib/php5" echo "** Adding Zabbix virtual host (HTTP)" 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." fi - if [ -d "/var/log/nginx/" ]; then - ln -sf /dev/fd/2 /var/log/nginx/error.log - fi - - ln -sf /dev/fd/2 /var/log/php5-fpm.log - ln -sf /dev/fd/2 /var/log/php7.2-fpm.log + ln -sf /dev/fd/2 /var/log/nginx/error.log + ln -sf /dev/fd/1 /var/log/php-fpm.log } clear_deploy() { @@ -263,37 +258,14 @@ prepare_zbx_web_config() { 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" - 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 + PHP_CONFIG_FILE="/etc/php7/conf.d/99-zabbix.ini" - if [ -n "$PHP_CONFIG_FILE" ]; then - 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" "post_max_size" "${ZBX_POSTMAXSIZE:-"16M"}" - 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" "date.timezone" "${PHP_TZ}" - else - echo "**** Zabbix related PHP configuration file not found" - fi + 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" "post_max_size" "${ZBX_POSTMAXSIZE:-"16M"}" + 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" "date.timezone" "${PHP_TZ}" # Escaping characters in parameter value 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_NAME}/$server_name/g" \ "$ZBX_WEB_CONFIG" - - [ "$db_type" = "postgresql" ] && sed -i "s/MYSQL/POSTGRESQL/g" "$ZBX_WEB_CONFIG" } prepare_web() {