diff --git a/Dockerfiles/agent/alpine/Dockerfile b/Dockerfiles/agent/alpine/Dockerfile index 2546e4f6d..51d1ade31 100644 --- a/Dockerfiles/agent/alpine/Dockerfile +++ b/Dockerfiles/agent/alpine/Dockerfile @@ -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 diff --git a/Dockerfiles/agent2/alpine/Dockerfile b/Dockerfiles/agent2/alpine/Dockerfile index 149190d91..f6861bbe9 100644 --- a/Dockerfiles/agent2/alpine/Dockerfile +++ b/Dockerfiles/agent2/alpine/Dockerfile @@ -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 diff --git a/Dockerfiles/build-base/alpine/Dockerfile b/Dockerfiles/build-base/alpine/Dockerfile index 4a7f5485d..2963f740f 100644 --- a/Dockerfiles/build-base/alpine/Dockerfile +++ b/Dockerfiles/build-base/alpine/Dockerfile @@ -1,5 +1,5 @@ # syntax=docker/dockerfile:1 -FROM alpine:3.12 +FROM alpine:3.14 ARG MAJOR_VERSION=5.0 ARG ZBX_VERSION=${MAJOR_VERSION}.18 @@ -48,30 +48,3 @@ RUN set -eux && \ --clean-protected \ ${INSTALL_PKGS} && \ rm -rf /var/cache/apk/* - -ARG GOLANG_VERSION=1.17.2 -ENV PATH=/usr/local/go/bin:$PATH - -RUN set -eux && \ - apk add --no-cache musl-dev \ - openssl-dev \ - gnupg \ - ca-certificates && \ - update-ca-certificates && \ - url='https://dl.google.com/go/go1.17.2.src.tar.gz' && \ - sha256='2255eb3e4e824dd7d5fcdc2e7f84534371c186312e546fb1086a34c17752f431' && \ - wget -O go.tgz.asc "$url.asc" && \ - wget -O go.tgz "$url" && \ - echo "$sha256 *go.tgz" | sha256sum -c - && \ - GNUPGHOME="$(mktemp -d)"; export GNUPGHOME && \ - gpg --batch --keyserver keyserver.ubuntu.com --recv-keys 'EB4C 1BFD 4F04 2F6D DDCC EC91 7721 F63B D38B 4796' && \ - gpg --batch --verify go.tgz.asc go.tgz && \ - gpgconf --kill all && \ - rm -rf "$GNUPGHOME" go.tgz.asc && \ - tar -C /usr/local -xzf go.tgz && \ - rm go.tgz && \ - cd /usr/local/go/src && \ - export GOROOT_BOOTSTRAP="$(go env GOROOT)" && \ - ./make.bash && \ - apk del go && \ - rm -rf /var/cache/apk/* diff --git a/Dockerfiles/java-gateway/alpine/Dockerfile b/Dockerfiles/java-gateway/alpine/Dockerfile index 193d50e4e..855e09210 100644 --- a/Dockerfiles/java-gateway/alpine/Dockerfile +++ b/Dockerfiles/java-gateway/alpine/Dockerfile @@ -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 diff --git a/Dockerfiles/proxy-mysql/alpine/Dockerfile b/Dockerfiles/proxy-mysql/alpine/Dockerfile index 1a3cab89d..4a398ae48 100644 --- a/Dockerfiles/proxy-mysql/alpine/Dockerfile +++ b/Dockerfiles/proxy-mysql/alpine/Dockerfile @@ -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 diff --git a/Dockerfiles/proxy-sqlite3/alpine/Dockerfile b/Dockerfiles/proxy-sqlite3/alpine/Dockerfile index 5282554ae..738d4e38d 100644 --- a/Dockerfiles/proxy-sqlite3/alpine/Dockerfile +++ b/Dockerfiles/proxy-sqlite3/alpine/Dockerfile @@ -5,7 +5,7 @@ ARG BUILD_BASE_IMAGE=zabbix-build-sqlite3:alpine-${ZBX_VERSION} FROM ${BUILD_BASE_IMAGE} as builder -FROM alpine:3.12 +FROM alpine:3.14 ARG MAJOR_VERSION ARG ZBX_VERSION diff --git a/Dockerfiles/server-mysql/alpine/Dockerfile b/Dockerfiles/server-mysql/alpine/Dockerfile index fa483b7e1..34b2887fe 100644 --- a/Dockerfiles/server-mysql/alpine/Dockerfile +++ b/Dockerfiles/server-mysql/alpine/Dockerfile @@ -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 diff --git a/Dockerfiles/server-pgsql/alpine/Dockerfile b/Dockerfiles/server-pgsql/alpine/Dockerfile index 2f9dc54db..3e2c89a5b 100644 --- a/Dockerfiles/server-pgsql/alpine/Dockerfile +++ b/Dockerfiles/server-pgsql/alpine/Dockerfile @@ -5,7 +5,7 @@ ARG BUILD_BASE_IMAGE=zabbix-build-pgsql:alpine-${ZBX_VERSION} FROM ${BUILD_BASE_IMAGE} as builder -FROM alpine:3.12 +FROM alpine:3.14 ARG MAJOR_VERSION ARG ZBX_VERSION diff --git a/Dockerfiles/snmptraps/alpine/Dockerfile b/Dockerfiles/snmptraps/alpine/Dockerfile index 96a0cbce9..3988b4770 100644 --- a/Dockerfiles/snmptraps/alpine/Dockerfile +++ b/Dockerfiles/snmptraps/alpine/Dockerfile @@ -1,4 +1,4 @@ -FROM alpine:3.12 +FROM alpine:3.14 ARG MAJOR_VERSION=5.0 ARG ZBX_VERSION=${MAJOR_VERSION}.18 diff --git a/Dockerfiles/web-apache-mysql/alpine/Dockerfile b/Dockerfiles/web-apache-mysql/alpine/Dockerfile index 518b98084..ad720eaad 100644 --- a/Dockerfiles/web-apache-mysql/alpine/Dockerfile +++ b/Dockerfiles/web-apache-mysql/alpine/Dockerfile @@ -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 diff --git a/Dockerfiles/web-apache-pgsql/alpine/Dockerfile b/Dockerfiles/web-apache-pgsql/alpine/Dockerfile index 7be213022..5f0a27bb4 100644 --- a/Dockerfiles/web-apache-pgsql/alpine/Dockerfile +++ b/Dockerfiles/web-apache-pgsql/alpine/Dockerfile @@ -5,7 +5,7 @@ ARG BUILD_BASE_IMAGE=zabbix-build-pgsql:alpine-${ZBX_VERSION} FROM ${BUILD_BASE_IMAGE} as builder -FROM alpine:3.12 +FROM alpine:3.14 ARG MAJOR_VERSION ARG ZBX_VERSION diff --git a/Dockerfiles/web-nginx-mysql/alpine/Dockerfile b/Dockerfiles/web-nginx-mysql/alpine/Dockerfile index d23ad3fa8..06194b36c 100644 --- a/Dockerfiles/web-nginx-mysql/alpine/Dockerfile +++ b/Dockerfiles/web-nginx-mysql/alpine/Dockerfile @@ -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 && \ diff --git a/Dockerfiles/web-nginx-mysql/alpine/conf/etc/nginx/nginx.conf b/Dockerfiles/web-nginx-mysql/alpine/conf/etc/nginx/nginx.conf index 3bed3cf89..770522adf 100644 --- a/Dockerfiles/web-nginx-mysql/alpine/conf/etc/nginx/nginx.conf +++ b/Dockerfiles/web-nginx-mysql/alpine/conf/etc/nginx/nginx.conf @@ -67,5 +67,5 @@ http { index index.php; server_tokens off; - include /etc/nginx/conf.d/*.conf; + include /etc/nginx/http.d/*.conf; } diff --git a/Dockerfiles/web-nginx-mysql/alpine/docker-entrypoint.sh b/Dockerfiles/web-nginx-mysql/alpine/docker-entrypoint.sh index dae6e35b1..a3e1f22d6 100755 --- a/Dockerfiles/web-nginx-mysql/alpine/docker-entrypoint.sh +++ b/Dockerfiles/web-nginx-mysql/alpine/docker-entrypoint.sh @@ -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)" diff --git a/Dockerfiles/web-nginx-pgsql/alpine/Dockerfile b/Dockerfiles/web-nginx-pgsql/alpine/Dockerfile index 38965846e..b65a2dc31 100644 --- a/Dockerfiles/web-nginx-pgsql/alpine/Dockerfile +++ b/Dockerfiles/web-nginx-pgsql/alpine/Dockerfile @@ -5,7 +5,7 @@ ARG BUILD_BASE_IMAGE=zabbix-build-pgsql:alpine-${ZBX_VERSION} FROM ${BUILD_BASE_IMAGE} as builder -FROM alpine:3.12 +FROM alpine:3.14 ARG MAJOR_VERSION ARG ZBX_VERSION @@ -79,7 +79,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 && \ diff --git a/Dockerfiles/web-nginx-pgsql/alpine/conf/etc/nginx/nginx.conf b/Dockerfiles/web-nginx-pgsql/alpine/conf/etc/nginx/nginx.conf index 3bed3cf89..770522adf 100644 --- a/Dockerfiles/web-nginx-pgsql/alpine/conf/etc/nginx/nginx.conf +++ b/Dockerfiles/web-nginx-pgsql/alpine/conf/etc/nginx/nginx.conf @@ -67,5 +67,5 @@ http { index index.php; server_tokens off; - include /etc/nginx/conf.d/*.conf; + include /etc/nginx/http.d/*.conf; } diff --git a/Dockerfiles/web-nginx-pgsql/alpine/docker-entrypoint.sh b/Dockerfiles/web-nginx-pgsql/alpine/docker-entrypoint.sh index c1d43b4e2..ea686a03b 100755 --- a/Dockerfiles/web-nginx-pgsql/alpine/docker-entrypoint.sh +++ b/Dockerfiles/web-nginx-pgsql/alpine/docker-entrypoint.sh @@ -132,7 +132,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)" diff --git a/docker-compose_v3_alpine_mysql_local.yaml b/docker-compose_v3_alpine_mysql_local.yaml index a782bb9f7..5450f7f25 100644 --- a/docker-compose_v3_alpine_mysql_local.yaml +++ b/docker-compose_v3_alpine_mysql_local.yaml @@ -4,14 +4,14 @@ services: build: context: ./Dockerfiles/build-base/alpine cache_from: - - alpine:3.12 + - alpine:3.14 image: zabbix-build-base:alpine-local zabbix-build-mysql: build: context: ./Dockerfiles/build-mysql/alpine cache_from: - - alpine:3.12 + - alpine:3.14 args: BUILD_BASE_IMAGE: zabbix-build-base:alpine-local image: zabbix-build-mysql:alpine-local @@ -22,7 +22,7 @@ services: build: context: ./Dockerfiles/build-sqlite3/alpine cache_from: - - alpine:3.12 + - alpine:3.14 args: BUILD_BASE_IMAGE: zabbix-build-base:alpine-local image: zabbix-build-sqlite3:alpine-local @@ -35,7 +35,7 @@ services: build: context: ./Dockerfiles/server-mysql/alpine cache_from: - - alpine:3.12 + - alpine:3.14 args: BUILD_BASE_IMAGE: zabbix-build-mysql:alpine-local image: zabbix-server-mysql:alpine-local @@ -105,7 +105,7 @@ services: build: context: ./Dockerfiles/proxy-sqlite3/alpine cache_from: - - alpine:3.12 + - alpine:3.14 args: BUILD_BASE_IMAGE: zabbix-build-sqlite3:alpine-local image: zabbix-proxy-sqlite3:alpine-local @@ -161,7 +161,7 @@ services: build: context: ./Dockerfiles/proxy-mysql/alpine cache_from: - - alpine:3.12 + - alpine:3.14 args: BUILD_BASE_IMAGE: zabbix-build-mysql:alpine-local image: zabbix-proxy-mysql:alpine-local @@ -226,7 +226,7 @@ services: build: context: ./Dockerfiles/web-apache-mysql/alpine cache_from: - - alpine:3.12 + - alpine:3.14 args: BUILD_BASE_IMAGE: zabbix-build-mysql:alpine-local image: zabbix-web-apache-mysql:alpine-local @@ -289,7 +289,7 @@ services: build: context: ./Dockerfiles/web-nginx-mysql/alpine cache_from: - - alpine:3.12 + - alpine:3.14 args: BUILD_BASE_IMAGE: zabbix-build-mysql:alpine-local image: zabbix-web-nginx-mysql:alpine-local @@ -350,7 +350,7 @@ services: build: context: ./Dockerfiles/agent/alpine cache_from: - - alpine:3.12 + - alpine:3.14 args: BUILD_BASE_IMAGE: zabbix-build-mysql:alpine-local image: zabbix-agent:alpine-local @@ -400,7 +400,7 @@ services: build: context: ./Dockerfiles/java-gateway/alpine cache_from: - - alpine:3.12 + - alpine:3.14 args: BUILD_BASE_IMAGE: zabbix-build-mysql:alpine-local image: zabbix-java-gateway:alpine-local @@ -437,7 +437,7 @@ services: build: context: ./Dockerfiles/snmptraps/alpine cache_from: - - alpine:3.12 + - alpine:3.14 image: zabbix-snmptraps:alpine-local profiles: - full diff --git a/docker-compose_v3_alpine_pgsql_local.yaml b/docker-compose_v3_alpine_pgsql_local.yaml index b661ad3a3..c6b4c26b8 100644 --- a/docker-compose_v3_alpine_pgsql_local.yaml +++ b/docker-compose_v3_alpine_pgsql_local.yaml @@ -4,14 +4,14 @@ services: build: context: ./Dockerfiles/build-base/alpine cache_from: - - alpine:3.12 + - alpine:3.14 image: zabbix-build-base:alpine-local zabbix-build-pgsql: build: context: ./Dockerfiles/build-pgsql/alpine cache_from: - - alpine:3.12 + - alpine:3.14 args: BUILD_BASE_IMAGE: zabbix-build-base:alpine-local image: zabbix-build-pgsql:alpine-local @@ -22,7 +22,7 @@ services: build: context: ./Dockerfiles/build-mysql/alpine cache_from: - - alpine:3.12 + - alpine:3.14 args: BUILD_BASE_IMAGE: zabbix-build-base:alpine-local image: zabbix-build-mysql:alpine-local @@ -35,7 +35,7 @@ services: build: context: ./Dockerfiles/build-sqlite3/alpine cache_from: - - alpine:3.12 + - alpine:3.14 args: BUILD_BASE_IMAGE: zabbix-build-base:alpine-local image: zabbix-build-sqlite3:alpine-local @@ -48,7 +48,7 @@ services: build: context: ./Dockerfiles/server-pgsql/alpine cache_from: - - alpine:3.12 + - alpine:3.14 args: BUILD_BASE_IMAGE: zabbix-build-pgsql:alpine-local image: zabbix-server-pgsql:alpine-local @@ -117,7 +117,7 @@ services: build: context: ./Dockerfiles/proxy-sqlite3/alpine cache_from: - - alpine:3.12 + - alpine:3.14 args: BUILD_BASE_IMAGE: zabbix-build-sqlite3:alpine-local image: zabbix-proxy-sqlite3:alpine-local @@ -173,7 +173,7 @@ services: build: context: ./Dockerfiles/proxy-mysql/alpine cache_from: - - alpine:3.12 + - alpine:3.14 args: BUILD_BASE_IMAGE: zabbix-build-mysql:alpine-local image: zabbix-proxy-mysql:alpine-local @@ -235,7 +235,7 @@ services: build: context: ./Dockerfiles/web-apache-pgsql/alpine cache_from: - - alpine:3.12 + - alpine:3.14 args: BUILD_BASE_IMAGE: zabbix-build-pgsql:alpine-local image: zabbix-web-apache-pgsql:alpine-local @@ -298,7 +298,7 @@ services: build: context: ./Dockerfiles/web-nginx-pgsql/alpine cache_from: - - alpine:3.12 + - alpine:3.14 args: BUILD_BASE_IMAGE: zabbix-build-pgsql:alpine-local image: zabbix-web-nginx-pgsql:alpine-local @@ -359,7 +359,7 @@ services: build: context: ./Dockerfiles/agent/alpine cache_from: - - alpine:3.12 + - alpine:3.14 args: BUILD_BASE_IMAGE: zabbix-build-pgsql:alpine-local image: zabbix-agent:alpine-local @@ -407,7 +407,7 @@ services: build: context: ./Dockerfiles/java-gateway/alpine cache_from: - - alpine:3.12 + - alpine:3.14 args: BUILD_BASE_IMAGE: zabbix-build-pgsql:alpine-local image: zabbix-java-gateway:alpine-local @@ -444,7 +444,7 @@ services: build: context: ./Dockerfiles/snmptraps/alpine cache_from: - - alpine:3.12 + - alpine:3.14 image: zabbix-snmptraps:alpine-local profiles: - full