From 6a150e5ba2a0c390e09078154f8d08dbf1d621d9 Mon Sep 17 00:00:00 2001
From: Clark Zhao <clark.zhao@daocloud.io>
Date: Fri, 31 Mar 2017 10:41:11 +0800
Subject: update

---
 Dockerfile | 29 +++++++++++++++--------------
 circle.yml | 25 ++++++++++++-------------
 nginx.conf |  4 ++--
 3 files changed, 29 insertions(+), 29 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 6d08c10..c752725 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -9,25 +9,27 @@ RUN \
   apt-get install -y -qq git wget build-essential zlib1g-dev libpcre3-dev git gcc g++ make && \
   rm -rf /var/lib/apt/lists/*
 
+ENV NGINX_VERSION=1.11.9 PCRE_VERSION=8.40 OPENSSL_VERSION=1.1.0e ZLIB_VERSION=1.2.11
+
 # Get Source Code
 RUN \
-  wget "http://nginx.org/download/nginx-1.11.9.tar.gz" && \
-  wget "http://linux.stanford.edu/pub/exim/pcre/pcre-8.40.tar.gz" && \
-  wget "https://www.openssl.org/source/openssl-1.1.0e.tar.gz" && \
-  wget "http://zlib.net/zlib-1.2.11.tar.gz" && \
+  wget "http://nginx.org/download/nginx-${NGINX_VERSION}.tar.gz" && \
+  wget "http://linux.stanford.edu/pub/exim/pcre/pcre-${PCRE_VERSION}.tar.gz" && \
+  wget "https://www.openssl.org/source/openssl-${OPENSSL_VERSION}.tar.gz" && \
+  wget "http://zlib.net/zlib-${ZLIB_VERSION}.tar.gz" && \
   git clone https://github.com/cuber/ngx_http_google_filter_module && \
   git clone https://github.com/yaoweibin/ngx_http_substitutions_filter_module && \
-  tar xzf nginx-1.11.9.tar.gz && \
-  tar xzf pcre-8.40.tar.gz && \
-  tar xzf openssl-1.1.0e.tar.gz && \
-  tar xzf zlib-1.2.11.tar.gz
+  tar xzf nginx-${NGINX_VERSION}.tar.gz && \
+  tar xzf pcre-${PCRE_VERSION}.tar.gz && \
+  tar xzf openssl-${OPENSSL_VERSION}.tar.gz && \
+  tar xzf zlib-${ZLIB_VERSION}.tar.gz
 
 ADD ./nginx.service /etc/init.d/nginx
 ADD ./nginx.conf /etc/nginx/nginx.conf
 
 # Install Nginx
 RUN \
-  cd nginx-1.11.9 && \
+  cd nginx-${NGINX_VERSION} && \
   ./configure --prefix=/etc/nginx  \
               --sbin-path=/usr/sbin/nginx  \
               --conf-path=/etc/nginx/nginx.conf  \
@@ -64,9 +66,9 @@ RUN \
               --with-file-aio  \
               --with-http_v2_module  \
               --with-ipv6  \
-              --with-pcre=../pcre-8.40 \
-              --with-openssl=../openssl-1.1.0e  \
-              --with-zlib=../zlib-1.2.11  \
+              --with-pcre=../pcre-${PCRE_VERSION} \
+              --with-openssl=../openssl-${OPENSSL_VERSION}  \
+              --with-zlib=../zlib-${ZLIB_VERSION}  \
               --add-module=../ngx_http_google_filter_module  \
               --add-module=../ngx_http_substitutions_filter_module && \
   make -j4 && \
@@ -78,7 +80,6 @@ RUN \
   mkdir -p /var/cache/nginx
 
 EXPOSE 80
-EXPOSE 443
 
 # Run Nginx
-CMD service nginx start && tail -F /var/log/nginx/access.log
+CMD ["nginx", "-g", "daemon off;"]
diff --git a/circle.yml b/circle.yml
index 60800d8..6778cbf 100644
--- a/circle.yml
+++ b/circle.yml
@@ -1,13 +1,12 @@
-machine:
-  services:
-    - docker
-
-dependencies:
-  override:
-    - docker info
-    - docker build -t nginx-proxy-google .
-
-test:
-  override:
-    - docker run -d -p 8080:80 nginx-proxy-google; sleep 10
-
+machine:
+  services:
+    - docker
+
+dependencies:
+  override:
+    - docker info
+    - docker build -t nginx-proxy-google .
+
+test:
+  override:
+    - docker run -d -p 8080:80 nginx-proxy-google; sleep 10
diff --git a/nginx.conf b/nginx.conf
index 2b5da16..8d796d0 100644
--- a/nginx.conf
+++ b/nginx.conf
@@ -1,5 +1,5 @@
 user  nginx;
-worker_processes  1;
+worker_processes auto;
 
 events {
     worker_connections  1024;
@@ -28,4 +28,4 @@ http {
             root   html;
         }
     }
-}
\ No newline at end of file
+}
-- 
cgit v1.2.3