Merge branch 'master' of https://github.com/Neilpang/nginx-proxy
This commit is contained in:
commit
b145ff0de9
2 changed files with 6 additions and 6 deletions
|
|
@ -10,10 +10,6 @@ RUN apt-get update \
|
||||||
&& apt-get clean \
|
&& apt-get clean \
|
||||||
&& rm -r /var/lib/apt/lists/*
|
&& rm -r /var/lib/apt/lists/*
|
||||||
|
|
||||||
ENV AUTO_UPGRADE=1
|
|
||||||
ENV LE_WORKING_DIR=/acme.sh
|
|
||||||
ENV LE_CONFIG_HOME=/acmecerts
|
|
||||||
RUN wget -O- https://get.acme.sh | sh
|
|
||||||
|
|
||||||
# Configure Nginx and apply fix for very long server names
|
# Configure Nginx and apply fix for very long server names
|
||||||
RUN echo "daemon off;" >> /etc/nginx/nginx.conf \
|
RUN echo "daemon off;" >> /etc/nginx/nginx.conf \
|
||||||
|
|
@ -36,6 +32,11 @@ ENV DOCKER_HOST unix:///tmp/docker.sock
|
||||||
|
|
||||||
VOLUME ["/etc/nginx/certs"]
|
VOLUME ["/etc/nginx/certs"]
|
||||||
|
|
||||||
|
ENV AUTO_UPGRADE=1
|
||||||
|
ENV LE_WORKING_DIR=/acme.sh
|
||||||
|
ENV LE_CONFIG_HOME=/acmecerts
|
||||||
|
RUN wget -O- https://get.acme.sh | sh
|
||||||
|
|
||||||
VOLUME ["/acmecerts"]
|
VOLUME ["/acmecerts"]
|
||||||
EXPOSE 443
|
EXPOSE 443
|
||||||
|
|
||||||
|
|
|
||||||
3
Procfile
3
Procfile
|
|
@ -1,4 +1,3 @@
|
||||||
dockergen: docker-gen -watch -notify "/app/updatessl.sh updatessl" /app/nginx.tmpl /etc/nginx/conf.d/default.conf
|
dockergen: docker-gen -watch -notify "/app/updatessl.sh updatessl" /app/nginx.tmpl /etc/nginx/conf.d/default.conf
|
||||||
nginx: nginx
|
nginx: nginx
|
||||||
cron: cron && tail -f /dev/null
|
cron: cron -f
|
||||||
|
|
||||||
Loading…
Reference in a new issue