Skip to content

Commit 1ace3ed

Browse files
committed
strip comments. add some more php extensions.
1 parent 07a3099 commit 1ace3ed

File tree

8 files changed

+13
-915
lines changed

8 files changed

+13
-915
lines changed

base/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
FROM ubuntu:16.04
22

3-
MAINTAINER Kotliar Maksym kotlyar.maksim@gmail.com
3+
MAINTAINER Maksim Kotliar <kotlyar.maksim@gmail.com>
44

55
RUN apt-get update && \
66
apt-get install -y --no-install-recommends --no-install-suggests nginx php php-fpm ca-certificates gettext && \

base/entrypoint.sh

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,6 @@ export PHP_FPM_CONF=${PHP_FPM_CONF:-'/etc/php/7.0/fpm/php-fpm.conf'}
1515
envsubst '${NGINX_WEB_ROOT} ${NGINX_PHP_FALLBACK} ${NGINX_PHP_LOCATION} ${NGINX_USER} ${NGINX_CONF} ${PHP_SOCK_FILE} ${PHP_USER} ${PHP_GROUP} ${PHP_MODE} ${PHP_FPM_CONF}' < /tmp/nginx.conf.tpl > $NGINX_CONF
1616
envsubst '${NGINX_WEB_ROOT} ${NGINX_PHP_FALLBACK} ${NGINX_PHP_LOCATION} ${NGINX_USER} ${NGINX_CONF} ${PHP_SOCK_FILE} ${PHP_USER} ${PHP_GROUP} ${PHP_MODE} ${PHP_FPM_CONF}' < /tmp/php-fpm.conf.tpl > $PHP_FPM_CONF
1717

18-
cat $NGINX_CONF
19-
#cat $PHP_FPM_CONF
20-
2118
TRAPPED_SIGNAL=false
2219

2320
echo 'Starting NGINX';

base/nginx.conf.tpl

Lines changed: 2 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -4,88 +4,45 @@ pid /run/nginx.pid;
44

55
events {
66
worker_connections 768;
7-
# multi_accept on;
87
}
98

109
http {
1110
12-
##
13-
# Basic Settings
14-
##
15-
1611
sendfile on;
1712
tcp_nopush on;
1813
tcp_nodelay on;
1914
keepalive_timeout 65;
2015
types_hash_max_size 2048;
21-
# server_tokens off;
22-
23-
# server_names_hash_bucket_size 64;
24-
# server_name_in_redirect off;
2516
2617
include /etc/nginx/mime.types;
2718
default_type application/octet-stream;
2819
29-
##
30-
# SSL Settings
31-
##
32-
3320
ssl_protocols TLSv1 TLSv1.1 TLSv1.2; # Dropping SSLv3, ref: POODLE
3421
ssl_prefer_server_ciphers on;
3522
36-
##
37-
# Logging Settings
38-
##
39-
4023
access_log /var/log/nginx/access.log;
4124
error_log /var/log/nginx/error.log;
4225
43-
##
44-
# Gzip Settings
45-
##
46-
4726
gzip on;
4827
gzip_disable "msie6";
4928
50-
# gzip_vary on;
51-
# gzip_proxied any;
52-
# gzip_comp_level 6;
53-
# gzip_buffers 16 8k;
54-
# gzip_http_version 1.1;
55-
# gzip_types text/plain text/css application/json application/javascript text/xml application/xml application/xml+rss text/javascript;
56-
57-
##
58-
# Virtual Host Configs
59-
##
60-
6129
include /etc/nginx/conf.d/*.conf;
62-
include /etc/nginx/sites-enabled/*;
30+
#include /etc/nginx/sites-enabled/*;
6331
6432
server {
6533
listen 80 default_server;
6634
root $NGINX_WEB_ROOT;
6735
6836
location / {
69-
# try to serve file directly, fallback to app.php
7037
try_files $uri $NGINX_PHP_FALLBACK$is_args$args;
7138
}
72-
# PROD
7339
location ~ $NGINX_PHP_LOCATION {
7440
fastcgi_pass unix:$PHP_SOCK_FILE;
7541
fastcgi_split_path_info ^(.+\.php)(/.*)$;
7642
include fastcgi_params;
77-
# When you are using symlinks to link the document root to the
78-
# current version of your application, you should pass the real
79-
# application path instead of the path to the symlink to PHP
80-
# FPM.
81-
# Otherwise, PHP's OPcache may not properly detect changes to
82-
# your PHP files (see https://github.com/zendtech/ZendOptimizerPlus/issues/126
83-
# for more information).
8443
fastcgi_param SCRIPT_FILENAME $realpath_root$fastcgi_script_name;
8544
fastcgi_param DOCUMENT_ROOT $realpath_root;
86-
# Prevents URIs that include the front controller. This will 404:
87-
# http://domain.tld/app.php/some-path
88-
# Remove the internal directive to allow URIs like this
45+
8946
internal;
9047
}
9148

0 commit comments

Comments
 (0)