nginx: use upstream ubuntu package (#1546)

Ubuntu 16.04 LTS has a newer version than what we compile.

Dockerfile

@@ -27,6 +27,7 @@ RUN apt-get install -y \
      libpq5            \
      libsasl2-dev      \
      libsasl2-modules  \
+     nginx             \
      nodejs            \
      npm               \
      python-dev        \
@@ -46,10 +47,6 @@ RUN cat requirements.txt | grep -v "^-e" | awk -F'==' '{print $1}' | xargs venv/
     test -z $(cat pipinfo.txt | grep GPL | grep -v LGPL) && \
     rm pipinfo.txt
 
-# Install the binary dependencies
-ADD binary_dependencies binary_dependencies
-RUN gdebi --n binary_dependencies/*.deb
-
 # Install cfssl
 RUN mkdir /gocode
 ENV GOPATH /gocode
@@ -99,7 +96,7 @@ RUN rm -rf /etc/service/syslog-forwarder
 RUN mkdir static/fonts static/ldn
 ADD external_libraries.py external_libraries.py
 RUN venv/bin/python -m external_libraries
-RUN mkdir /usr/local/nginx/logs/
+RUN mkdir -p /usr/local/nginx/logs/
 
 # TODO(ssewell): only works on a detached head, make work with ref
 ADD .git/HEAD GIT_HEAD

conf/http-base.conf

@@ -9,7 +9,7 @@ log_format lb_pp '$remote_addr ($proxy_protocol_addr) '
                   '($request_time $request_length $upstream_response_time)';
 
 types_hash_max_size 2048;
-include /usr/local/nginx/conf/mime.types.default;
+include /etc/nginx/mime.types;
 
 default_type application/octet-stream;
 access_log /dev/stdout;

conf/init/service/nginx/run

@@ -5,10 +5,10 @@ echo 'Starting nginx'
 if [ -f /conf/stack/ssl.key ]
 then
   echo "Using HTTPS"
-  /usr/local/nginx/sbin/nginx -c /conf/nginx.conf
+  /usr/sbin/nginx -c /conf/nginx.conf
 else
   echo "No SSL key provided, using HTTP"
-  /usr/local/nginx/sbin/nginx -c /conf/nginx-nossl.conf
+  /usr/sbin/nginx -c /conf/nginx-nossl.conf
 fi
 
-echo 'Nginx exited'
+echo 'Nginx exited'