nginx: use upstream ubuntu package (#1546)
Ubuntu 16.04 LTS has a newer version than what we compile.
This commit is contained in:
parent
a33a70a419
commit
d599406140
4 changed files with 6 additions and 9 deletions
|
@ -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
|
||||
|
|
Reference in a new issue