From 038444377416407b18cb3206821ac9812a3c5d9b Mon Sep 17 00:00:00 2001 From: Alexey Pustovalov Date: Mon, 19 Jun 2023 23:55:50 +0900 Subject: [PATCH] Updated Alpine to 3.18 --- 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 | 25 +++++++++--------- docker-compose_v3_alpine_pgsql_local.yaml | 26 +++++++++---------- 16 files changed, 39 insertions(+), 40 deletions(-) diff --git a/Dockerfiles/agent/alpine/Dockerfile b/Dockerfiles/agent/alpine/Dockerfile index 4eb95ac41..7c39c6a80 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.17 +FROM alpine:3.18 ARG MAJOR_VERSION ARG ZBX_VERSION diff --git a/Dockerfiles/agent2/alpine/Dockerfile b/Dockerfiles/agent2/alpine/Dockerfile index 8dc2fd048..4b01a645e 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.17 +FROM alpine:3.18 ARG MAJOR_VERSION ARG ZBX_VERSION diff --git a/Dockerfiles/build-base/alpine/Dockerfile b/Dockerfiles/build-base/alpine/Dockerfile index 310a9fc86..04adebbf9 100644 --- a/Dockerfiles/build-base/alpine/Dockerfile +++ b/Dockerfiles/build-base/alpine/Dockerfile @@ -1,5 +1,5 @@ # syntax=docker/dockerfile:1 -FROM alpine:3.17 +FROM alpine:3.18 ARG MAJOR_VERSION=7.0 ARG ZBX_VERSION=${MAJOR_VERSION} diff --git a/Dockerfiles/java-gateway/alpine/Dockerfile b/Dockerfiles/java-gateway/alpine/Dockerfile index 3d8969579..35a9f6147 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.17 +FROM alpine:3.18 ARG MAJOR_VERSION ARG ZBX_VERSION diff --git a/Dockerfiles/proxy-mysql/alpine/Dockerfile b/Dockerfiles/proxy-mysql/alpine/Dockerfile index 7f1a5236b..79a5265ac 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.17 +FROM alpine:3.18 ARG MAJOR_VERSION ARG ZBX_VERSION diff --git a/Dockerfiles/proxy-sqlite3/alpine/Dockerfile b/Dockerfiles/proxy-sqlite3/alpine/Dockerfile index 02b010a1b..c82cc0b34 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.17 +FROM alpine:3.18 ARG MAJOR_VERSION ARG ZBX_VERSION diff --git a/Dockerfiles/server-mysql/alpine/Dockerfile b/Dockerfiles/server-mysql/alpine/Dockerfile index 33c23a127..cd3a57646 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.17 +FROM alpine:3.18 ARG MAJOR_VERSION ARG ZBX_VERSION diff --git a/Dockerfiles/server-pgsql/alpine/Dockerfile b/Dockerfiles/server-pgsql/alpine/Dockerfile index 23b2ced60..f8b02f273 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.17 +FROM alpine:3.18 ARG MAJOR_VERSION ARG ZBX_VERSION diff --git a/Dockerfiles/snmptraps/alpine/Dockerfile b/Dockerfiles/snmptraps/alpine/Dockerfile index 2557b1987..4c2d4e213 100644 --- a/Dockerfiles/snmptraps/alpine/Dockerfile +++ b/Dockerfiles/snmptraps/alpine/Dockerfile @@ -1,4 +1,4 @@ -FROM alpine:3.17 +FROM alpine:3.18 ARG MAJOR_VERSION=7.0 ARG ZBX_VERSION=${MAJOR_VERSION} diff --git a/Dockerfiles/web-apache-mysql/alpine/Dockerfile b/Dockerfiles/web-apache-mysql/alpine/Dockerfile index 0698be483..c9bdcee08 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.17 +FROM alpine:3.18 ARG MAJOR_VERSION ARG ZBX_VERSION diff --git a/Dockerfiles/web-apache-pgsql/alpine/Dockerfile b/Dockerfiles/web-apache-pgsql/alpine/Dockerfile index 2e3f337f5..14326f206 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.17 +FROM alpine:3.18 ARG MAJOR_VERSION ARG ZBX_VERSION diff --git a/Dockerfiles/web-nginx-mysql/alpine/Dockerfile b/Dockerfiles/web-nginx-mysql/alpine/Dockerfile index e840ccfd3..bf33ff2df 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.17 +FROM alpine:3.18 ARG MAJOR_VERSION ARG ZBX_VERSION diff --git a/Dockerfiles/web-nginx-pgsql/alpine/Dockerfile b/Dockerfiles/web-nginx-pgsql/alpine/Dockerfile index ac8db515d..3735ea2f5 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.17 +FROM alpine:3.18 ARG MAJOR_VERSION ARG ZBX_VERSION diff --git a/Dockerfiles/web-service/alpine/Dockerfile b/Dockerfiles/web-service/alpine/Dockerfile index f1d57ac67..6d0afb6d7 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.17 +FROM alpine:3.18 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 672e0a239..c46b75192 100644 --- a/docker-compose_v3_alpine_mysql_local.yaml +++ b/docker-compose_v3_alpine_mysql_local.yaml @@ -1,17 +1,16 @@ -version: '3.5' services: zabbix-build-base: build: context: ./Dockerfiles/build-base/alpine cache_from: - - alpine:3.17 + - alpine:3.18 image: zabbix-build-base:alpine-local zabbix-build-mysql: build: context: ./Dockerfiles/build-mysql/alpine cache_from: - - alpine:3.17 + - alpine:3.18 args: BUILD_BASE_IMAGE: zabbix-build-base:alpine-local image: zabbix-build-mysql:alpine-local @@ -22,7 +21,7 @@ services: build: context: ./Dockerfiles/build-sqlite3/alpine cache_from: - - alpine:3.17 + - alpine:3.18 args: BUILD_BASE_IMAGE: zabbix-build-base:alpine-local image: zabbix-build-sqlite3:alpine-local @@ -35,7 +34,7 @@ services: build: context: ./Dockerfiles/server-mysql/alpine cache_from: - - alpine:3.17 + - alpine:3.18 args: BUILD_BASE_IMAGE: zabbix-build-mysql:alpine-local image: zabbix-server-mysql:alpine-local @@ -108,7 +107,7 @@ services: build: context: ./Dockerfiles/proxy-sqlite3/alpine cache_from: - - alpine:3.17 + - alpine:3.18 args: BUILD_BASE_IMAGE: zabbix-build-sqlite3:alpine-local image: zabbix-proxy-sqlite3:alpine-local @@ -164,7 +163,7 @@ services: build: context: ./Dockerfiles/proxy-mysql/alpine cache_from: - - alpine:3.17 + - alpine:3.18 args: BUILD_BASE_IMAGE: zabbix-build-mysql:alpine-local image: zabbix-proxy-mysql:alpine-local @@ -231,7 +230,7 @@ services: build: context: ./Dockerfiles/web-apache-mysql/alpine cache_from: - - alpine:3.17 + - alpine:3.18 args: BUILD_BASE_IMAGE: zabbix-build-mysql:alpine-local image: zabbix-web-apache-mysql:alpine-local @@ -295,7 +294,7 @@ services: build: context: ./Dockerfiles/web-nginx-mysql/alpine cache_from: - - alpine:3.17 + - alpine:3.18 args: BUILD_BASE_IMAGE: zabbix-build-mysql:alpine-local image: zabbix-web-nginx-mysql:alpine-local @@ -357,7 +356,7 @@ services: build: context: ./Dockerfiles/agent/alpine cache_from: - - alpine:3.17 + - alpine:3.18 args: BUILD_BASE_IMAGE: zabbix-build-mysql:alpine-local image: zabbix-agent:alpine-local @@ -405,7 +404,7 @@ services: build: context: ./Dockerfiles/java-gateway/alpine cache_from: - - alpine:3.17 + - alpine:3.18 args: BUILD_BASE_IMAGE: zabbix-build-mysql:alpine-local image: zabbix-java-gateway:alpine-local @@ -442,7 +441,7 @@ services: build: context: ./Dockerfiles/snmptraps/alpine cache_from: - - alpine:3.17 + - alpine:3.18 image: zabbix-snmptraps:alpine-local profiles: - full @@ -475,7 +474,7 @@ services: build: context: ./Dockerfiles/web-service/alpine cache_from: - - alpine:3.17 + - alpine:3.18 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 37d06de0a..ed1a3d538 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.17 + - alpine:3.18 image: zabbix-build-base:alpine-local zabbix-build-pgsql: build: context: ./Dockerfiles/build-pgsql/alpine cache_from: - - alpine:3.17 + - alpine:3.18 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.17 + - alpine:3.18 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.17 + - alpine:3.18 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.17 + - alpine:3.18 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.17 + - alpine:3.18 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.17 + - alpine:3.18 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.17 + - alpine:3.18 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.17 + - alpine:3.18 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.17 + - alpine:3.18 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.17 + - alpine:3.18 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.17 + - alpine:3.18 image: zabbix-snmptraps:alpine-local profiles: - full @@ -479,7 +479,7 @@ services: build: context: ./Dockerfiles/web-service/alpine cache_from: - - alpine:3.17 + - alpine:3.18 args: BUILD_BASE_IMAGE: zabbix-build-pgsql:alpine-local image: zabbix-web-service:alpine-local