From fa1542a14ebcbafdfda0f062eb0b98826d1f716e Mon Sep 17 00:00:00 2001 From: dotneft Date: Thu, 27 Apr 2017 09:32:34 -0700 Subject: [PATCH 1/2] Changed maintainer to new format --- agent/alpine/Dockerfile | 2 +- agent/ubuntu/Dockerfile | 2 +- java-gateway/alpine/Dockerfile | 2 +- java-gateway/ubuntu/Dockerfile | 2 +- proxy-mysql/alpine/Dockerfile | 2 +- proxy-mysql/ubuntu/Dockerfile | 2 +- proxy-sqlite3/alpine/Dockerfile | 2 +- proxy-sqlite3/ubuntu/Dockerfile | 2 +- server-mysql/alpine/Dockerfile | 2 +- server-mysql/ubuntu/Dockerfile | 2 +- server-pgsql/alpine/Dockerfile | 2 +- server-pgsql/ubuntu/Dockerfile | 2 +- snmptraps/ubuntu/Dockerfile | 2 +- web-apache-mysql/alpine/Dockerfile | 2 +- web-apache-mysql/ubuntu/Dockerfile | 2 +- web-apache-pgsql/alpine/Dockerfile | 2 +- web-apache-pgsql/ubuntu/Dockerfile | 2 +- web-nginx-mysql/alpine/Dockerfile | 2 +- web-nginx-mysql/ubuntu/Dockerfile | 2 +- web-nginx-pgsql/alpine/Dockerfile | 2 +- web-nginx-pgsql/ubuntu/Dockerfile | 2 +- 21 files changed, 21 insertions(+), 21 deletions(-) diff --git a/agent/alpine/Dockerfile b/agent/alpine/Dockerfile index db010b87e..a37580a70 100644 --- a/agent/alpine/Dockerfile +++ b/agent/alpine/Dockerfile @@ -1,5 +1,5 @@ FROM alpine:3.4 -MAINTAINER Alexey Pustovalov +LABEL maintainer "Alexey Pustovalov " ARG APK_FLAGS_COMMON="-q" ARG APK_FLAGS_PERSISTANT="${APK_FLAGS_COMMON} --clean-protected --no-cache" diff --git a/agent/ubuntu/Dockerfile b/agent/ubuntu/Dockerfile index fb2401ec6..f18d0ad8e 100644 --- a/agent/ubuntu/Dockerfile +++ b/agent/ubuntu/Dockerfile @@ -1,5 +1,5 @@ FROM ubuntu:trusty -MAINTAINER Alexey Pustovalov +LABEL maintainer "Alexey Pustovalov " ARG APT_FLAGS_COMMON="-qq -y" ARG APT_FLAGS_PERSISTANT="${APT_FLAGS_COMMON} --no-install-recommends" diff --git a/java-gateway/alpine/Dockerfile b/java-gateway/alpine/Dockerfile index 5ef55001e..1a8bffafa 100644 --- a/java-gateway/alpine/Dockerfile +++ b/java-gateway/alpine/Dockerfile @@ -1,5 +1,5 @@ FROM alpine:3.4 -MAINTAINER Alexey Pustovalov +LABEL maintainer "Alexey Pustovalov " ARG APK_FLAGS_COMMON="-q" ARG APK_FLAGS_PERSISTANT="${APK_FLAGS_COMMON} --clean-protected --no-cache" diff --git a/java-gateway/ubuntu/Dockerfile b/java-gateway/ubuntu/Dockerfile index 18aa99033..78ebc9752 100644 --- a/java-gateway/ubuntu/Dockerfile +++ b/java-gateway/ubuntu/Dockerfile @@ -1,5 +1,5 @@ FROM ubuntu:trusty -MAINTAINER Alexey Pustovalov +LABEL maintainer "Alexey Pustovalov " ARG APT_FLAGS_COMMON="-qq -y" ARG APT_FLAGS_PERSISTANT="${APT_FLAGS_COMMON} --no-install-recommends" diff --git a/proxy-mysql/alpine/Dockerfile b/proxy-mysql/alpine/Dockerfile index a60cd4a2e..8a72036c9 100644 --- a/proxy-mysql/alpine/Dockerfile +++ b/proxy-mysql/alpine/Dockerfile @@ -1,5 +1,5 @@ FROM alpine:3.4 -MAINTAINER Alexey Pustovalov +LABEL maintainer "Alexey Pustovalov " ARG APK_FLAGS_COMMON="-q" ARG APK_FLAGS_PERSISTANT="${APK_FLAGS_COMMON} --clean-protected --no-cache" diff --git a/proxy-mysql/ubuntu/Dockerfile b/proxy-mysql/ubuntu/Dockerfile index 5ac42f8e4..a17e53a7f 100644 --- a/proxy-mysql/ubuntu/Dockerfile +++ b/proxy-mysql/ubuntu/Dockerfile @@ -1,5 +1,5 @@ FROM ubuntu:trusty -MAINTAINER Alexey Pustovalov +LABEL maintainer "Alexey Pustovalov " ARG APT_FLAGS_COMMON="-qq -y" ARG APT_FLAGS_PERSISTANT="${APT_FLAGS_COMMON} --no-install-recommends" diff --git a/proxy-sqlite3/alpine/Dockerfile b/proxy-sqlite3/alpine/Dockerfile index 23060ca5a..31b841729 100644 --- a/proxy-sqlite3/alpine/Dockerfile +++ b/proxy-sqlite3/alpine/Dockerfile @@ -1,5 +1,5 @@ FROM alpine:3.4 -MAINTAINER Alexey Pustovalov +LABEL maintainer "Alexey Pustovalov " ARG APK_FLAGS_COMMON="-q" ARG APK_FLAGS_PERSISTANT="${APK_FLAGS_COMMON} --clean-protected --no-cache" diff --git a/proxy-sqlite3/ubuntu/Dockerfile b/proxy-sqlite3/ubuntu/Dockerfile index 3e57df8e8..ee5b9d953 100644 --- a/proxy-sqlite3/ubuntu/Dockerfile +++ b/proxy-sqlite3/ubuntu/Dockerfile @@ -1,5 +1,5 @@ FROM ubuntu:trusty -MAINTAINER Alexey Pustovalov +LABEL maintainer "Alexey Pustovalov " ARG APT_FLAGS_COMMON="-qq -y" ARG APT_FLAGS_PERSISTANT="${APT_FLAGS_COMMON} --no-install-recommends" diff --git a/server-mysql/alpine/Dockerfile b/server-mysql/alpine/Dockerfile index dd39a6d58..df36644d9 100644 --- a/server-mysql/alpine/Dockerfile +++ b/server-mysql/alpine/Dockerfile @@ -1,5 +1,5 @@ FROM alpine:3.4 -MAINTAINER Alexey Pustovalov +LABEL maintainer "Alexey Pustovalov " ARG APK_FLAGS_COMMON="-q" ARG APK_FLAGS_PERSISTANT="${APK_FLAGS_COMMON} --clean-protected --no-cache" diff --git a/server-mysql/ubuntu/Dockerfile b/server-mysql/ubuntu/Dockerfile index 0d03e6142..f01cedd69 100644 --- a/server-mysql/ubuntu/Dockerfile +++ b/server-mysql/ubuntu/Dockerfile @@ -1,5 +1,5 @@ FROM ubuntu:trusty -MAINTAINER Alexey Pustovalov +LABEL maintainer "Alexey Pustovalov " ARG APT_FLAGS_COMMON="-qq -y" ARG APT_FLAGS_PERSISTANT="${APT_FLAGS_COMMON} --no-install-recommends" diff --git a/server-pgsql/alpine/Dockerfile b/server-pgsql/alpine/Dockerfile index e54f47498..9cc3d6610 100644 --- a/server-pgsql/alpine/Dockerfile +++ b/server-pgsql/alpine/Dockerfile @@ -1,5 +1,5 @@ FROM alpine:3.4 -MAINTAINER Alexey Pustovalov +LABEL maintainer "Alexey Pustovalov " ARG APK_FLAGS_COMMON="-q" ARG APK_FLAGS_PERSISTANT="${APK_FLAGS_COMMON} --clean-protected --no-cache" diff --git a/server-pgsql/ubuntu/Dockerfile b/server-pgsql/ubuntu/Dockerfile index d1982362d..ceaee76ed 100644 --- a/server-pgsql/ubuntu/Dockerfile +++ b/server-pgsql/ubuntu/Dockerfile @@ -1,5 +1,5 @@ FROM ubuntu:trusty -MAINTAINER Alexey Pustovalov +LABEL maintainer "Alexey Pustovalov " ARG APT_FLAGS_COMMON="-qq -y" ARG APT_FLAGS_PERSISTANT="${APT_FLAGS_COMMON} --no-install-recommends" diff --git a/snmptraps/ubuntu/Dockerfile b/snmptraps/ubuntu/Dockerfile index cc6ce3588..ceebe46fe 100644 --- a/snmptraps/ubuntu/Dockerfile +++ b/snmptraps/ubuntu/Dockerfile @@ -1,5 +1,5 @@ FROM ubuntu:trusty -MAINTAINER Alexey Pustovalov +LABEL maintainer "Alexey Pustovalov " ARG APT_FLAGS_COMMON="-qq -y" ARG APT_FLAGS_PERSISTANT="${APT_FLAGS_COMMON} --no-install-recommends" diff --git a/web-apache-mysql/alpine/Dockerfile b/web-apache-mysql/alpine/Dockerfile index 5a5c3ba54..5c1599151 100644 --- a/web-apache-mysql/alpine/Dockerfile +++ b/web-apache-mysql/alpine/Dockerfile @@ -1,5 +1,5 @@ FROM alpine:3.4 -MAINTAINER Alexey Pustovalov +LABEL maintainer "Alexey Pustovalov " ARG APK_FLAGS_COMMON="-q" ARG APK_FLAGS_PERSISTANT="${APK_FLAGS_COMMON} --clean-protected --no-cache" diff --git a/web-apache-mysql/ubuntu/Dockerfile b/web-apache-mysql/ubuntu/Dockerfile index ae3e88ee7..3431e8bf5 100644 --- a/web-apache-mysql/ubuntu/Dockerfile +++ b/web-apache-mysql/ubuntu/Dockerfile @@ -1,5 +1,5 @@ FROM ubuntu:trusty -MAINTAINER Alexey Pustovalov +LABEL maintainer "Alexey Pustovalov " ARG APT_FLAGS_COMMON="-qq -y" ARG APT_FLAGS_PERSISTANT="${APT_FLAGS_COMMON} --no-install-recommends" diff --git a/web-apache-pgsql/alpine/Dockerfile b/web-apache-pgsql/alpine/Dockerfile index 2070514d0..a623f3390 100644 --- a/web-apache-pgsql/alpine/Dockerfile +++ b/web-apache-pgsql/alpine/Dockerfile @@ -1,5 +1,5 @@ FROM alpine:3.4 -MAINTAINER Alexey Pustovalov +LABEL maintainer "Alexey Pustovalov " ARG APK_FLAGS_COMMON="-q" ARG APK_FLAGS_PERSISTANT="${APK_FLAGS_COMMON} --clean-protected --no-cache" diff --git a/web-apache-pgsql/ubuntu/Dockerfile b/web-apache-pgsql/ubuntu/Dockerfile index 4b887f744..8c9ea2c6a 100644 --- a/web-apache-pgsql/ubuntu/Dockerfile +++ b/web-apache-pgsql/ubuntu/Dockerfile @@ -1,5 +1,5 @@ FROM ubuntu:trusty -MAINTAINER Alexey Pustovalov +LABEL maintainer "Alexey Pustovalov " ARG APT_FLAGS_COMMON="-qq -y" ARG APT_FLAGS_PERSISTANT="${APT_FLAGS_COMMON} --no-install-recommends" diff --git a/web-nginx-mysql/alpine/Dockerfile b/web-nginx-mysql/alpine/Dockerfile index 75d7b40bb..2d41b97a8 100644 --- a/web-nginx-mysql/alpine/Dockerfile +++ b/web-nginx-mysql/alpine/Dockerfile @@ -1,5 +1,5 @@ FROM alpine:3.4 -MAINTAINER Alexey Pustovalov +LABEL maintainer "Alexey Pustovalov " ARG APK_FLAGS_COMMON="-q" ARG APK_FLAGS_PERSISTANT="${APK_FLAGS_COMMON} --clean-protected --no-cache" diff --git a/web-nginx-mysql/ubuntu/Dockerfile b/web-nginx-mysql/ubuntu/Dockerfile index f9ceb4ea3..f98fa4d6c 100644 --- a/web-nginx-mysql/ubuntu/Dockerfile +++ b/web-nginx-mysql/ubuntu/Dockerfile @@ -1,5 +1,5 @@ FROM ubuntu:trusty -MAINTAINER Alexey Pustovalov +LABEL maintainer "Alexey Pustovalov " ARG APT_FLAGS_COMMON="-qq -y" ARG APT_FLAGS_PERSISTANT="${APT_FLAGS_COMMON} --no-install-recommends" diff --git a/web-nginx-pgsql/alpine/Dockerfile b/web-nginx-pgsql/alpine/Dockerfile index 6cf38b878..1b5a243e8 100644 --- a/web-nginx-pgsql/alpine/Dockerfile +++ b/web-nginx-pgsql/alpine/Dockerfile @@ -1,5 +1,5 @@ FROM alpine:3.4 -MAINTAINER Alexey Pustovalov +LABEL maintainer "Alexey Pustovalov " ARG APK_FLAGS_COMMON="-q" ARG APK_FLAGS_PERSISTANT="${APK_FLAGS_COMMON} --clean-protected --no-cache" diff --git a/web-nginx-pgsql/ubuntu/Dockerfile b/web-nginx-pgsql/ubuntu/Dockerfile index 49ecfb9fa..cd19dbed9 100644 --- a/web-nginx-pgsql/ubuntu/Dockerfile +++ b/web-nginx-pgsql/ubuntu/Dockerfile @@ -1,5 +1,5 @@ FROM ubuntu:trusty -MAINTAINER Alexey Pustovalov +LABEL maintainer "Alexey Pustovalov " ARG APT_FLAGS_COMMON="-qq -y" ARG APT_FLAGS_PERSISTANT="${APT_FLAGS_COMMON} --no-install-recommends" From 40ff7352797e49aadf3dd7b3bc59b22fe9992e5a Mon Sep 17 00:00:00 2001 From: dotneft Date: Thu, 27 Apr 2017 09:36:50 -0700 Subject: [PATCH 2/2] Updated buffer size for reading client request body for Nginx based images --- web-nginx-mysql/alpine/conf/etc/nginx/nginx.conf | 1 + web-nginx-mysql/ubuntu/conf/etc/nginx/nginx.conf | 1 + web-nginx-pgsql/alpine/conf/etc/nginx/nginx.conf | 1 + web-nginx-pgsql/ubuntu/conf/etc/nginx/nginx.conf | 1 + 4 files changed, 4 insertions(+) diff --git a/web-nginx-mysql/alpine/conf/etc/nginx/nginx.conf b/web-nginx-mysql/alpine/conf/etc/nginx/nginx.conf index 26e4a28b7..6e1ae33ce 100644 --- a/web-nginx-mysql/alpine/conf/etc/nginx/nginx.conf +++ b/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; diff --git a/web-nginx-mysql/ubuntu/conf/etc/nginx/nginx.conf b/web-nginx-mysql/ubuntu/conf/etc/nginx/nginx.conf index 9ad0fb4db..b263fb42a 100644 --- a/web-nginx-mysql/ubuntu/conf/etc/nginx/nginx.conf +++ b/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; diff --git a/web-nginx-pgsql/alpine/conf/etc/nginx/nginx.conf b/web-nginx-pgsql/alpine/conf/etc/nginx/nginx.conf index 26e4a28b7..6e1ae33ce 100644 --- a/web-nginx-pgsql/alpine/conf/etc/nginx/nginx.conf +++ b/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; diff --git a/web-nginx-pgsql/ubuntu/conf/etc/nginx/nginx.conf b/web-nginx-pgsql/ubuntu/conf/etc/nginx/nginx.conf index 9ad0fb4db..b263fb42a 100644 --- a/web-nginx-pgsql/ubuntu/conf/etc/nginx/nginx.conf +++ b/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;