From 0a3b83743ca76ca8452974736ef9042a067ef943 Mon Sep 17 00:00:00 2001 From: Alexey Pustovalov Date: Sat, 13 Jul 2019 16:53:27 +0300 Subject: [PATCH] Updated Alpine images to 3.10 --- agent/alpine/Dockerfile | 2 +- docker-compose_v3_alpine_mysql_local.yaml | 16 ++++++++-------- docker-compose_v3_alpine_pgsql_local.yaml | 16 ++++++++-------- java-gateway/alpine/Dockerfile | 2 +- proxy-mysql/alpine/Dockerfile | 2 +- proxy-sqlite3/alpine/Dockerfile | 2 +- server-mysql/alpine/Dockerfile | 2 +- server-pgsql/alpine/Dockerfile | 2 +- snmptraps/alpine/Dockerfile | 2 +- web-apache-mysql/alpine/Dockerfile | 2 +- .../alpine/conf/etc/php7/conf.d/99-zabbix.ini | 2 +- web-apache-pgsql/alpine/Dockerfile | 2 +- .../alpine/conf/etc/php7/conf.d/99-zabbix.ini | 2 +- web-nginx-mysql/alpine/Dockerfile | 2 +- .../alpine/conf/etc/php7/conf.d/99-zabbix.ini | 2 +- web-nginx-pgsql/alpine/Dockerfile | 2 +- .../alpine/conf/etc/php7/conf.d/99-zabbix.ini | 2 +- 17 files changed, 31 insertions(+), 31 deletions(-) diff --git a/agent/alpine/Dockerfile b/agent/alpine/Dockerfile index 2b72061f5..7e62f282b 100644 --- a/agent/alpine/Dockerfile +++ b/agent/alpine/Dockerfile @@ -1,4 +1,4 @@ -FROM alpine:3.9 +FROM alpine:3.10 LABEL maintainer="Alexey Pustovalov " ARG BUILD_DATE diff --git a/docker-compose_v3_alpine_mysql_local.yaml b/docker-compose_v3_alpine_mysql_local.yaml index 8de4a53e9..da8b4b01f 100644 --- a/docker-compose_v3_alpine_mysql_local.yaml +++ b/docker-compose_v3_alpine_mysql_local.yaml @@ -4,7 +4,7 @@ services: build: context: ./server-mysql/alpine cache_from: - - alpine:3.9 + - alpine:3.10 image: zabbix-server-mysql:alpine-local ports: - "10051:10051" @@ -69,7 +69,7 @@ services: build: context: ./proxy-sqlite3/alpine cache_from: - - alpine:3.9 + - alpine:3.10 image: zabbix-proxy-sqlite3:alpine-local ports: - "10061:10051" @@ -124,7 +124,7 @@ services: build: context: ./proxy-mysql/alpine cache_from: - - alpine:3.9 + - alpine:3.10 image: zabbix-proxy-mysql:alpine-local ports: - "10071:10051" @@ -181,7 +181,7 @@ services: build: context: ./web-apache-mysql/alpine cache_from: - - alpine:3.9 + - alpine:3.10 image: zabbix-web-apache-mysql:alpine-local ports: - "80:80" @@ -236,7 +236,7 @@ services: build: context: ./web-nginx-mysql/alpine cache_from: - - alpine:3.9 + - alpine:3.10 image: zabbix-web-nginx-mysql:alpine-local ports: - "8081:80" @@ -291,7 +291,7 @@ services: build: context: ./agent/alpine cache_from: - - alpine:3.9 + - alpine:3.10 image: zabbix-agent:alpine-local ports: - "10050:10050" @@ -335,7 +335,7 @@ services: build: context: ./java-gateway/alpine cache_from: - - alpine:3.9 + - alpine:3.10 image: zabbix-java-gateway:alpine-local ports: - "10052:10052" @@ -366,7 +366,7 @@ services: build: context: ./snmptraps/alpine cache_from: - - alpine:3.9 + - alpine:3.10 image: zabbix-snmptraps:alpine-local ports: - "162:162/udp" diff --git a/docker-compose_v3_alpine_pgsql_local.yaml b/docker-compose_v3_alpine_pgsql_local.yaml index 70b80069b..85c5d765d 100644 --- a/docker-compose_v3_alpine_pgsql_local.yaml +++ b/docker-compose_v3_alpine_pgsql_local.yaml @@ -4,7 +4,7 @@ services: build: context: ./server-pgsql/alpine cache_from: - - alpine:3.9 + - alpine:3.10 image: zabbix-server-pgsql:alpine-local ports: - "10051:10051" @@ -69,7 +69,7 @@ services: build: context: ./proxy-sqlite3/alpine cache_from: - - alpine:3.9 + - alpine:3.10 image: zabbix-proxy-sqlite3:alpine-local ports: - "10061:10051" @@ -124,7 +124,7 @@ services: build: context: ./proxy-mysql/alpine cache_from: - - alpine:3.9 + - alpine:3.10 image: zabbix-proxy-mysql:alpine-local ports: - "10071:10051" @@ -182,7 +182,7 @@ services: build: context: ./web-apache-pgsql/alpine cache_from: - - alpine:3.9 + - alpine:3.10 image: zabbix-web-apache-pgsql:alpine-local ports: - "80:80" @@ -237,7 +237,7 @@ services: build: context: ./web-nginx-pgsql/alpine cache_from: - - alpine:3.9 + - alpine:3.10 image: zabbix-web-nginx-pgsql:alpine-local ports: - "8081:80" @@ -292,7 +292,7 @@ services: build: context: ./agent/alpine cache_from: - - alpine:3.9 + - alpine:3.10 image: zabbix-agent:alpine-local ports: - "10050:10050" @@ -336,7 +336,7 @@ services: build: context: ./java-gateway/alpine cache_from: - - alpine:3.9 + - alpine:3.10 image: zabbix-java-gateway:alpine-local ports: - "10052:10052" @@ -367,7 +367,7 @@ services: build: context: ./snmptraps/alpine cache_from: - - alpine:3.7 + - alpine:3.10 image: zabbix-snmptraps:alpine-local ports: - "162:162/udp" diff --git a/java-gateway/alpine/Dockerfile b/java-gateway/alpine/Dockerfile index 11e576488..30677915c 100644 --- a/java-gateway/alpine/Dockerfile +++ b/java-gateway/alpine/Dockerfile @@ -1,4 +1,4 @@ -FROM alpine:3.9 +FROM alpine:3.10 LABEL maintainer="Alexey Pustovalov " ARG BUILD_DATE diff --git a/proxy-mysql/alpine/Dockerfile b/proxy-mysql/alpine/Dockerfile index 81bbef730..2d6fa37dc 100644 --- a/proxy-mysql/alpine/Dockerfile +++ b/proxy-mysql/alpine/Dockerfile @@ -1,4 +1,4 @@ -FROM alpine:3.9 +FROM alpine:3.10 LABEL maintainer="Alexey Pustovalov " ARG BUILD_DATE diff --git a/proxy-sqlite3/alpine/Dockerfile b/proxy-sqlite3/alpine/Dockerfile index aab1d0b52..cddc33bbd 100644 --- a/proxy-sqlite3/alpine/Dockerfile +++ b/proxy-sqlite3/alpine/Dockerfile @@ -1,4 +1,4 @@ -FROM alpine:3.9 +FROM alpine:3.10 LABEL maintainer="Alexey Pustovalov " ARG BUILD_DATE diff --git a/server-mysql/alpine/Dockerfile b/server-mysql/alpine/Dockerfile index 809f3b83c..2760f7e29 100644 --- a/server-mysql/alpine/Dockerfile +++ b/server-mysql/alpine/Dockerfile @@ -1,4 +1,4 @@ -FROM alpine:3.9 +FROM alpine:3.10 LABEL maintainer="Alexey Pustovalov " ARG BUILD_DATE diff --git a/server-pgsql/alpine/Dockerfile b/server-pgsql/alpine/Dockerfile index 73f9b4c63..62ed482bd 100644 --- a/server-pgsql/alpine/Dockerfile +++ b/server-pgsql/alpine/Dockerfile @@ -1,4 +1,4 @@ -FROM alpine:3.9 +FROM alpine:3.10 LABEL maintainer="Alexey Pustovalov " ARG BUILD_DATE diff --git a/snmptraps/alpine/Dockerfile b/snmptraps/alpine/Dockerfile index abfc36dfd..26b088088 100644 --- a/snmptraps/alpine/Dockerfile +++ b/snmptraps/alpine/Dockerfile @@ -1,4 +1,4 @@ -FROM alpine:3.9 +FROM alpine:3.10 LABEL maintainer "Alexey Pustovalov " ARG BUILD_DATE diff --git a/web-apache-mysql/alpine/Dockerfile b/web-apache-mysql/alpine/Dockerfile index bc1db87cc..901a28dc1 100644 --- a/web-apache-mysql/alpine/Dockerfile +++ b/web-apache-mysql/alpine/Dockerfile @@ -1,4 +1,4 @@ -FROM alpine:3.9 +FROM alpine:3.10 LABEL maintainer="Alexey Pustovalov " ARG BUILD_DATE diff --git a/web-apache-mysql/alpine/conf/etc/php7/conf.d/99-zabbix.ini b/web-apache-mysql/alpine/conf/etc/php7/conf.d/99-zabbix.ini index bf3b66c76..d5ae7adb9 100644 --- a/web-apache-mysql/alpine/conf/etc/php7/conf.d/99-zabbix.ini +++ b/web-apache-mysql/alpine/conf/etc/php7/conf.d/99-zabbix.ini @@ -3,7 +3,7 @@ memory_limit=128M post_max_size=16M upload_max_filesize=2M max_input_time=300 -always_populate_raw_post_data=-1 +; always_populate_raw_post_data=-1 max_input_vars=10000 ; date.timezone=Europe/Riga ; session.save_path=/var/lib/php5 diff --git a/web-apache-pgsql/alpine/Dockerfile b/web-apache-pgsql/alpine/Dockerfile index 78b4079c0..f1eff44c8 100644 --- a/web-apache-pgsql/alpine/Dockerfile +++ b/web-apache-pgsql/alpine/Dockerfile @@ -1,4 +1,4 @@ -FROM alpine:3.9 +FROM alpine:3.10 LABEL maintainer="Alexey Pustovalov " ARG BUILD_DATE diff --git a/web-apache-pgsql/alpine/conf/etc/php7/conf.d/99-zabbix.ini b/web-apache-pgsql/alpine/conf/etc/php7/conf.d/99-zabbix.ini index bf3b66c76..d5ae7adb9 100644 --- a/web-apache-pgsql/alpine/conf/etc/php7/conf.d/99-zabbix.ini +++ b/web-apache-pgsql/alpine/conf/etc/php7/conf.d/99-zabbix.ini @@ -3,7 +3,7 @@ memory_limit=128M post_max_size=16M upload_max_filesize=2M max_input_time=300 -always_populate_raw_post_data=-1 +; always_populate_raw_post_data=-1 max_input_vars=10000 ; date.timezone=Europe/Riga ; session.save_path=/var/lib/php5 diff --git a/web-nginx-mysql/alpine/Dockerfile b/web-nginx-mysql/alpine/Dockerfile index 387eb6756..fb148cf83 100644 --- a/web-nginx-mysql/alpine/Dockerfile +++ b/web-nginx-mysql/alpine/Dockerfile @@ -1,4 +1,4 @@ -FROM alpine:3.9 +FROM alpine:3.10 LABEL maintainer="Alexey Pustovalov " ARG BUILD_DATE diff --git a/web-nginx-mysql/alpine/conf/etc/php7/conf.d/99-zabbix.ini b/web-nginx-mysql/alpine/conf/etc/php7/conf.d/99-zabbix.ini index 1187c7024..332ad1c5f 100644 --- a/web-nginx-mysql/alpine/conf/etc/php7/conf.d/99-zabbix.ini +++ b/web-nginx-mysql/alpine/conf/etc/php7/conf.d/99-zabbix.ini @@ -3,7 +3,7 @@ memory_limit=128M post_max_size=16M upload_max_filesize=2M max_input_time=300 -always_populate_raw_post_data=-1 +; always_populate_raw_post_data=-1 max_input_vars=10000 ; date.timezone=Europe/Riga ; session.save_path=/var/lib/php7 diff --git a/web-nginx-pgsql/alpine/Dockerfile b/web-nginx-pgsql/alpine/Dockerfile index e2370f892..3216f761f 100644 --- a/web-nginx-pgsql/alpine/Dockerfile +++ b/web-nginx-pgsql/alpine/Dockerfile @@ -1,4 +1,4 @@ -FROM alpine:3.9 +FROM alpine:3.10 LABEL maintainer="Alexey Pustovalov " ARG BUILD_DATE diff --git a/web-nginx-pgsql/alpine/conf/etc/php7/conf.d/99-zabbix.ini b/web-nginx-pgsql/alpine/conf/etc/php7/conf.d/99-zabbix.ini index 1187c7024..332ad1c5f 100644 --- a/web-nginx-pgsql/alpine/conf/etc/php7/conf.d/99-zabbix.ini +++ b/web-nginx-pgsql/alpine/conf/etc/php7/conf.d/99-zabbix.ini @@ -3,7 +3,7 @@ memory_limit=128M post_max_size=16M upload_max_filesize=2M max_input_time=300 -always_populate_raw_post_data=-1 +; always_populate_raw_post_data=-1 max_input_vars=10000 ; date.timezone=Europe/Riga ; session.save_path=/var/lib/php7