extern/zabbix-docker
1
0
Fork 0
mirror of https://github.com/zabbix/zabbix-docker.git synced 2024-11-29 11:13:08 +01:00
Code Issues Packages Projects Releases Wiki Activity

Updated Alpine to 3.18

Browse Source
This commit is contained in:
Alexey Pustovalov 2023-06-19 23:55:50 +09:00
parent 2c8617c105
commit 0384443774
16 changed files with 39 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Dockerfiles/agent/alpine/Dockerfile
View File

@ -5,7 +5,7 @@ ARG BUILD_BASE_IMAGE=zabbix-build-mysql:alpine-${ZBX_VERSION}
FROM ${BUILD_BASE_IMAGE} as builder FROM ${BUILD_BASE_IMAGE} as builder
FROM alpine:3.17 FROM alpine:3.18
ARG MAJOR_VERSION ARG MAJOR_VERSION
ARG ZBX_VERSION ARG ZBX_VERSION

2
Dockerfiles/agent2/alpine/Dockerfile
View File

@ -5,7 +5,7 @@ ARG BUILD_BASE_IMAGE=zabbix-build-mysql:alpine-${ZBX_VERSION}
FROM ${BUILD_BASE_IMAGE} as builder FROM ${BUILD_BASE_IMAGE} as builder
FROM alpine:3.17 FROM alpine:3.18
ARG MAJOR_VERSION ARG MAJOR_VERSION
ARG ZBX_VERSION ARG ZBX_VERSION

2
Dockerfiles/build-base/alpine/Dockerfile
View File

@ -1,5 +1,5 @@
# syntax=docker/dockerfile:1 # syntax=docker/dockerfile:1
FROM alpine:3.17 FROM alpine:3.18
ARG MAJOR_VERSION=7.0 ARG MAJOR_VERSION=7.0
ARG ZBX_VERSION=${MAJOR_VERSION} ARG ZBX_VERSION=${MAJOR_VERSION}

2
Dockerfiles/java-gateway/alpine/Dockerfile
View File

@ -5,7 +5,7 @@ ARG BUILD_BASE_IMAGE=zabbix-build-mysql:alpine-${ZBX_VERSION}
FROM ${BUILD_BASE_IMAGE} as builder FROM ${BUILD_BASE_IMAGE} as builder
FROM alpine:3.17 FROM alpine:3.18
ARG MAJOR_VERSION ARG MAJOR_VERSION
ARG ZBX_VERSION ARG ZBX_VERSION

2
Dockerfiles/proxy-mysql/alpine/Dockerfile
View File

@ -5,7 +5,7 @@ ARG BUILD_BASE_IMAGE=zabbix-build-mysql:alpine-${ZBX_VERSION}
FROM ${BUILD_BASE_IMAGE} as builder FROM ${BUILD_BASE_IMAGE} as builder
FROM alpine:3.17 FROM alpine:3.18
ARG MAJOR_VERSION ARG MAJOR_VERSION
ARG ZBX_VERSION ARG ZBX_VERSION

2
Dockerfiles/proxy-sqlite3/alpine/Dockerfile
View File

@ -5,7 +5,7 @@ ARG BUILD_BASE_IMAGE=zabbix-build-sqlite3:alpine-${ZBX_VERSION}
FROM ${BUILD_BASE_IMAGE} as builder FROM ${BUILD_BASE_IMAGE} as builder
FROM alpine:3.17 FROM alpine:3.18
ARG MAJOR_VERSION ARG MAJOR_VERSION
ARG ZBX_VERSION ARG ZBX_VERSION

2
Dockerfiles/server-mysql/alpine/Dockerfile
View File

@ -5,7 +5,7 @@ ARG BUILD_BASE_IMAGE=zabbix-build-mysql:alpine-${ZBX_VERSION}
FROM ${BUILD_BASE_IMAGE} as builder FROM ${BUILD_BASE_IMAGE} as builder
FROM alpine:3.17 FROM alpine:3.18
ARG MAJOR_VERSION ARG MAJOR_VERSION
ARG ZBX_VERSION ARG ZBX_VERSION

