1.新增alpine版的nginx。2.一些其他优化

nginx/Dockerfile

@@ -1,35 +0,0 @@
-# #####
-# see also https://github.com/nginxinc/docker-nginx
-# #####
-FROM registry.cn-hangzhou.aliyuncs.com/kennylee/debian:jessie
-
-MAINTAINER kennylee26 <kennylee26@gmail.com>
-
-ENV NGINX_VERSION 1.11.9-1~jessie
-
-RUN apt-key adv --keyserver hkp://pgp.mit.edu:80 --recv-keys 573BFD6B3D8FBC641079A6ABABF5BD827BD9BF62 \
-	&& echo "deb http://nginx.org/packages/mainline/debian/ jessie nginx" >> /etc/apt/sources.list \
-	&& apt-get update \
-	&& apt-get install --no-install-recommends --no-install-suggests -y \
-						ca-certificates \
-						nginx=${NGINX_VERSION} \
-						nginx-module-xslt \
-						nginx-module-geoip \
-						nginx-module-image-filter \
-						nginx-module-perl \
-						nginx-module-njs \
-						gettext-base \
-	&& rm -rf /var/lib/apt/lists/*
-
-# forward request and error logs to docker log collector
-RUN ln -sf /dev/stdout /var/log/nginx/access.log \
-	&& ln -sf /dev/stderr /var/log/nginx/error.log
-
-ENV EGINX_HOME=/etc/nginx
-
-VOLUME ["/var/cache/nginx"]
-VOLUME /usr/share/nginx/html
-
-EXPOSE 80 443
-
-CMD ["nginx", "-g", "daemon off;"]

nginx/conf/conf.d/default.conf

@@ -1,44 +0,0 @@
-server {
-    listen       80;
-    server_name  localhost;
-
-    #charset koi8-r;
-    #access_log  /var/log/nginx/log/host.access.log  main;
-
-    location / {
-        root   /usr/share/nginx/html;
-        index  index.html index.htm;
-    }
-
-    #error_page  404              /404.html;
-
-    # redirect server error pages to the static page /50x.html
-    #
-    error_page   500 502 503 504  /50x.html;
-    location = /50x.html {
-        root   /usr/share/nginx/html;
-    }
-
-    # proxy the PHP scripts to Apache listening on 127.0.0.1:80
-    #
-    #location ~ \.php$ {
-    #    proxy_pass   http://127.0.0.1;
-    #}
-
-    # pass the PHP scripts to FastCGI server listening on 127.0.0.1:9000
-    #
-    #location ~ \.php$ {
-    #    root           html;
-    #    fastcgi_pass   127.0.0.1:9000;
-    #    fastcgi_index  index.php;
-    #    fastcgi_param  SCRIPT_FILENAME  /scripts$fastcgi_script_name;
-    #    include        fastcgi_params;
-    #}
-
-    # deny access to .htaccess files, if Apache's document root
-    # concurs with nginx's one
-    #
-    #location ~ /\.ht {
-    #    deny  all;
-    #}
-}

nginx/conf/nginx.conf

@@ -1,30 +0,0 @@
-user  nginx;
-worker_processes  1;
-
-error_log  /var/log/nginx/error.log warn;
-pid        /var/run/nginx.pid;
-
-events {
-    worker_connections  1024;
-}
-
-http {
-    include       /etc/nginx/mime.types;
-    default_type  application/octet-stream;
-
-    log_format  main  '$remote_addr - $remote_user [$time_local] "$request" '
-                      '$status $body_bytes_sent "$http_referer" '
-                      '"$http_user_agent" "$http_x_forwarded_for"';
-
-    access_log  /var/log/nginx/access.log  main;
-    
-    sendfile        on;
-
-    #tcp_nopush     on;
-    
-    keepalive_timeout  65;
-
-    #gzip  on;
-
-    include /etc/nginx/conf.d/*.conf;
-}

nginx/docker-compose.yml

@@ -1,12 +0,0 @@
-version: '2'
-services:
-    web:
-        image: registry.cn-hangzhou.aliyuncs.com/kennylee/nginx
-        container_name: "nginx"
-        ports:
-            - "80:80"
-        volumes:
-            - ./data/html/:/usr/share/nginx/html
-            - ./conf/nginx.conf:/etc/nginx/nginx.conf
-            - ./conf/conf.d/:/etc/nginx/conf.d/
-        restart: always