From 3de2a40b49f61f0a411d280ee2685688604c1139 Mon Sep 17 00:00:00 2001 From: Alexey Pustovalov Date: Tue, 31 May 2022 18:38:40 +0300 Subject: [PATCH] Updated Alpine to 3.16 --- 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 e171ae037..760d075a1 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.15 +FROM alpine:3.16 ARG MAJOR_VERSION ARG ZBX_VERSION diff --git a/Dockerfiles/agent2/alpine/Dockerfile b/Dockerfiles/agent2/alpine/Dockerfile index b3cb8a0fe..242a91868 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.15 +FROM alpine:3.16 ARG MAJOR_VERSION ARG ZBX_VERSION diff --git a/Dockerfiles/build-base/alpine/Dockerfile b/Dockerfiles/build-base/alpine/Dockerfile index 67b851f59..7df641e82 100644 --- a/Dockerfiles/build-base/alpine/Dockerfile +++ b/Dockerfiles/build-base/alpine/Dockerfile @@ -1,5 +1,5 @@ # syntax=docker/dockerfile:1 -FROM alpine:3.15 +FROM alpine:3.16 ARG MAJOR_VERSION=6.2 ARG ZBX_VERSION=${MAJOR_VERSION} diff --git a/Dockerfiles/java-gateway/alpine/Dockerfile b/Dockerfiles/java-gateway/alpine/Dockerfile index 59584c258..81b2dea79 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.15 +FROM alpine:3.16 ARG MAJOR_VERSION ARG ZBX_VERSION diff --git a/Dockerfiles/proxy-mysql/alpine/Dockerfile b/Dockerfiles/proxy-mysql/alpine/Dockerfile index 4be0ca2fd..cd967e391 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.15 +FROM alpine:3.16 ARG MAJOR_VERSION ARG ZBX_VERSION diff --git a/Dockerfiles/proxy-sqlite3/alpine/Dockerfile b/Dockerfiles/proxy-sqlite3/alpine/Dockerfile index 5276440d7..71f358859 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.15 +FROM alpine:3.16 ARG MAJOR_VERSION ARG ZBX_VERSION diff --git a/Dockerfiles/server-mysql/alpine/Dockerfile b/Dockerfiles/server-mysql/alpine/Dockerfile index 0ac7f4baa..cb1e6ea9d 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.15 +FROM alpine:3.16 ARG MAJOR_VERSION ARG ZBX_VERSION diff --git a/Dockerfiles/server-pgsql/alpine/Dockerfile b/Dockerfiles/server-pgsql/alpine/Dockerfile index df5434725..784c700b4 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.15 +FROM alpine:3.16 ARG MAJOR_VERSION ARG ZBX_VERSION diff --git a/Dockerfiles/snmptraps/alpine/Dockerfile b/Dockerfiles/snmptraps/alpine/Dockerfile index 9abe29439..eaa24b014 100644 --- a/Dockerfiles/snmptraps/alpine/Dockerfile +++ b/Dockerfiles/snmptraps/alpine/Dockerfile @@ -1,4 +1,4 @@ -FROM alpine:3.15 +FROM alpine:3.16 ARG MAJOR_VERSION=6.2 ARG ZBX_VERSION=${MAJOR_VERSION} diff --git a/Dockerfiles/web-apache-mysql/alpine/Dockerfile b/Dockerfiles/web-apache-mysql/alpine/Dockerfile index b771f454c..b9dc55964 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.15 +FROM alpine:3.16 ARG MAJOR_VERSION ARG ZBX_VERSION diff --git a/Dockerfiles/web-apache-pgsql/alpine/Dockerfile b/Dockerfiles/web-apache-pgsql/alpine/Dockerfile index 1296a5bf8..d463db9a2 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.15 +FROM alpine:3.16 ARG MAJOR_VERSION ARG ZBX_VERSION diff --git a/Dockerfiles/web-nginx-mysql/alpine/Dockerfile b/Dockerfiles/web-nginx-mysql/alpine/Dockerfile index 44fcba5d0..6bde27949 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.15 +FROM alpine:3.16 ARG MAJOR_VERSION ARG ZBX_VERSION diff --git a/Dockerfiles/web-nginx-pgsql/alpine/Dockerfile b/Dockerfiles/web-nginx-pgsql/alpine/Dockerfile index 02b213d0b..0ae6316f6 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.15 +FROM alpine:3.16 ARG MAJOR_VERSION ARG ZBX_VERSION diff --git a/Dockerfiles/web-service/alpine/Dockerfile b/Dockerfiles/web-service/alpine/Dockerfile index 2d40d3f97..52f68c8c5 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.15 +FROM alpine:3.16 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 2556a09c7..58762ae1a 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.15 + - alpine:3.16 image: zabbix-build-base:alpine-local zabbix-build-mysql: build: context: ./Dockerfiles/build-mysql/alpine cache_from: - - alpine:3.15 + - alpine:3.16 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.15 + - alpine:3.16 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.15 + - alpine:3.16 args: BUILD_BASE_IMAGE: zabbix-build-mysql:alpine-local image: zabbix-server-mysql:alpine-local @@ -106,7 +106,7 @@ services: build: context: ./Dockerfiles/proxy-sqlite3/alpine cache_from: - - alpine:3.15 + - alpine:3.16 args: BUILD_BASE_IMAGE: zabbix-build-sqlite3:alpine-local image: zabbix-proxy-sqlite3:alpine-local @@ -162,7 +162,7 @@ services: build: context: ./Dockerfiles/proxy-mysql/alpine cache_from: - - alpine:3.15 + - alpine:3.16 args: BUILD_BASE_IMAGE: zabbix-build-mysql:alpine-local image: zabbix-proxy-mysql:alpine-local @@ -228,7 +228,7 @@ services: build: context: ./Dockerfiles/web-apache-mysql/alpine cache_from: - - alpine:3.15 + - alpine:3.16 args: BUILD_BASE_IMAGE: zabbix-build-mysql:alpine-local image: zabbix-web-apache-mysql:alpine-local @@ -291,7 +291,7 @@ services: build: context: ./Dockerfiles/web-nginx-mysql/alpine cache_from: - - alpine:3.15 + - alpine:3.16 args: BUILD_BASE_IMAGE: zabbix-build-mysql:alpine-local image: zabbix-web-nginx-mysql:alpine-local @@ -352,7 +352,7 @@ services: build: context: ./Dockerfiles/agent/alpine cache_from: - - alpine:3.15 + - alpine:3.16 args: BUILD_BASE_IMAGE: zabbix-build-mysql:alpine-local image: zabbix-agent:alpine-local @@ -402,7 +402,7 @@ services: build: context: ./Dockerfiles/java-gateway/alpine cache_from: - - alpine:3.15 + - alpine:3.16 args: BUILD_BASE_IMAGE: zabbix-build-mysql:alpine-local image: zabbix-java-gateway:alpine-local @@ -439,7 +439,7 @@ services: build: context: ./Dockerfiles/snmptraps/alpine cache_from: - - alpine:3.15 + - alpine:3.16 image: zabbix-snmptraps:alpine-local profiles: - full @@ -472,7 +472,7 @@ services: build: context: ./Dockerfiles/web-service/alpine cache_from: - - alpine:3.15 + - alpine:3.16 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 c0c03a38d..8d9c85309 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.15 + - alpine:3.16 image: zabbix-build-base:alpine-local zabbix-build-pgsql: build: context: ./Dockerfiles/build-pgsql/alpine cache_from: - - alpine:3.15 + - alpine:3.16 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.15 + - alpine:3.16 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.15 + - alpine:3.16 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.15 + - alpine:3.16 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.15 + - alpine:3.16 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.15 + - alpine:3.16 args: BUILD_BASE_IMAGE: zabbix-build-mysql:alpine-local image: zabbix-proxy-mysql:alpine-local @@ -236,7 +236,7 @@ services: build: context: ./Dockerfiles/web-apache-pgsql/alpine cache_from: - - alpine:3.15 + - alpine:3.16 args: BUILD_BASE_IMAGE: zabbix-build-pgsql:alpine-local image: zabbix-web-apache-pgsql:alpine-local @@ -299,7 +299,7 @@ services: build: context: ./Dockerfiles/web-nginx-pgsql/alpine cache_from: - - alpine:3.15 + - alpine:3.16 args: BUILD_BASE_IMAGE: zabbix-build-pgsql:alpine-local image: zabbix-web-nginx-pgsql:alpine-local @@ -360,7 +360,7 @@ services: build: context: ./Dockerfiles/agent/alpine cache_from: - - alpine:3.15 + - alpine:3.16 args: BUILD_BASE_IMAGE: zabbix-build-pgsql:alpine-local image: zabbix-agent:alpine-local @@ -408,7 +408,7 @@ services: build: context: ./Dockerfiles/java-gateway/alpine cache_from: - - alpine:3.15 + - alpine:3.16 args: BUILD_BASE_IMAGE: zabbix-build-pgsql:alpine-local image: zabbix-java-gateway:alpine-local @@ -445,7 +445,7 @@ services: build: context: ./Dockerfiles/snmptraps/alpine cache_from: - - alpine:3.15 + - alpine:3.16 image: zabbix-snmptraps:alpine-local profiles: - full @@ -478,7 +478,7 @@ services: build: context: ./Dockerfiles/web-service/alpine cache_from: - - alpine:3.15 + - alpine:3.16 args: BUILD_BASE_IMAGE: zabbix-build-pgsql:alpine-local image: zabbix-web-service:alpine-local