vbatts/quay
Archived
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

nginx: use upstream ubuntu package (#1546)

Browse source 
Ubuntu 16.04 LTS has a newer version than what we compile.
This commit is contained in:
Jimmy Zelinskie 2016-06-16 13:51:04 -04:00 committed by GitHub
parent a33a70a419
commit d599406140
4 changed files with 6 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
Dockerfile
View file

@ -27,6 +27,7 @@ RUN apt-get install -y \
libpq5 \ libpq5 \
libsasl2-dev \ libsasl2-dev \
libsasl2-modules \ libsasl2-modules \
nginx \
nodejs \ nodejs \
npm \ npm \
python-dev \ 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) && \ test -z $(cat pipinfo.txt | grep GPL | grep -v LGPL) && \
rm pipinfo.txt rm pipinfo.txt
# Install the binary dependencies
ADD binary_dependencies binary_dependencies
RUN gdebi --n binary_dependencies/*.deb
# Install cfssl # Install cfssl
RUN mkdir /gocode RUN mkdir /gocode
ENV GOPATH /gocode ENV GOPATH /gocode
@ -99,7 +96,7 @@ RUN rm -rf /etc/service/syslog-forwarder
RUN mkdir static/fonts static/ldn RUN mkdir static/fonts static/ldn
ADD external_libraries.py external_libraries.py ADD external_libraries.py external_libraries.py
RUN venv/bin/python -m external_libraries 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 # TODO(ssewell): only works on a detached head, make work with ref
ADD .git/HEAD GIT_HEAD ADD .git/HEAD GIT_HEAD

BIN
binary_dependencies/nginx_1.9.5-1_amd64.deb
View file

Binary file not shown.

2
conf/http-base.conf
View file

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

6
conf/init/service/nginx/run
View file

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