2
Dockerfiles/server-pgsql/alpine/Dockerfile
View File

@ -5,7 +5,7 @@ ARG BUILD_BASE_IMAGE=zabbix-build-pgsql:alpine-${ZBX_VERSION}
FROM ${BUILD_BASE_IMAGE} as builder FROM ${BUILD_BASE_IMAGE} as builder
FROM alpine:3.17 FROM alpine:3.18
ARG MAJOR_VERSION ARG MAJOR_VERSION
ARG ZBX_VERSION ARG ZBX_VERSION

2
Dockerfiles/snmptraps/alpine/Dockerfile
View File

@ -1,4 +1,4 @@
FROM alpine:3.17 FROM alpine:3.18
ARG MAJOR_VERSION=7.0 ARG MAJOR_VERSION=7.0
ARG ZBX_VERSION=${MAJOR_VERSION} ARG ZBX_VERSION=${MAJOR_VERSION}

2
Dockerfiles/web-apache-mysql/alpine/Dockerfile
View File

@ -5,7 +5,7 @@ ARG BUILD_BASE_IMAGE=zabbix-build-mysql:alpine-${ZBX_VERSION}
FROM ${BUILD_BASE_IMAGE} as builder FROM ${BUILD_BASE_IMAGE} as builder
FROM alpine:3.17 FROM alpine:3.18
ARG MAJOR_VERSION ARG MAJOR_VERSION
ARG ZBX_VERSION ARG ZBX_VERSION

2
Dockerfiles/web-apache-pgsql/alpine/Dockerfile
View File

@ -5,7 +5,7 @@ ARG BUILD_BASE_IMAGE=zabbix-build-pgsql:alpine-${ZBX_VERSION}
FROM ${BUILD_BASE_IMAGE} as builder FROM ${BUILD_BASE_IMAGE} as builder
FROM alpine:3.17 FROM alpine:3.18
ARG MAJOR_VERSION ARG MAJOR_VERSION
ARG ZBX_VERSION ARG ZBX_VERSION

2
Dockerfiles/web-nginx-mysql/alpine/Dockerfile
View File

@ -5,7 +5,7 @@ ARG BUILD_BASE_IMAGE=zabbix-build-mysql:alpine-${ZBX_VERSION}
FROM ${BUILD_BASE_IMAGE} as builder FROM ${BUILD_BASE_IMAGE} as builder
FROM alpine:3.17 FROM alpine:3.18
ARG MAJOR_VERSION ARG MAJOR_VERSION
ARG ZBX_VERSION ARG ZBX_VERSION

2
Dockerfiles/web-nginx-pgsql/alpine/Dockerfile
View File

@ -5,7 +5,7 @@ ARG BUILD_BASE_IMAGE=zabbix-build-pgsql:alpine-${ZBX_VERSION}
FROM ${BUILD_BASE_IMAGE} as builder FROM ${BUILD_BASE_IMAGE} as builder
FROM alpine:3.17 FROM alpine:3.18
ARG MAJOR_VERSION ARG MAJOR_VERSION
ARG ZBX_VERSION ARG ZBX_VERSION

2
Dockerfiles/web-service/alpine/Dockerfile
View File

@ -5,7 +5,7 @@ ARG BUILD_BASE_IMAGE=zabbix-build-mysql:alpine-${ZBX_VERSION}
FROM ${BUILD_BASE_IMAGE} as builder FROM ${BUILD_BASE_IMAGE} as builder
FROM alpine:3.17 FROM alpine:3.18
ARG MAJOR_VERSION ARG MAJOR_VERSION
ARG ZBX_VERSION ARG ZBX_VERSION

25
docker-compose_v3_alpine_mysql_local.yaml
View File

