extern/zabbix-docker
1
0
Fork 0
mirror of https://github.com/zabbix/zabbix-docker.git synced 2025-08-09 00:24:58 +02:00
Code Issues Packages Projects Releases Wiki Activity

Updated Alpine from 3.12 to 3.14

Browse Source
This commit is contained in:
Alexey Pustovalov
2021-11-30 18:46:39 +02:00
parent 985fb47c2b
commit e733cb40ca
19 changed files with 42 additions and 69 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Dockerfiles/web-nginx-mysql/alpine/Dockerfile
View File

@ -5,7 +5,7 @@ ARG BUILD_BASE_IMAGE=zabbix-build-mysql:alpine-${ZBX_VERSION}
FROM ${BUILD_BASE_IMAGE} as builder
FROM alpine:3.12
FROM alpine:3.14
ARG MAJOR_VERSION
ARG ZBX_VERSION
@ -80,7 +80,7 @@ RUN set -eux && \
mkdir -p /etc/zabbix/web/certs && \
mkdir -p /var/lib/php/session && \
rm -rf /etc/php7/php-fpm.d/www.conf && \
rm -f /etc/nginx/conf.d/*.conf && \
rm -f /etc/nginx/http.d/*.conf && \
ln -sf /dev/fd/2 /var/lib/nginx/logs/error.log && \
cd /usr/share/zabbix/ && \
rm -f conf/zabbix.conf.php conf/maintenance.inc.php conf/zabbix.conf.php.example && \

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

@ -67,5 +67,5 @@ http {
index index.php;
server_tokens off;
include /etc/nginx/conf.d/*.conf;
include /etc/nginx/http.d/*.conf;
}

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

@ -146,7 +146,7 @@ check_db_connect() {
}
prepare_web_server() {
NGINX_CONFD_DIR="/etc/nginx/conf.d"
NGINX_CONFD_DIR="/etc/nginx/http.d"
NGINX_SSL_CONFIG="/etc/ssl/nginx"
echo "** Adding Zabbix virtual host (HTTP)"