diff --git a/Dockerfile b/Dockerfile index 07863ee3d..cde82f190 100644 --- a/Dockerfile +++ b/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 diff --git a/binary_dependencies/nginx_1.9.5-1_amd64.deb b/binary_dependencies/nginx_1.9.5-1_amd64.deb deleted file mode 100644 index 3c459b96b..000000000 Binary files a/binary_dependencies/nginx_1.9.5-1_amd64.deb and /dev/null differ diff --git a/conf/http-base.conf b/conf/http-base.conf index 22f01aa52..7ceba1497 100644 --- a/conf/http-base.conf +++ b/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; diff --git a/conf/init/service/nginx/run b/conf/init/service/nginx/run index e5cc1aaac..aa5940682 100755 --- a/conf/init/service/nginx/run +++ b/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' \ No newline at end of file +echo 'Nginx exited'