Merge branch 'trunk' of https://github.com/zabbix/zabbix-docker into …

…trunk
kailongapple · May 31, 2022 · 5f35f58 · 5f35f58
2 parents 341eee1 + 3de2a40
commit 5f35f58
Show file tree

Hide file tree

Showing 16 changed files with 39 additions and 39 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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