Updated base image versions

This commit is contained in:
Alexey Pustovalov 2020-12-19 12:07:18 -05:00
parent 454122e87f
commit 0ff51fa380
7 changed files with 45 additions and 45 deletions

View File

@ -4,7 +4,7 @@ services:
build:
context: ./server-mysql/alpine
cache_from:
- alpine:3.11
- alpine:3.12
image: zabbix-server-mysql:alpine-local
ports:
- "10051:10051"
@ -76,7 +76,7 @@ services:
build:
context: ./proxy-sqlite3/alpine
cache_from:
- alpine:3.11
- alpine:3.12
image: zabbix-proxy-sqlite3:alpine-local
ports:
- "10061:10051"
@ -130,7 +130,7 @@ services:
build:
context: ./proxy-mysql/alpine
cache_from:
- alpine:3.11
- alpine:3.12
image: zabbix-proxy-mysql:alpine-local
ports:
- "10071:10051"
@ -193,7 +193,7 @@ services:
build:
context: ./web-apache-mysql/alpine
cache_from:
- alpine:3.11
- alpine:3.12
image: zabbix-web-apache-mysql:alpine-local
ports:
- "80:8080"
@ -254,7 +254,7 @@ services:
build:
context: ./web-nginx-mysql/alpine
cache_from:
- alpine:3.11
- alpine:3.12
image: zabbix-web-nginx-mysql:alpine-local
ports:
- "8081:8080"
@ -315,7 +315,7 @@ services:
build:
context: ./agent/alpine
cache_from:
- alpine:3.11
- alpine:3.12
image: zabbix-agent:alpine-local
ports:
- "10050:10050"
@ -358,7 +358,7 @@ services:
build:
context: ./java-gateway/alpine
cache_from:
- alpine:3.11
- alpine:3.12
image: zabbix-java-gateway:alpine-local
ports:
- "10052:10052"
@ -388,7 +388,7 @@ services:
build:
context: ./snmptraps/alpine
cache_from:
- alpine:3.11
- alpine:3.12
image: zabbix-snmptraps:alpine-local
ports:
- "162:1162/udp"

View File

@ -4,7 +4,7 @@ services:
build:
context: ./server-pgsql/alpine
cache_from:
- alpine:3.11
- alpine:3.12
image: zabbix-server-pgsql:alpine-local
ports:
- "10051:10051"
@ -75,7 +75,7 @@ services:
build:
context: ./proxy-sqlite3/alpine
cache_from:
- alpine:3.11
- alpine:3.12
image: zabbix-proxy-sqlite3:alpine-local
ports:
- "10061:10051"
@ -129,7 +129,7 @@ services:
build:
context: ./proxy-mysql/alpine
cache_from:
- alpine:3.11
- alpine:3.12
image: zabbix-proxy-mysql:alpine-local
ports:
- "10071:10051"
@ -189,7 +189,7 @@ services:
build:
context: ./web-apache-pgsql/alpine
cache_from:
- alpine:3.11
- alpine:3.12
image: zabbix-web-apache-pgsql:alpine-local
ports:
- "80:8080"
@ -250,7 +250,7 @@ services:
build:
context: ./web-nginx-pgsql/alpine
cache_from:
- alpine:3.11
- alpine:3.12
image: zabbix-web-nginx-pgsql:alpine-local
ports:
- "8081:8080"
@ -311,7 +311,7 @@ services:
build:
context: ./agent/alpine
cache_from:
- alpine:3.11
- alpine:3.12
image: zabbix-agent:alpine-local
ports:
- "10050:10050"
@ -354,7 +354,7 @@ services:
build:
context: ./java-gateway/alpine
cache_from:
- alpine:3.11
- alpine:3.12
image: zabbix-java-gateway:alpine-local
ports:
- "10052:10052"
@ -384,7 +384,7 @@ services:
build:
context: ./snmptraps/alpine
cache_from:
- alpine:3.11
- alpine:3.12
image: zabbix-snmptraps:alpine-local
ports:
- "162:1162/udp"

View File

@ -4,7 +4,7 @@ services:
build:
context: ./server-mysql/centos
cache_from:
- centos:centos7
- centos:centos8
image: zabbix-server-mysql:centos-local
ports:
- "10051:10051"
@ -76,7 +76,7 @@ services:
build:
context: ./proxy-sqlite3/centos
cache_from:
- centos:centos7
- centos:centos8
image: zabbix-proxy-sqlite3:centos-local
ports:
- "10061:10051"
@ -130,7 +130,7 @@ services:
build:
context: ./proxy-mysql/centos
cache_from:
- centos:centos7
- centos:centos8
image: zabbix-proxy-mysql:centos-local
ports:
- "10071:10051"
@ -315,7 +315,7 @@ services:
build:
context: ./agent/centos
cache_from:
- centos:centos7
- centos:centos8
image: zabbix-agent:centos-local
ports:
- "10050:10050"
@ -358,7 +358,7 @@ services:
build:
context: ./java-gateway/centos
cache_from:
- centos:centos7
- centos:centos8
image: zabbix-java-gateway:centos-local
ports:
- "10052:10052"
@ -388,7 +388,7 @@ services:
build:
context: ./snmptraps/centos
cache_from:
- centos:centos7
- centos:centos8
image: zabbix-snmptraps:centos-local
ports:
- "162:1162/udp"

View File

