From 9e3f4427c000a802b66dd549008084c7460e1326 Mon Sep 17 00:00:00 2001 From: Alexey Pustovalov Date: Wed, 23 Nov 2022 19:05:59 +0900 Subject: [PATCH] Updated Alpine to 3.17 --- 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 c863097e1..90a567559 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.16 +FROM alpine:3.17 ARG MAJOR_VERSION ARG ZBX_VERSION diff --git a/Dockerfiles/agent2/alpine/Dockerfile b/Dockerfiles/agent2/alpine/Dockerfile index eab0819d3..602e4f73b 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.16 +FROM alpine:3.17 ARG MAJOR_VERSION ARG ZBX_VERSION diff --git a/Dockerfiles/build-base/alpine/Dockerfile b/Dockerfiles/build-base/alpine/Dockerfile index 268233bc4..0fed4f931 100644 --- a/Dockerfiles/build-base/alpine/Dockerfile +++ b/Dockerfiles/build-base/alpine/Dockerfile @@ -1,5 +1,5 @@ # syntax=docker/dockerfile:1 -FROM alpine:3.16 +FROM alpine:3.17 ARG MAJOR_VERSION=6.4 ARG ZBX_VERSION=${MAJOR_VERSION} diff --git a/Dockerfiles/java-gateway/alpine/Dockerfile b/Dockerfiles/java-gateway/alpine/Dockerfile index 2a1cec3c7..6eb4a957f 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.16 +FROM alpine:3.17 ARG MAJOR_VERSION ARG ZBX_VERSION diff --git a/Dockerfiles/proxy-mysql/alpine/Dockerfile b/Dockerfiles/proxy-mysql/alpine/Dockerfile index c206ccbe7..d7a7d19b7 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.16 +FROM alpine:3.17 ARG MAJOR_VERSION ARG ZBX_VERSION diff --git a/Dockerfiles/proxy-sqlite3/alpine/Dockerfile b/Dockerfiles/proxy-sqlite3/alpine/Dockerfile index 9a981d45b..d52724192 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.16 +FROM alpine:3.17 ARG MAJOR_VERSION ARG ZBX_VERSION diff --git a/Dockerfiles/server-mysql/alpine/Dockerfile b/Dockerfiles/server-mysql/alpine/Dockerfile index f2f65c2bb..f653fbe70 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.16 +FROM alpine:3.17 ARG MAJOR_VERSION ARG ZBX_VERSION diff --git a/Dockerfiles/server-pgsql/alpine/Dockerfile b/Dockerfiles/server-pgsql/alpine/Dockerfile index e51e85900..c3d6f96a4 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.16 +FROM alpine:3.17 ARG MAJOR_VERSION ARG ZBX_VERSION diff --git a/Dockerfiles/snmptraps/alpine/Dockerfile b/Dockerfiles/snmptraps/alpine/Dockerfile index a073aa18c..63829be5e 100644 --- a/Dockerfiles/snmptraps/alpine/Dockerfile +++ b/Dockerfiles/snmptraps/alpine/Dockerfile @@ -1,4 +1,4 @@ -FROM alpine:3.16 +FROM alpine:3.17 ARG MAJOR_VERSION=6.4 ARG ZBX_VERSION=${MAJOR_VERSION} diff --git a/Dockerfiles/web-apache-mysql/alpine/Dockerfile b/Dockerfiles/web-apache-mysql/alpine/Dockerfile index 0e6149232..34cf4f751 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.16 +FROM alpine:3.17 ARG MAJOR_VERSION ARG ZBX_VERSION diff --git a/Dockerfiles/web-apache-pgsql/alpine/Dockerfile b/Dockerfiles/web-apache-pgsql/alpine/Dockerfile index 9b36c212b..d9fd5864d 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.16 +FROM alpine:3.17 ARG MAJOR_VERSION ARG ZBX_VERSION diff --git a/Dockerfiles/web-nginx-mysql/alpine/Dockerfile b/Dockerfiles/web-nginx-mysql/alpine/Dockerfile index 377374103..1ab9f7424 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.16 +FROM alpine:3.17 ARG MAJOR_VERSION ARG ZBX_VERSION diff --git a/Dockerfiles/web-nginx-pgsql/alpine/Dockerfile b/Dockerfiles/web-nginx-pgsql/alpine/Dockerfile index 7d2c563ea..872d7449d 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.16 +FROM alpine:3.17 ARG MAJOR_VERSION ARG ZBX_VERSION diff --git a/Dockerfiles/web-service/alpine/Dockerfile b/Dockerfiles/web-service/alpine/Dockerfile index 23f2ef159..c1e9a6753 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.16 +FROM alpine:3.17 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 15bebd697..95b2f5d3c 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.16 + - alpine:3.17 image: zabbix-build-base:alpine-local zabbix-build-mysql: build: context: ./Dockerfiles/build-mysql/alpine cache_from: - - alpine:3.16 + - alpine:3.17 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.16 + - alpine:3.17 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.16 + - alpine:3.17 args: BUILD_BASE_IMAGE: zabbix-build-mysql:alpine-local image: zabbix-server-mysql:alpine-local @@ -107,7 +107,7 @@ services: build: context: ./Dockerfiles/proxy-sqlite3/alpine cache_from: - - alpine:3.16 + - alpine:3.17 args: BUILD_BASE_IMAGE: zabbix-build-sqlite3:alpine-local image: zabbix-proxy-sqlite3:alpine-local @@ -163,7 +163,7 @@ services: build: context: ./Dockerfiles/proxy-mysql/alpine cache_from: - - alpine:3.16 + - alpine:3.17 args: BUILD_BASE_IMAGE: zabbix-build-mysql:alpine-local image: zabbix-proxy-mysql:alpine-local @@ -229,7 +229,7 @@ services: build: context: ./Dockerfiles/web-apache-mysql/alpine cache_from: - - alpine:3.16 + - alpine:3.17 args: BUILD_BASE_IMAGE: zabbix-build-mysql:alpine-local image: zabbix-web-apache-mysql:alpine-local @@ -292,7 +292,7 @@ services: build: context: ./Dockerfiles/web-nginx-mysql/alpine cache_from: - - alpine:3.16 + - alpine:3.17 args: BUILD_BASE_IMAGE: zabbix-build-mysql:alpine-local image: zabbix-web-nginx-mysql:alpine-local @@ -353,7 +353,7 @@ services: build: context: ./Dockerfiles/agent/alpine cache_from: - - alpine:3.16 + - alpine:3.17 args: BUILD_BASE_IMAGE: zabbix-build-mysql:alpine-local image: zabbix-agent:alpine-local @@ -403,7 +403,7 @@ services: build: context: ./Dockerfiles/java-gateway/alpine cache_from: - - alpine:3.16 + - alpine:3.17 args: BUILD_BASE_IMAGE: zabbix-build-mysql:alpine-local image: zabbix-java-gateway:alpine-local @@ -440,7 +440,7 @@ services: build: context: ./Dockerfiles/snmptraps/alpine cache_from: - - alpine:3.16 + - alpine:3.17 image: zabbix-snmptraps:alpine-local profiles: - full @@ -473,7 +473,7 @@ services: build: context: ./Dockerfiles/web-service/alpine cache_from: - - alpine:3.16 + - alpine:3.17 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 b600705ec..a7e54bc43 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.16 + - alpine:3.17 image: zabbix-build-base:alpine-local zabbix-build-pgsql: build: context: ./Dockerfiles/build-pgsql/alpine cache_from: - - alpine:3.16 + - alpine:3.17 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.16 + - alpine:3.17 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.16 + - alpine:3.17 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.16 + - alpine:3.17 args: BUILD_BASE_IMAGE: zabbix-build-pgsql:alpine-local image: zabbix-server-pgsql:alpine-local @@ -118,7 +118,7 @@ services: build: context: ./Dockerfiles/proxy-sqlite3/alpine cache_from: - - alpine:3.16 + - alpine:3.17 args: BUILD_BASE_IMAGE: zabbix-build-sqlite3:alpine-local image: zabbix-proxy-sqlite3:alpine-local @@ -174,7 +174,7 @@ services: build: context: ./Dockerfiles/proxy-mysql/alpine cache_from: - - alpine:3.16 + - alpine:3.17 args: BUILD_BASE_IMAGE: zabbix-build-mysql:alpine-local image: zabbix-proxy-mysql:alpine-local @@ -237,7 +237,7 @@ services: build: context: ./Dockerfiles/web-apache-pgsql/alpine cache_from: - - alpine:3.16 + - alpine:3.17 args: BUILD_BASE_IMAGE: zabbix-build-pgsql:alpine-local image: zabbix-web-apache-pgsql:alpine-local @@ -300,7 +300,7 @@ services: build: context: ./Dockerfiles/web-nginx-pgsql/alpine cache_from: - - alpine:3.16 + - alpine:3.17 args: BUILD_BASE_IMAGE: zabbix-build-pgsql:alpine-local image: zabbix-web-nginx-pgsql:alpine-local @@ -361,7 +361,7 @@ services: build: context: ./Dockerfiles/agent/alpine cache_from: - - alpine:3.16 + - alpine:3.17 args: BUILD_BASE_IMAGE: zabbix-build-pgsql:alpine-local image: zabbix-agent:alpine-local @@ -409,7 +409,7 @@ services: build: context: ./Dockerfiles/java-gateway/alpine cache_from: - - alpine:3.16 + - alpine:3.17 args: BUILD_BASE_IMAGE: zabbix-build-pgsql:alpine-local image: zabbix-java-gateway:alpine-local @@ -446,7 +446,7 @@ services: build: context: ./Dockerfiles/snmptraps/alpine cache_from: - - alpine:3.16 + - alpine:3.17 image: zabbix-snmptraps:alpine-local profiles: - full @@ -479,7 +479,7 @@ services: build: context: ./Dockerfiles/web-service/alpine cache_from: - - alpine:3.16 + - alpine:3.17 args: BUILD_BASE_IMAGE: zabbix-build-pgsql:alpine-local image: zabbix-web-service:alpine-local