@ -1,17 +1,16 @@
version: '3.5'
services: services:
zabbix-build-base: zabbix-build-base:
build: build:
context: ./Dockerfiles/build-base/alpine context: ./Dockerfiles/build-base/alpine
cache_from: cache_from:
- alpine:3.17 - alpine:3.18
image: zabbix-build-base:alpine-local image: zabbix-build-base:alpine-local
zabbix-build-mysql: zabbix-build-mysql:
build: build:
context: ./Dockerfiles/build-mysql/alpine context: ./Dockerfiles/build-mysql/alpine
cache_from: cache_from:
- alpine:3.17 - alpine:3.18
args: args:
BUILD_BASE_IMAGE: zabbix-build-base:alpine-local BUILD_BASE_IMAGE: zabbix-build-base:alpine-local
image: zabbix-build-mysql:alpine-local image: zabbix-build-mysql:alpine-local
@ -22,7 +21,7 @@ services:
build: build:
context: ./Dockerfiles/build-sqlite3/alpine context: ./Dockerfiles/build-sqlite3/alpine
cache_from: cache_from:
- alpine:3.17 - alpine:3.18
args: args:
BUILD_BASE_IMAGE: zabbix-build-base:alpine-local BUILD_BASE_IMAGE: zabbix-build-base:alpine-local
image: zabbix-build-sqlite3:alpine-local image: zabbix-build-sqlite3:alpine-local
@ -35,7 +34,7 @@ services:
build: build:
context: ./Dockerfiles/server-mysql/alpine context: ./Dockerfiles/server-mysql/alpine
cache_from: cache_from:
- alpine:3.17 - alpine:3.18
args: args:
BUILD_BASE_IMAGE: zabbix-build-mysql:alpine-local BUILD_BASE_IMAGE: zabbix-build-mysql:alpine-local
image: zabbix-server-mysql:alpine-local image: zabbix-server-mysql:alpine-local
@ -108,7 +107,7 @@ services:
build: build:
context: ./Dockerfiles/proxy-sqlite3/alpine context: ./Dockerfiles/proxy-sqlite3/alpine
cache_from: cache_from:
- alpine:3.17 - alpine:3.18
args: args:
BUILD_BASE_IMAGE: zabbix-build-sqlite3:alpine-local BUILD_BASE_IMAGE: zabbix-build-sqlite3:alpine-local
image: zabbix-proxy-sqlite3:alpine-local image: zabbix-proxy-sqlite3:alpine-local
@ -164,7 +163,7 @@ services:
build: build:
context: ./Dockerfiles/proxy-mysql/alpine context: ./Dockerfiles/proxy-mysql/alpine
cache_from: cache_from:
- alpine:3.17 - alpine:3.18
args: args:
BUILD_BASE_IMAGE: zabbix-build-mysql:alpine-local BUILD_BASE_IMAGE: zabbix-build-mysql:alpine-local
image: zabbix-proxy-mysql:alpine-local image: zabbix-proxy-mysql:alpine-local
@ -231,7 +230,7 @@ services:
build: build:
context: ./Dockerfiles/web-apache-mysql/alpine context: ./Dockerfiles/web-apache-mysql/alpine
cache_from: cache_from:
- alpine:3.17 - alpine:3.18
args: args:
BUILD_BASE_IMAGE: zabbix-build-mysql:alpine-local BUILD_BASE_IMAGE: zabbix-build-mysql:alpine-local
image: zabbix-web-apache-mysql:alpine-local image: zabbix-web-apache-mysql:alpine-local
@ -295,7 +294,7 @@ services:
build: build:
context: ./Dockerfiles/web-nginx-mysql/alpine context: ./Dockerfiles/web-nginx-mysql/alpine
cache_from: cache_from:
- alpine:3.17 - alpine:3.18
args: args:
BUILD_BASE_IMAGE: zabbix-build-mysql:alpine-local BUILD_BASE_IMAGE: zabbix-build-mysql:alpine-local
image: zabbix-web-nginx-mysql:alpine-local image: zabbix-web-nginx-mysql:alpine-local
@ -357,7 +356,7 @@ services:
build: build:
context: ./Dockerfiles/agent/alpine context: ./Dockerfiles/agent/alpine
cache_from: cache_from:
- alpine:3.17 - alpine:3.18
args: args:
BUILD_BASE_IMAGE: zabbix-build-mysql:alpine-local BUILD_BASE_IMAGE: zabbix-build-mysql:alpine-local
image: zabbix-agent:alpine-local image: zabbix-agent:alpine-local
@ -405,7 +404,7 @@ services:
build: build:
context: ./Dockerfiles/java-gateway/alpine context: ./Dockerfiles/java-gateway/alpine
cache_from: cache_from:
- alpine:3.17 - alpine:3.18
args: args:
BUILD_BASE_IMAGE: zabbix-build-mysql:alpine-local BUILD_BASE_IMAGE: zabbix-build-mysql:alpine-local
image: zabbix-java-gateway:alpine-local image: zabbix-java-gateway:alpine-local
@ -442,7 +441,7 @@ services:
build: build:
context: ./Dockerfiles/snmptraps/alpine context: ./Dockerfiles/snmptraps/alpine
cache_from: cache_from:
- alpine:3.17 - alpine:3.18
image: zabbix-snmptraps:alpine-local image: zabbix-snmptraps:alpine-local
profiles: profiles:
- full - full
@ -475,7 +474,7 @@ services:
build: build:
context: ./Dockerfiles/web-service/alpine context: ./Dockerfiles/web-service/alpine
cache_from: cache_from:
- alpine:3.17 - alpine:3.18
args: args:
BUILD_BASE_IMAGE: zabbix-build-mysql:alpine-local BUILD_BASE_IMAGE: zabbix-build-mysql:alpine-local
image: zabbix-web-service:alpine-local image: zabbix-web-service:alpine-local

