diff --git a/nginx/README.md b/nginx/README.md index fe56079..710dea2 100644 --- a/nginx/README.md +++ b/nginx/README.md @@ -3,6 +3,11 @@ About as simple as it gets, nginx installed on debian:jessie. Use this if your app is based on debian:jessie also, so they can share base. +## Versions + +- `latest`: installs latest debian.org package +- `stable`: installs `stable` package from nginx.org; this will generally be newer + ## Usage ``` @@ -11,5 +16,5 @@ docker run -d --name nginx \ -v /var/www/html:/var/www/html \ -v /var/log/nginx:/var/log/nginx \ -p 80:80 -p 443:443 \ - rlister/nginx + rlister/nginx:stable ``` diff --git a/nginx/Dockerfile b/nginx/latest/Dockerfile similarity index 100% rename from nginx/Dockerfile rename to nginx/latest/Dockerfile diff --git a/nginx/stable/Dockerfile b/nginx/stable/Dockerfile new file mode 100644 index 0000000..1cc55f0 --- /dev/null +++ b/nginx/stable/Dockerfile @@ -0,0 +1,22 @@ +FROM debian:jessie + +MAINTAINER Ric Lister + +ADD http://nginx.org/keys/nginx_signing.key /tmp/ + +RUN apt-key add /tmp/nginx_signing.key && \ + rm -f /tmp/nginx_signing.key && \ + (echo 'deb http://nginx.org/packages/debian/ jessie nginx' >> /etc/apt/sources.list) && \ + apt-get update && \ + DEBIAN_FRONTEND=noninteractive \ + apt-get install -yq nginx && \ + rm -rf /var/lib/apt/lists/* && \ + echo "\ndaemon off;" >> /etc/nginx/nginx.conf + +VOLUME [ "/etc/nginx/sites-enabled", "/etc/nginx/certs", "/etc/nginx/conf.d", "/var/log/nginx", "/var/www/html" ] + +WORKDIR /etc/nginx + +EXPOSE 80 443 + +CMD [ "nginx" ]