extern/zabbix-docker
1
0
Fork 0
mirror of https://github.com/zabbix/zabbix-docker.git synced 2025-08-08 16:14:56 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request from zabbix/master

Browse Source 
Master
This commit is contained in:
Alexey Pustovalov
2017-04-28 16:28:33 +03:00
committed by GitHub
parent 2da6081c7a 40ff735279
commit 31d4d911a7
25 changed files with 25 additions and 21 deletions
agent
alpine
Dockerfile
ubuntu
Dockerfile
java-gateway
alpine
Dockerfile
ubuntu
Dockerfile
proxy-mysql
alpine
Dockerfile
ubuntu
Dockerfile
proxy-sqlite3
alpine
Dockerfile
ubuntu
Dockerfile
server-mysql
alpine
Dockerfile
ubuntu
Dockerfile
server-pgsql
alpine
Dockerfile
ubuntu
Dockerfile
snmptraps/ubuntu
Dockerfile
web-apache-mysql
alpine
Dockerfile
ubuntu
Dockerfile
web-apache-pgsql
alpine
Dockerfile
ubuntu
Dockerfile
web-nginx-mysql
alpine
Dockerfile
conf
etc
nginx
nginx.conf
ubuntu
Dockerfile
conf
etc
nginx
nginx.conf
web-nginx-pgsql
alpine
Dockerfile
conf
etc
nginx
nginx.conf
ubuntu
Dockerfile
conf
etc
nginx
nginx.conf

2
agent/alpine/Dockerfile

@ -1,5 +1,5 @@
FROM alpine:3.4
MAINTAINER Alexey Pustovalov <alexey.pustovalov@zabbix.com>
LABEL maintainer "Alexey Pustovalov <alexey.pustovalov@zabbix.com>"
ARG APK_FLAGS_COMMON="-q"
ARG APK_FLAGS_PERSISTANT="${APK_FLAGS_COMMON} --clean-protected --no-cache"

2
agent/ubuntu/Dockerfile

@ -1,5 +1,5 @@
FROM ubuntu:trusty
MAINTAINER Alexey Pustovalov <alexey.pustovalov@zabbix.com>
LABEL maintainer "Alexey Pustovalov <alexey.pustovalov@zabbix.com>"
ARG APT_FLAGS_COMMON="-qq -y"
ARG APT_FLAGS_PERSISTANT="${APT_FLAGS_COMMON} --no-install-recommends"

2
java-gateway/alpine/Dockerfile

@ -1,5 +1,5 @@
FROM alpine:3.4
MAINTAINER Alexey Pustovalov <alexey.pustovalov@zabbix.com>
LABEL maintainer "Alexey Pustovalov <alexey.pustovalov@zabbix.com>"
ARG APK_FLAGS_COMMON="-q"
ARG APK_FLAGS_PERSISTANT="${APK_FLAGS_COMMON} --clean-protected --no-cache"

2
java-gateway/ubuntu/Dockerfile

@ -1,5 +1,5 @@
FROM ubuntu:trusty
MAINTAINER Alexey Pustovalov <alexey.pustovalov@zabbix.com>
LABEL maintainer "Alexey Pustovalov <alexey.pustovalov@zabbix.com>"
ARG APT_FLAGS_COMMON="-qq -y"
ARG APT_FLAGS_PERSISTANT="${APT_FLAGS_COMMON} --no-install-recommends"

2
proxy-mysql/alpine/Dockerfile

@ -1,5 +1,5 @@
FROM alpine:3.4
MAINTAINER Alexey Pustovalov <alexey.pustovalov@zabbix.com>
LABEL maintainer "Alexey Pustovalov <alexey.pustovalov@zabbix.com>"
ARG APK_FLAGS_COMMON="-q"
ARG APK_FLAGS_PERSISTANT="${APK_FLAGS_COMMON} --clean-protected --no-cache"

2
proxy-mysql/ubuntu/Dockerfile

@ -1,5 +1,5 @@
FROM ubuntu:trusty
MAINTAINER Alexey Pustovalov <alexey.pustovalov@zabbix.com>
LABEL maintainer "Alexey Pustovalov <alexey.pustovalov@zabbix.com>"
ARG APT_FLAGS_COMMON="-qq -y"
ARG APT_FLAGS_PERSISTANT="${APT_FLAGS_COMMON} --no-install-recommends"

