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

Updated Alpine from 3.12 to 3.14

Browse Source
This commit is contained in:
Alexey Pustovalov 2021-11-30 18:46:39 +02:00
parent 985fb47c2b
commit e733cb40ca
19 changed files with 42 additions and 69 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 alpine:3.12
FROM alpine:3.14
ARG MAJOR_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 alpine:3.12
FROM alpine:3.14
ARG MAJOR_VERSION
ARG ZBX_VERSION

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

@ -1,5 +1,5 @@
# syntax=docker/dockerfile:1
FROM alpine:3.12
FROM alpine:3.14
ARG MAJOR_VERSION=5.0
ARG ZBX_VERSION=${MAJOR_VERSION}.18
@ -48,30 +48,3 @@ RUN set -eux && \
--clean-protected \
${INSTALL_PKGS} && \
rm -rf /var/cache/apk/*
ARG GOLANG_VERSION=1.17.2
ENV PATH=/usr/local/go/bin:$PATH
RUN set -eux && \
apk add --no-cache musl-dev \
openssl-dev \
gnupg \
ca-certificates && \
update-ca-certificates && \
url='https://dl.google.com/go/go1.17.2.src.tar.gz' && \
sha256='2255eb3e4e824dd7d5fcdc2e7f84534371c186312e546fb1086a34c17752f431' && \
wget -O go.tgz.asc "$url.asc" && \
wget -O go.tgz "$url" && \
echo "$sha256 *go.tgz" | sha256sum -c - && \
GNUPGHOME="$(mktemp -d)"; export GNUPGHOME && \
gpg --batch --keyserver keyserver.ubuntu.com --recv-keys 'EB4C 1BFD 4F04 2F6D DDCC EC91 7721 F63B D38B 4796' && \
gpg --batch --verify go.tgz.asc go.tgz && \
gpgconf --kill all && \
rm -rf "$GNUPGHOME" go.tgz.asc && \
tar -C /usr/local -xzf go.tgz && \
rm go.tgz && \
cd /usr/local/go/src && \
export GOROOT_BOOTSTRAP="$(go env GOROOT)" && \
./make.bash && \
apk del go && \
rm -rf /var/cache/apk/*

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 alpine:3.12
FROM alpine:3.14
ARG MAJOR_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 alpine:3.12
FROM alpine:3.14
ARG MAJOR_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 alpine:3.12
FROM alpine:3.14
ARG MAJOR_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 alpine:3.12
FROM alpine:3.14
ARG MAJOR_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 alpine:3.12
FROM alpine:3.14
ARG MAJOR_VERSION
ARG ZBX_VERSION

2
Dockerfiles/snmptraps/alpine/Dockerfile
View File

@ -1,4 +1,4 @@
FROM alpine:3.12
FROM alpine:3.14
ARG MAJOR_VERSION=5.0
ARG ZBX_VERSION=${MAJOR_VERSION}.18

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 alpine:3.12
FROM alpine:3.14
ARG MAJOR_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 alpine:3.12
FROM alpine:3.14
ARG MAJOR_VERSION
ARG ZBX_VERSION

4
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 alpine:3.12
FROM alpine:3.14
ARG MAJOR_VERSION
ARG ZBX_VERSION
@ -80,7 +80,7 @@ RUN set -eux && \
mkdir -p /etc/zabbix/web/certs && \
mkdir -p /var/lib/php/session && \
rm -rf /etc/php7/php-fpm.d/www.conf && \
rm -f /etc/nginx/conf.d/*.conf && \
rm -f /etc/nginx/http.d/*.conf && \
ln -sf /dev/fd/2 /var/lib/nginx/logs/error.log && \
cd /usr/share/zabbix/ && \
rm -f conf/zabbix.conf.php conf/maintenance.inc.php conf/zabbix.conf.php.example && \

2
Dockerfiles/web-nginx-mysql/alpine/conf/etc/nginx/nginx.conf
View File

@ -67,5 +67,5 @@ http {
index index.php;
server_tokens off;
include /etc/nginx/conf.d/*.conf;
include /etc/nginx/http.d/*.conf;
}

2
Dockerfiles/web-nginx-mysql/alpine/docker-entrypoint.sh
View File

@ -146,7 +146,7 @@ check_db_connect() {
}
prepare_web_server() {
NGINX_CONFD_DIR="/etc/nginx/conf.d"
NGINX_CONFD_DIR="/etc/nginx/http.d"
NGINX_SSL_CONFIG="/etc/ssl/nginx"
echo "** Adding Zabbix virtual host (HTTP)"

4
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 alpine:3.12
FROM alpine:3.14
ARG MAJOR_VERSION
ARG ZBX_VERSION
@ -79,7 +79,7 @@ RUN set -eux && \
mkdir -p /etc/zabbix/web/certs && \
mkdir -p /var/lib/php/session && \
rm -rf /etc/php7/php-fpm.d/www.conf && \
rm -f /etc/nginx/conf.d/*.conf && \
rm -f /etc/nginx/http.d/*.conf && \
ln -sf /dev/fd/2 /var/lib/nginx/logs/error.log && \
cd /usr/share/zabbix/ && \
rm -f conf/zabbix.conf.php conf/maintenance.inc.php conf/zabbix.conf.php.example && \

2
Dockerfiles/web-nginx-pgsql/alpine/conf/etc/nginx/nginx.conf
View File

@ -67,5 +67,5 @@ http {
index index.php;
server_tokens off;
include /etc/nginx/conf.d/*.conf;
include /etc/nginx/http.d/*.conf;
}

2
Dockerfiles/web-nginx-pgsql/alpine/docker-entrypoint.sh
View File

@ -132,7 +132,7 @@ check_db_connect() {
}
prepare_web_server() {
NGINX_CONFD_DIR="/etc/nginx/conf.d"
NGINX_CONFD_DIR="/etc/nginx/http.d"
NGINX_SSL_CONFIG="/etc/ssl/nginx"
echo "** Adding Zabbix virtual host (HTTP)"

22
docker-compose_v3_alpine_mysql_local.yaml
View File

@ -4,14 +4,14 @@ services:
build:
context: ./Dockerfiles/build-base/alpine
cache_from:
- alpine:3.12
- alpine:3.14
image: zabbix-build-base:alpine-local
zabbix-build-mysql:
build:
context: ./Dockerfiles/build-mysql/alpine
cache_from:
- alpine:3.12
- alpine:3.14
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.12
- alpine:3.14
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.12
- alpine:3.14
args:
BUILD_BASE_IMAGE: zabbix-build-mysql:alpine-local
image: zabbix-server-mysql:alpine-local
@ -105,7 +105,7 @@ services:
build:
context: ./Dockerfiles/proxy-sqlite3/alpine
cache_from:
- alpine:3.12
- alpine:3.14
args:
BUILD_BASE_IMAGE: zabbix-build-sqlite3:alpine-local
image: zabbix-proxy-sqlite3:alpine-local
@ -161,7 +161,7 @@ services:
build:
context: ./Dockerfiles/proxy-mysql/alpine
cache_from:
- alpine:3.12
- alpine:3.14
args:
BUILD_BASE_IMAGE: zabbix-build-mysql:alpine-local
image: zabbix-proxy-mysql:alpine-local
@ -226,7 +226,7 @@ services:
build:
context: ./Dockerfiles/web-apache-mysql/alpine
cache_from:
- alpine:3.12
- alpine:3.14
args:
BUILD_BASE_IMAGE: zabbix-build-mysql:alpine-local
image: zabbix-web-apache-mysql:alpine-local
@ -289,7 +289,7 @@ services:
build:
context: ./Dockerfiles/web-nginx-mysql/alpine
cache_from:
- alpine:3.12
- alpine:3.14
args:
BUILD_BASE_IMAGE: zabbix-build-mysql:alpine-local
image: zabbix-web-nginx-mysql:alpine-local
@ -350,7 +350,7 @@ services:
build:
context: ./Dockerfiles/agent/alpine
cache_from:
- alpine:3.12
- alpine:3.14
args:
BUILD_BASE_IMAGE: zabbix-build-mysql:alpine-local
image: zabbix-agent:alpine-local
@ -400,7 +400,7 @@ services:
build:
context: ./Dockerfiles/java-gateway/alpine
cache_from:
- alpine:3.12
- alpine:3.14
args:
BUILD_BASE_IMAGE: zabbix-build-mysql:alpine-local
image: zabbix-java-gateway:alpine-local
@ -437,7 +437,7 @@ services:
build:
context: ./Dockerfiles/snmptraps/alpine
cache_from:
- alpine:3.12
- alpine:3.14
image: zabbix-snmptraps:alpine-local
profiles:
- full

24
docker-compose_v3_alpine_pgsql_local.yaml
View File

@ -4,14 +4,14 @@ services:
build:
context: ./Dockerfiles/build-base/alpine
cache_from:
- alpine:3.12
- alpine:3.14
image: zabbix-build-base:alpine-local
zabbix-build-pgsql:
build:
context: ./Dockerfiles/build-pgsql/alpine
cache_from:
- alpine:3.12
- alpine:3.14
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.12
- alpine:3.14
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.12
- alpine:3.14
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.12
- alpine:3.14
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.12
- alpine:3.14
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.12
- alpine:3.14
args:
BUILD_BASE_IMAGE: zabbix-build-mysql:alpine-local
image: zabbix-proxy-mysql:alpine-local
@ -235,7 +235,7 @@ services:
build:
context: ./Dockerfiles/web-apache-pgsql/alpine
cache_from:
- alpine:3.12
- alpine:3.14
args:
BUILD_BASE_IMAGE: zabbix-build-pgsql:alpine-local
image: zabbix-web-apache-pgsql:alpine-local
@ -298,7 +298,7 @@ services:
build:
context: ./Dockerfiles/web-nginx-pgsql/alpine
cache_from:
- alpine:3.12
- alpine:3.14
args:
BUILD_BASE_IMAGE: zabbix-build-pgsql:alpine-local
image: zabbix-web-nginx-pgsql:alpine-local
@ -359,7 +359,7 @@ services:
build:
context: ./Dockerfiles/agent/alpine
cache_from:
- alpine:3.12
- alpine:3.14
args:
BUILD_BASE_IMAGE: zabbix-build-pgsql:alpine-local
image: zabbix-agent:alpine-local
@ -407,7 +407,7 @@ services:
build:
context: ./Dockerfiles/java-gateway/alpine
cache_from:
- alpine:3.12
- alpine:3.14
args:
BUILD_BASE_IMAGE: zabbix-build-pgsql:alpine-local
image: zabbix-java-gateway:alpine-local
@ -444,7 +444,7 @@ services:
build:
context: ./Dockerfiles/snmptraps/alpine
cache_from:
- alpine:3.12
- alpine:3.14
image: zabbix-snmptraps:alpine-local
profiles:
- full