26
docker-compose_v3_alpine_pgsql_local.yaml
View File

@ -4,14 +4,14 @@ services:
build: build:
context: ./Dockerfiles/build-base/alpine context: ./Dockerfiles/build-base/alpine
cache_from: cache_from:
- alpine:3.17 - alpine:3.18
image: zabbix-build-base:alpine-local image: zabbix-build-base:alpine-local
zabbix-build-pgsql: zabbix-build-pgsql:
build: build:
context: ./Dockerfiles/build-pgsql/alpine context: ./Dockerfiles/build-pgsql/alpine
cache_from: cache_from:
- alpine:3.17 - alpine:3.18
args: args:
BUILD_BASE_IMAGE: zabbix-build-base:alpine-local BUILD_BASE_IMAGE: zabbix-build-base:alpine-local
image: zabbix-build-pgsql:alpine-local image: zabbix-build-pgsql:alpine-local
@ -22,7 +22,7 @@ services:
build: build:
context: ./Dockerfiles/build-mysql/alpine context: ./Dockerfiles/build-mysql/alpine
cache_from: cache_from:
- alpine:3.17 - alpine:3.18
args: args:
BUILD_BASE_IMAGE: zabbix-build-base:alpine-local BUILD_BASE_IMAGE: zabbix-build-base:alpine-local
image: zabbix-build-mysql:alpine-local image: zabbix-build-mysql:alpine-local
@ -35,7 +35,7 @@ services:
build: build:
context: ./Dockerfiles/build-sqlite3/alpine context: ./Dockerfiles/build-sqlite3/alpine
cache_from: cache_from:
- alpine:3.17 - alpine:3.18
args: args:
BUILD_BASE_IMAGE: zabbix-build-base:alpine-local BUILD_BASE_IMAGE: zabbix-build-base:alpine-local
image: zabbix-build-sqlite3:alpine-local image: zabbix-build-sqlite3:alpine-local
@ -48,7 +48,7 @@ services:
build: build:
context: ./Dockerfiles/server-pgsql/alpine context: ./Dockerfiles/server-pgsql/alpine
cache_from: cache_from:
- alpine:3.17 - alpine:3.18
args: args:
BUILD_BASE_IMAGE: zabbix-build-pgsql:alpine-local BUILD_BASE_IMAGE: zabbix-build-pgsql:alpine-local
image: zabbix-server-pgsql:alpine-local image: zabbix-server-pgsql:alpine-local
@ -118,7 +118,7 @@ services:
build: build:
context: ./Dockerfiles/proxy-sqlite3/alpine context: ./Dockerfiles/proxy-sqlite3/alpine
cache_from: cache_from:
- alpine:3.17 - alpine:3.18
args: args:
BUILD_BASE_IMAGE: zabbix-build-sqlite3:alpine-local BUILD_BASE_IMAGE: zabbix-build-sqlite3:alpine-local
image: zabbix-proxy-sqlite3:alpine-local image: zabbix-proxy-sqlite3:alpine-local
@ -174,7 +174,7 @@ services:
build: build:
context: ./Dockerfiles/proxy-mysql/alpine context: ./Dockerfiles/proxy-mysql/alpine
cache_from: cache_from:
- alpine:3.17 - alpine:3.18
args: args:
BUILD_BASE_IMAGE: zabbix-build-mysql:alpine-local BUILD_BASE_IMAGE: zabbix-build-mysql:alpine-local
image: zabbix-proxy-mysql:alpine-local image: zabbix-proxy-mysql:alpine-local
@ -237,7 +237,7 @@ services:
build: build:
context: ./Dockerfiles/web-apache-pgsql/alpine context: ./Dockerfiles/web-apache-pgsql/alpine
cache_from: cache_from:
- alpine:3.17 - alpine:3.18
args: args:
BUILD_BASE_IMAGE: zabbix-build-pgsql:alpine-local BUILD_BASE_IMAGE: zabbix-build-pgsql:alpine-local
image: zabbix-web-apache-pgsql:alpine-local image: zabbix-web-apache-pgsql:alpine-local
@ -300,7 +300,7 @@ services:
build: build:
context: ./Dockerfiles/web-nginx-pgsql/alpine context: ./Dockerfiles/web-nginx-pgsql/alpine
cache_from: cache_from:
- alpine:3.17 - alpine:3.18
args: args:
BUILD_BASE_IMAGE: zabbix-build-pgsql:alpine-local BUILD_BASE_IMAGE: zabbix-build-pgsql:alpine-local
image: zabbix-web-nginx-pgsql:alpine-local image: zabbix-web-nginx-pgsql:alpine-local
@ -361,7 +361,7 @@ services:
build: build:
context: ./Dockerfiles/agent/alpine context: ./Dockerfiles/agent/alpine
cache_from: cache_from:
- alpine:3.17 - alpine:3.18
args: args:
BUILD_BASE_IMAGE: zabbix-build-pgsql:alpine-local BUILD_BASE_IMAGE: zabbix-build-pgsql:alpine-local
image: zabbix-agent:alpine-local image: zabbix-agent:alpine-local
@ -409,7 +409,7 @@ services:
build: build:
context: ./Dockerfiles/java-gateway/alpine context: ./Dockerfiles/java-gateway/alpine
cache_from: cache_from:
- alpine:3.17 - alpine:3.18
args: args:
BUILD_BASE_IMAGE: zabbix-build-pgsql:alpine-local BUILD_BASE_IMAGE: zabbix-build-pgsql:alpine-local
image: zabbix-java-gateway:alpine-local image: zabbix-java-gateway:alpine-local
@ -446,7 +446,7 @@ services:
build: build:
context: ./Dockerfiles/snmptraps/alpine context: ./Dockerfiles/snmptraps/alpine
cache_from: cache_from:
- alpine:3.17 - alpine:3.18
image: zabbix-snmptraps:alpine-local image: zabbix-snmptraps:alpine-local
profiles: profiles:
- full - full
@ -479,7 +479,7 @@ services:
build: build:
context: ./Dockerfiles/web-service/alpine context: ./Dockerfiles/web-service/alpine
cache_from: cache_from:
- alpine:3.17 - alpine:3.18
args: args:
BUILD_BASE_IMAGE: zabbix-build-pgsql:alpine-local BUILD_BASE_IMAGE: zabbix-build-pgsql:alpine-local
image: zabbix-web-service:alpine-local image: zabbix-web-service:alpine-local