From 5f044fe5ed0c324f950158fa9b64f8020a282a75 Mon Sep 17 00:00:00 2001 From: aptalca Date: Thu, 22 Jun 2017 15:48:45 -0400 Subject: [PATCH 1/5] add various nginx modules --- Dockerfile | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/Dockerfile b/Dockerfile index 72200b9..37757d5 100644 --- a/Dockerfile +++ b/Dockerfile @@ -19,13 +19,17 @@ RUN \ nginx-mod-http-headers-more \ nginx-mod-http-image-filter \ nginx-mod-http-lua \ + nginx-mod-http-lua-upstream \ nginx-mod-http-nchan \ nginx-mod-http-perl \ + nginx-mod-http-redis2 \ + nginx-mod-http-set-misc \ nginx-mod-http-upload-progress \ nginx-mod-http-xslt-filter \ nginx-mod-mail \ nginx-mod-rtmp \ nginx-mod-stream \ + nginx-mod-stream-geoip \ nginx-vim \ php7-bz2 \ php7-ctype \ From 5c9f3514e6bf2fd9ecd25f42cf0598702bf18f8a Mon Sep 17 00:00:00 2001 From: aptalca Date: Thu, 22 Jun 2017 15:56:46 -0400 Subject: [PATCH 2/5] enable nginx dynamic modules --- root/defaults/nginx.conf | 116 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 116 insertions(+) create mode 100644 root/defaults/nginx.conf diff --git a/root/defaults/nginx.conf b/root/defaults/nginx.conf new file mode 100644 index 0000000..3042f8d --- /dev/null +++ b/root/defaults/nginx.conf @@ -0,0 +1,116 @@ +user abc; +worker_processes 4; +pid /run/nginx.pid; + +load_module modules/ndk_http_module.so; +load_module modules/ngx_http_echo_module.so; +load_module modules/ngx_http_fancyindex_module.so; +load_module modules/ngx_http_geoip_module.so; +load_module modules/ngx_http_headers_more_filter_module.so; +load_module modules/ngx_http_image_filter_module.so; +load_module modules/ngx_http_lua_module.so; +load_module modules/ngx_http_lua_upstream_module.so; +load_module modules/ngx_http_perl_module.so; +load_module modules/ngx_http_redis2_module.so; +load_module modules/ngx_http_set_misc_module.so: +load_module modules/ngx_http_uploadprogress_module.so; +load_module modules/ngx_http_xslt_filter_module.so; +load_module modules/ngx_mail_module.so; +load_module modules/ngx_nchan_module.so; +load_module modules/ngx_rtmp_module.so; +load_module modules/ngx_stream_module.so; +load_module modules/ngx_stream_geoip_module.so; + +events { + worker_connections 768; + # multi_accept on; +} + +http { + + ## + # Basic Settings + ## + + sendfile on; + tcp_nopush on; + tcp_nodelay on; + keepalive_timeout 65; + types_hash_max_size 2048; + # server_tokens off; + + # server_names_hash_bucket_size 64; + # server_name_in_redirect off; + + client_max_body_size 0; + + include /etc/nginx/mime.types; + default_type application/octet-stream; + + ## + # Logging Settings + ## + + access_log /config/log/nginx/access.log; + error_log /config/log/nginx/error.log; + + ## + # Gzip Settings + ## + + gzip on; + gzip_disable "msie6"; + + # gzip_vary on; + # gzip_proxied any; + # gzip_comp_level 6; + # gzip_buffers 16 8k; + # gzip_http_version 1.1; + # gzip_types text/plain text/css application/json application/x-javascript text/xml application/xml application/xml+rss text/javascript; + + ## + # nginx-naxsi config + ## + # Uncomment it if you installed nginx-naxsi + ## + + #include /etc/nginx/naxsi_core.rules; + + ## + # nginx-passenger config + ## + # Uncomment it if you installed nginx-passenger + ## + + #passenger_root /usr; + #passenger_ruby /usr/bin/ruby; + + ## + # Virtual Host Configs + ## + include /etc/nginx/conf.d/*.conf; + include /config/nginx/site-confs/*; +} + + +#mail { +# # See sample authentication script at: +# # http://wiki.nginx.org/ImapAuthenticateWithApachePhpScript +# +# # auth_http localhost/auth.php; +# # pop3_capabilities "TOP" "USER"; +# # imap_capabilities "IMAP4rev1" "UIDPLUS"; +# +# server { +# listen localhost:110; +# protocol pop3; +# proxy on; +# } +# +# server { +# listen localhost:143; +# protocol imap; +# proxy on; +# } +#} +daemon off; From 856daee4a26d8aa4d34213abf3e8c87eb12940a0 Mon Sep 17 00:00:00 2001 From: aptalca Date: Thu, 22 Jun 2017 16:45:48 -0400 Subject: [PATCH 3/5] typo --- root/defaults/nginx.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/root/defaults/nginx.conf b/root/defaults/nginx.conf index 3042f8d..1bb9bf0 100644 --- a/root/defaults/nginx.conf +++ b/root/defaults/nginx.conf @@ -12,7 +12,7 @@ load_module modules/ngx_http_lua_module.so; load_module modules/ngx_http_lua_upstream_module.so; load_module modules/ngx_http_perl_module.so; load_module modules/ngx_http_redis2_module.so; -load_module modules/ngx_http_set_misc_module.so: +load_module modules/ngx_http_set_misc_module.so; load_module modules/ngx_http_uploadprogress_module.so; load_module modules/ngx_http_xslt_filter_module.so; load_module modules/ngx_mail_module.so; From a149b1181c6cdb6abbebd4614124d6837040e9db Mon Sep 17 00:00:00 2001 From: aptalca Date: Thu, 22 Jun 2017 16:56:25 -0400 Subject: [PATCH 4/5] Update README.md --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index c21f4f3..527af86 100644 --- a/README.md +++ b/README.md @@ -81,6 +81,7 @@ Add your web files to /config/www for hosting. ## Versions ++ **22.06.17:** Add various nginx modules and enable all modules in the default nginx.conf + **05.06.17:** Add php7-bz2 + **25.05.17:** Rebase to alpine 3.6. + **18.04.17:** Add php7-sockets From c8886b4d6f4731abb9aef64a9d84f6266514a159 Mon Sep 17 00:00:00 2001 From: aptalca Date: Mon, 26 Jun 2017 16:59:25 -0400 Subject: [PATCH 5/5] add php7-zip --- Dockerfile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 37757d5..74ea027 100644 --- a/Dockerfile +++ b/Dockerfile @@ -43,4 +43,5 @@ RUN \ php7-pdo_mysql \ php7-pdo_sqlite \ php7-sockets \ - php7-xml + php7-xml \ + php7-zip