2
proxy-sqlite3/alpine/Dockerfile

@ -1,5 +1,5 @@
FROM alpine:3.4
MAINTAINER Alexey Pustovalov <alexey.pustovalov@zabbix.com>
LABEL maintainer "Alexey Pustovalov <alexey.pustovalov@zabbix.com>"
ARG APK_FLAGS_COMMON="-q"
ARG APK_FLAGS_PERSISTANT="${APK_FLAGS_COMMON} --clean-protected --no-cache"

2
proxy-sqlite3/ubuntu/Dockerfile

@ -1,5 +1,5 @@
FROM ubuntu:trusty
MAINTAINER Alexey Pustovalov <alexey.pustovalov@zabbix.com>
LABEL maintainer "Alexey Pustovalov <alexey.pustovalov@zabbix.com>"
ARG APT_FLAGS_COMMON="-qq -y"
ARG APT_FLAGS_PERSISTANT="${APT_FLAGS_COMMON} --no-install-recommends"

2
server-mysql/alpine/Dockerfile

@ -1,5 +1,5 @@
FROM alpine:3.4
MAINTAINER Alexey Pustovalov <alexey.pustovalov@zabbix.com>
LABEL maintainer "Alexey Pustovalov <alexey.pustovalov@zabbix.com>"
ARG APK_FLAGS_COMMON="-q"
ARG APK_FLAGS_PERSISTANT="${APK_FLAGS_COMMON} --clean-protected --no-cache"

2
server-mysql/ubuntu/Dockerfile

@ -1,5 +1,5 @@
FROM ubuntu:trusty
MAINTAINER Alexey Pustovalov <alexey.pustovalov@zabbix.com>
LABEL maintainer "Alexey Pustovalov <alexey.pustovalov@zabbix.com>"
ARG APT_FLAGS_COMMON="-qq -y"
ARG APT_FLAGS_PERSISTANT="${APT_FLAGS_COMMON} --no-install-recommends"

2
server-pgsql/alpine/Dockerfile

@ -1,5 +1,5 @@
FROM alpine:3.4
MAINTAINER Alexey Pustovalov <alexey.pustovalov@zabbix.com>
LABEL maintainer "Alexey Pustovalov <alexey.pustovalov@zabbix.com>"
ARG APK_FLAGS_COMMON="-q"
ARG APK_FLAGS_PERSISTANT="${APK_FLAGS_COMMON} --clean-protected --no-cache"

2
server-pgsql/ubuntu/Dockerfile

@ -1,5 +1,5 @@
FROM ubuntu:trusty
MAINTAINER Alexey Pustovalov <alexey.pustovalov@zabbix.com>
LABEL maintainer "Alexey Pustovalov <alexey.pustovalov@zabbix.com>"
ARG APT_FLAGS_COMMON="-qq -y"
ARG APT_FLAGS_PERSISTANT="${APT_FLAGS_COMMON} --no-install-recommends"

2
snmptraps/ubuntu/Dockerfile

@ -1,5 +1,5 @@
FROM ubuntu:trusty
MAINTAINER Alexey Pustovalov <alexey.pustovalov@zabbix.com>
LABEL maintainer "Alexey Pustovalov <alexey.pustovalov@zabbix.com>"
ARG APT_FLAGS_COMMON="-qq -y"
ARG APT_FLAGS_PERSISTANT="${APT_FLAGS_COMMON} --no-install-recommends"

2
web-apache-mysql/alpine/Dockerfile

@ -1,5 +1,5 @@
FROM alpine:3.4
MAINTAINER Alexey Pustovalov <alexey.pustovalov@zabbix.com>
LABEL maintainer "Alexey Pustovalov <alexey.pustovalov@zabbix.com>"
ARG APK_FLAGS_COMMON="-q"
ARG APK_FLAGS_PERSISTANT="${APK_FLAGS_COMMON} --clean-protected --no-cache"

2
web-apache-mysql/ubuntu/Dockerfile

@ -1,5 +1,5 @@
FROM ubuntu:trusty
MAINTAINER Alexey Pustovalov <alexey.pustovalov@zabbix.com>
LABEL maintainer "Alexey Pustovalov <alexey.pustovalov@zabbix.com>"
ARG APT_FLAGS_COMMON="-qq -y"
ARG APT_FLAGS_PERSISTANT="${APT_FLAGS_COMMON} --no-install-recommends"

