From 9737d743e4530edfda5c214e3a5045fdac309dc4 Mon Sep 17 00:00:00 2001 From: aptalca Date: Fri, 17 Aug 2018 11:22:21 -0400 Subject: [PATCH 1/3] rebase to alpine 3.8 --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index be983ce..c0a97dc 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM lsiobase/alpine.nginx:3.7 +FROM lsiobase/alpine.nginx:3.8 # set version label ARG BUILD_DATE From 45ebbec29934d987347e0578107d826bfbee063a Mon Sep 17 00:00:00 2001 From: aptalca Date: Fri, 17 Aug 2018 11:26:07 -0400 Subject: [PATCH 2/3] inherit nginx.conf from baseimage --- root/defaults/nginx.conf | 98 ---------------------------------------- 1 file changed, 98 deletions(-) delete mode 100644 root/defaults/nginx.conf diff --git a/root/defaults/nginx.conf b/root/defaults/nginx.conf deleted file mode 100644 index 70e8488..0000000 --- a/root/defaults/nginx.conf +++ /dev/null @@ -1,98 +0,0 @@ -user abc; -worker_processes 4; -pid /run/nginx.pid; -include /etc/nginx/modules/*.conf; - -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 98da12c000e4140e8e3fcab9fc8ecf2455cd0c33 Mon Sep 17 00:00:00 2001 From: aptalca Date: Fri, 17 Aug 2018 11:34:06 -0400 Subject: [PATCH 3/3] Update README.md --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index 0999139..a08d7fb 100644 --- a/README.md +++ b/README.md @@ -81,6 +81,7 @@ Add your web files to /config/www for hosting. ## Versions ++ **17.08.18:** Rebase to alpine 3.8, inherit nginx.conf from nginx baseimage + **11.05.18:** Add php pgsql support + **19.04.18:** Bind memcached to localhost only, add php7-sqlite3 + **05.01.18:** Rebase to alpine 3.7