Merge branch 'master' into trunk

2024-11-25 17:23:48 +01:00 · 2019-07-13 16:56:15 +03:00 · 2019-07-13 16:56:15 +03:00 · 7c9a3e4b81
commit 7c9a3e4b81
parent 0231258f53 0a3b83743c
17 changed files with 31 additions and 31 deletions
--- a/agent/alpine/Dockerfile
+++ b/agent/alpine/Dockerfile
@ -1,4 +1,4 @@
-FROM alpine:3.9
+FROM alpine:3.10
 LABEL maintainer="Alexey Pustovalov <alexey.pustovalov@zabbix.com>"

 ARG BUILD_DATE
--- 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"
--- 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"
--- 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 <alexey.pustovalov@zabbix.com>"

 ARG BUILD_DATE
--- 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 <alexey.pustovalov@zabbix.com>"

 ARG BUILD_DATE
--- 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 <alexey.pustovalov@zabbix.com>"

 ARG BUILD_DATE
--- 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 <alexey.pustovalov@zabbix.com>"

 ARG BUILD_DATE
--- 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 <alexey.pustovalov@zabbix.com>"

 ARG BUILD_DATE
--- a/snmptraps/alpine/Dockerfile
+++ b/snmptraps/alpine/Dockerfile
@ -1,4 +1,4 @@
-FROM alpine:3.9
+FROM alpine:3.10
 LABEL maintainer "Alexey Pustovalov <alexey.pustovalov@zabbix.com>"

 ARG BUILD_DATE
--- 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 <alexey.pustovalov@zabbix.com>"

 ARG BUILD_DATE
--- 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
--- 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 <alexey.pustovalov@zabbix.com>"

 ARG BUILD_DATE
--- 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
--- 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 <alexey.pustovalov@zabbix.com>"

 ARG BUILD_DATE
--- 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
--- 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 <alexey.pustovalov@zabbix.com>"

 ARG BUILD_DATE
--- 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