From aee978c65013f4fbaa95daae78ccaa3a2d956005 Mon Sep 17 00:00:00 2001 From: Alexey Pustovalov Date: Mon, 29 Nov 2021 16:08:26 +0200 Subject: [PATCH] Updated Alpine Linux to 3.15 version --- Dockerfiles/agent/alpine/Dockerfile | 2 +- Dockerfiles/agent2/alpine/Dockerfile | 2 +- Dockerfiles/build-base/alpine/Dockerfile | 2 +- Dockerfiles/java-gateway/alpine/Dockerfile | 2 +- Dockerfiles/proxy-mysql/alpine/Dockerfile | 2 +- Dockerfiles/proxy-sqlite3/alpine/Dockerfile | 2 +- Dockerfiles/server-mysql/alpine/Dockerfile | 2 +- Dockerfiles/server-pgsql/alpine/Dockerfile | 2 +- Dockerfiles/snmptraps/alpine/Dockerfile | 2 +- .../web-apache-mysql/alpine/Dockerfile | 2 +- .../web-apache-pgsql/alpine/Dockerfile | 2 +- Dockerfiles/web-nginx-mysql/alpine/Dockerfile | 2 +- Dockerfiles/web-nginx-pgsql/alpine/Dockerfile | 2 +- Dockerfiles/web-service/alpine/Dockerfile | 2 +- docker-compose_v3_alpine_mysql_local.yaml | 24 ++++++++--------- docker-compose_v3_alpine_pgsql_local.yaml | 26 +++++++++---------- 16 files changed, 39 insertions(+), 39 deletions(-) diff --git a/Dockerfiles/agent/alpine/Dockerfile b/Dockerfiles/agent/alpine/Dockerfile index 5628c50d8..59004bcb4 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.14 +FROM alpine:3.15 ARG MAJOR_VERSION ARG ZBX_VERSION diff --git a/Dockerfiles/agent2/alpine/Dockerfile b/Dockerfiles/agent2/alpine/Dockerfile index 0c438e006..bddb6a443 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.14 +FROM alpine:3.15 ARG MAJOR_VERSION ARG ZBX_VERSION diff --git a/Dockerfiles/build-base/alpine/Dockerfile b/Dockerfiles/build-base/alpine/Dockerfile index ee8388394..676ee598d 100644 --- a/Dockerfiles/build-base/alpine/Dockerfile +++ b/Dockerfiles/build-base/alpine/Dockerfile @@ -1,5 +1,5 @@ # syntax=docker/dockerfile:1 -FROM alpine:3.14 +FROM alpine:3.15 ARG MAJOR_VERSION=6.0 ARG ZBX_VERSION=${MAJOR_VERSION} diff --git a/Dockerfiles/java-gateway/alpine/Dockerfile b/Dockerfiles/java-gateway/alpine/Dockerfile index db20b02c1..1b6167ad0 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.14 +FROM alpine:3.15 ARG MAJOR_VERSION ARG ZBX_VERSION diff --git a/Dockerfiles/proxy-mysql/alpine/Dockerfile b/Dockerfiles/proxy-mysql/alpine/Dockerfile index c52232049..bd41d37d6 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.14 +FROM alpine:3.15 ARG MAJOR_VERSION ARG ZBX_VERSION diff --git a/Dockerfiles/proxy-sqlite3/alpine/Dockerfile b/Dockerfiles/proxy-sqlite3/alpine/Dockerfile index e463cf623..f35823d01 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.14 +FROM alpine:3.15 ARG MAJOR_VERSION ARG ZBX_VERSION diff --git a/Dockerfiles/server-mysql/alpine/Dockerfile b/Dockerfiles/server-mysql/alpine/Dockerfile index 57bc0990d..392e4445b 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.14 +FROM alpine:3.15 ARG MAJOR_VERSION ARG ZBX_VERSION diff --git a/Dockerfiles/server-pgsql/alpine/Dockerfile b/Dockerfiles/server-pgsql/alpine/Dockerfile index 9184c08d5..c92b6909c 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.14 +FROM alpine:3.15 ARG MAJOR_VERSION ARG ZBX_VERSION diff --git a/Dockerfiles/snmptraps/alpine/Dockerfile b/Dockerfiles/snmptraps/alpine/Dockerfile index e5991fc56..58304cc98 100644 --- a/Dockerfiles/snmptraps/alpine/Dockerfile +++ b/Dockerfiles/snmptraps/alpine/Dockerfile @@ -1,4 +1,4 @@ -FROM alpine:3.14 +FROM alpine:3.15 ARG MAJOR_VERSION=6.0 ARG ZBX_VERSION=${MAJOR_VERSION} diff --git a/Dockerfiles/web-apache-mysql/alpine/Dockerfile b/Dockerfiles/web-apache-mysql/alpine/Dockerfile index 5718bcb6b..5258ce580 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.14 +FROM alpine:3.15 ARG MAJOR_VERSION ARG ZBX_VERSION diff --git a/Dockerfiles/web-apache-pgsql/alpine/Dockerfile b/Dockerfiles/web-apache-pgsql/alpine/Dockerfile index d857570df..a66455d1c 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.14 +FROM alpine:3.15 ARG MAJOR_VERSION ARG ZBX_VERSION diff --git a/Dockerfiles/web-nginx-mysql/alpine/Dockerfile b/Dockerfiles/web-nginx-mysql/alpine/Dockerfile index 5a3165b13..023218181 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.14 +FROM alpine:3.15 ARG MAJOR_VERSION ARG ZBX_VERSION diff --git a/Dockerfiles/web-nginx-pgsql/alpine/Dockerfile b/Dockerfiles/web-nginx-pgsql/alpine/Dockerfile index d7dfe10da..184d14181 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.14 +FROM alpine:3.15 ARG MAJOR_VERSION ARG ZBX_VERSION diff --git a/Dockerfiles/web-service/alpine/Dockerfile b/Dockerfiles/web-service/alpine/Dockerfile index 8b610b53b..0d4242e2f 100644 --- a/Dockerfiles/web-service/alpine/Dockerfile +++ b/Dockerfiles/web-service/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.14 +FROM alpine:3.15 ARG MAJOR_VERSION ARG ZBX_VERSION diff --git a/docker-compose_v3_alpine_mysql_local.yaml b/docker-compose_v3_alpine_mysql_local.yaml index b1fd188c9..dbc53a1a2 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.14 + - alpine:3.15 image: zabbix-build-base:alpine-local zabbix-build-mysql: build: context: ./Dockerfiles/build-mysql/alpine cache_from: - - alpine:3.14 + - alpine:3.15 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.14 + - alpine:3.15 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.14 + - alpine:3.15 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.14 + - alpine:3.15 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.14 + - alpine:3.15 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.14 + - alpine:3.15 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.14 + - alpine:3.15 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.14 + - alpine:3.15 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.14 + - alpine:3.15 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.14 + - alpine:3.15 image: zabbix-snmptraps:alpine-local profiles: - full @@ -470,7 +470,7 @@ services: build: context: ./Dockerfiles/web-service/alpine cache_from: - - alpine:3.14 + - alpine:3.15 args: BUILD_BASE_IMAGE: zabbix-build-mysql:alpine-local image: zabbix-web-service:alpine-local diff --git a/docker-compose_v3_alpine_pgsql_local.yaml b/docker-compose_v3_alpine_pgsql_local.yaml index 4bb23ae24..44bd9cbda 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.14 + - alpine:3.15 image: zabbix-build-base:alpine-local zabbix-build-pgsql: build: context: ./Dockerfiles/build-pgsql/alpine cache_from: - - alpine:3.14 + - alpine:3.15 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.14 + - alpine:3.15 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.14 + - alpine:3.15 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.14 + - alpine:3.15 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.14 + - alpine:3.15 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.14 + - alpine:3.15 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.14 + - alpine:3.15 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.14 + - alpine:3.15 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.14 + - alpine:3.15 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.14 + - alpine:3.15 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.14 + - alpine:3.15 image: zabbix-snmptraps:alpine-local profiles: - full @@ -477,7 +477,7 @@ services: build: context: ./Dockerfiles/web-service/alpine cache_from: - - alpine:3.14 + - alpine:3.15 args: BUILD_BASE_IMAGE: zabbix-build-pgsql:alpine-local image: zabbix-web-service:alpine-local