2
web-apache-pgsql/alpine/Dockerfile

@ -1,5 +1,5 @@
FROM alpine:3.4
MAINTAINER Alexey Pustovalov <alexey.pustovalov@zabbix.com>
LABEL maintainer "Alexey Pustovalov <alexey.pustovalov@zabbix.com>"
ARG APK_FLAGS_COMMON="-q"
ARG APK_FLAGS_PERSISTANT="${APK_FLAGS_COMMON} --clean-protected --no-cache"

2
web-apache-pgsql/ubuntu/Dockerfile

@ -1,5 +1,5 @@
FROM ubuntu:trusty
MAINTAINER Alexey Pustovalov <alexey.pustovalov@zabbix.com>
LABEL maintainer "Alexey Pustovalov <alexey.pustovalov@zabbix.com>"
ARG APT_FLAGS_COMMON="-qq -y"
ARG APT_FLAGS_PERSISTANT="${APT_FLAGS_COMMON} --no-install-recommends"

2
web-nginx-mysql/alpine/Dockerfile

@ -1,5 +1,5 @@
FROM alpine:3.4
MAINTAINER Alexey Pustovalov <alexey.pustovalov@zabbix.com>
LABEL maintainer "Alexey Pustovalov <alexey.pustovalov@zabbix.com>"
ARG APK_FLAGS_COMMON="-q"
ARG APK_FLAGS_PERSISTANT="${APK_FLAGS_COMMON} --clean-protected --no-cache"

1
web-nginx-mysql/alpine/conf/etc/nginx/nginx.conf

@ -47,6 +47,7 @@ http {
sendfile on;
client_max_body_size 8m;
client_body_buffer_size 256k;
fastcgi_intercept_errors on;
tcp_nopush on;

2
web-nginx-mysql/ubuntu/Dockerfile

@ -1,5 +1,5 @@
FROM ubuntu:trusty
MAINTAINER Alexey Pustovalov <alexey.pustovalov@zabbix.com>
LABEL maintainer "Alexey Pustovalov <alexey.pustovalov@zabbix.com>"
ARG APT_FLAGS_COMMON="-qq -y"
ARG APT_FLAGS_PERSISTANT="${APT_FLAGS_COMMON} --no-install-recommends"

1
web-nginx-mysql/ubuntu/conf/etc/nginx/nginx.conf

@ -47,6 +47,7 @@ http {
sendfile on;
client_max_body_size 8m;
client_body_buffer_size 256k;
fastcgi_intercept_errors on;
tcp_nopush on;

2
web-nginx-pgsql/alpine/Dockerfile

@ -1,5 +1,5 @@
FROM alpine:3.4
MAINTAINER Alexey Pustovalov <alexey.pustovalov@zabbix.com>
LABEL maintainer "Alexey Pustovalov <alexey.pustovalov@zabbix.com>"
ARG APK_FLAGS_COMMON="-q"
ARG APK_FLAGS_PERSISTANT="${APK_FLAGS_COMMON} --clean-protected --no-cache"

1
web-nginx-pgsql/alpine/conf/etc/nginx/nginx.conf

@ -47,6 +47,7 @@ http {
sendfile on;
client_max_body_size 8m;
client_body_buffer_size 256k;
fastcgi_intercept_errors on;
tcp_nopush on;

2
web-nginx-pgsql/ubuntu/Dockerfile

@ -1,5 +1,5 @@
FROM ubuntu:trusty
MAINTAINER Alexey Pustovalov <alexey.pustovalov@zabbix.com>
LABEL maintainer "Alexey Pustovalov <alexey.pustovalov@zabbix.com>"
ARG APT_FLAGS_COMMON="-qq -y"
ARG APT_FLAGS_PERSISTANT="${APT_FLAGS_COMMON} --no-install-recommends"

1
web-nginx-pgsql/ubuntu/conf/etc/nginx/nginx.conf

@ -47,6 +47,7 @@ http {
sendfile on;
client_max_body_size 8m;
client_body_buffer_size 256k;
fastcgi_intercept_errors on;
tcp_nopush on;