@ -4,7 +4,7 @@ services:
build:
context: ./server-pgsql/centos
cache_from:
- centos:centos7
- centos:centos8
image: zabbix-server-pgsql:centos-local
ports:
- "10051:10051"
@ -75,7 +75,7 @@ services:
build:
context: ./proxy-sqlite3/centos
cache_from:
- centos:centos7
- centos:centos8
image: zabbix-proxy-sqlite3:centos-local
ports:
- "10061:10051"
@ -129,7 +129,7 @@ services:
build:
context: ./proxy-mysql/centos
cache_from:
- centos:centos7
- centos:centos8
image: zabbix-proxy-mysql:centos-local
ports:
- "10071:10051"
@ -311,7 +311,7 @@ services:
build:
context: ./agent/centos
cache_from:
- centos:centos7
- centos:centos8
image: zabbix-agent:centos-local
ports:
- "10050:10050"
@ -354,7 +354,7 @@ services:
build:
context: ./java-gateway/centos
cache_from:
- centos:centos7
- centos:centos8
image: zabbix-java-gateway:centos-local
ports:
- "10052:10052"
@ -384,7 +384,7 @@ services:
build:
context: ./snmptraps/centos
cache_from:
- centos:centos7
- centos:centos8
image: zabbix-snmptraps:centos-local
ports:
- "162:1162/udp"

View File

@ -4,7 +4,7 @@ services:
build:
context: ./server-mysql/ubuntu
cache_from:
- ubuntu:bionic
- ubuntu:focal
image: zabbix-server-mysql:ubuntu-local
ports:
- "10051:10051"
@ -75,7 +75,7 @@ services:
build:
context: ./proxy-sqlite3/ubuntu
cache_from:
- ubuntu:bionic
- ubuntu:focal
image: zabbix-proxy-sqlite3:ubuntu-local
ports:
- "10061:10051"
@ -128,7 +128,7 @@ services:
build:
context: ./proxy-mysql/ubuntu
cache_from:
- ubuntu:bionic
- ubuntu:focal
image: zabbix-proxy-mysql:ubuntu-local
ports:
- "10071:10051"
@ -190,7 +190,7 @@ services:
build:
context: ./web-apache-mysql/ubuntu
cache_from:
- ubuntu:bionic
- ubuntu:focal
image: zabbix-web-apache-mysql:ubuntu-local
ports:
- "80:8080"
@ -250,7 +250,7 @@ services:
build:
context: ./web-nginx-mysql/ubuntu
cache_from:
- ubuntu:bionic
- ubuntu:focal
image: zabbix-web-nginx-mysql:ubuntu-local
ports:
- "8081:8080"
@ -310,7 +310,7 @@ services:
build:
context: ./agent/ubuntu
cache_from:
- ubuntu:bionic
- ubuntu:focal
image: zabbix-agent:ubuntu-local
ports:
- "10050:10050"
@ -352,7 +352,7 @@ services:
build:
context: ./java-gateway/ubuntu
cache_from:
- ubuntu:bionic
- ubuntu:focal
image: zabbix-java-gateway:ubuntu-local
ports:
- "10052:10052"
@ -382,7 +382,7 @@ services:
build:
context: ./snmptraps/ubuntu
cache_from:
- ubuntu:bionic
- ubuntu:focal
image: zabbix-snmptraps:ubuntu-local
ports:
- "162:1162/udp"

View File

@ -4,7 +4,7 @@ services:
build:
context: ./server-pgsql/ubuntu
cache_from:
- ubuntu:bionic
- ubuntu:focal
image: zabbix-server-pgsql:ubuntu-local
ports:
- "10051:10051"
@ -74,7 +74,7 @@ services:
build:
context: ./proxy-sqlite3/ubuntu
cache_from:
- ubuntu:bionic
- ubuntu:focal
image: zabbix-proxy-sqlite3:ubuntu-local
ports:
- "10061:10051"
@ -127,7 +127,7 @@ services:
build:
context: ./proxy-mysql/ubuntu
cache_from:
- ubuntu:bionic
- ubuntu:focal
image: zabbix-proxy-mysql:ubuntu-local
ports:
- "10071:10051"
@ -186,7 +186,7 @@ services:
build:
context: ./web-apache-pgsql/ubuntu
cache_from:
- ubuntu:bionic
- ubuntu:focal
image: zabbix-web-apache-pgsql:ubuntu-local
ports:
- "80:8080"
@ -246,7 +246,7 @@ services:
build:
context: ./web-nginx-pgsql/ubuntu
cache_from:
- ubuntu:bionic
- ubuntu:focal
image: zabbix-web-nginx-pgsql:ubuntu-local
ports:
- "8081:8080"
@ -306,7 +306,7 @@ services:
build:
context: ./agent/ubuntu
cache_from:
- ubuntu:bionic
- ubuntu:focal
image: zabbix-agent:ubuntu-local
ports:
- "10050:10050"
@ -348,7 +348,7 @@ services:
build:
context: ./java-gateway/ubuntu
cache_from:
- ubuntu:bionic
- ubuntu:focal
image: zabbix-java-gateway:ubuntu-local
ports:
- "10052:10052"
@ -378,7 +378,7 @@ services:
build:
context: ./snmptraps/ubuntu
cache_from:
- ubuntu:bionic
- ubuntu:focal
image: zabbix-snmptraps:ubuntu-local
ports:
- "162:1162/udp"

View File

@ -1,4 +1,4 @@
FROM centos:centos7
FROM centos:centos8
ARG MAJOR_VERSION=5.0
ARG ZBX_VERSION=${MAJOR_VERSION}.6