diff --git a/Dockerfile b/Dockerfile index d0c7f410..72a3fa9c 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,19 +1,42 @@ -FROM debian:jessie +# Was FROM debian:jessie +# WAS forked from nginx/nginx +# can't figure out how to get -extras which has perl-embedded +# going back to dockerfile even though it's deprecated; at least it works -MAINTAINER NGINX Docker Maintainers "docker-maint@nginx.com" +# Pull base image. -ENV NGINX_VERSION 1.9.9-1~jessie +# WAS dockerfile/ubuntu +FROM ubuntu:14.04 -RUN apt-key adv --keyserver hkp://pgp.mit.edu:80 --recv-keys 573BFD6B3D8FBC641079A6ABABF5BD827BD9BF62 \ - && echo "deb http://nginx.org/packages/mainline/debian/ jessie nginx" >> /etc/apt/sources.list \ - && apt-get update \ - && apt-get install -y ca-certificates nginx=${NGINX_VERSION} gettext-base \ - && rm -rf /var/lib/apt/lists/* +# Install. +RUN \ + sed -i 's/# \(.*multiverse$\)/\1/g' /etc/apt/sources.list && \ + apt-get update && \ + apt-get -y upgrade && \ + apt-get install -y build-essential && \ + apt-get install -y software-properties-common && \ + apt-get install -y byobu curl git htop man unzip vim wget -# forward request and error logs to docker log collector -RUN ln -sf /dev/stdout /var/log/nginx/access.log \ - && ln -sf /dev/stderr /var/log/nginx/error.log -EXPOSE 80 443 +# WAS From: dockerfile/nginx +# Install Nginx. +RUN \ + add-apt-repository -y ppa:nginx/stable && \ + apt-get update && \ + apt-get install -y nginx-extras && \ + rm -rf /var/lib/apt/lists/* && \ + echo "\ndaemon off;" >> /etc/nginx/nginx.conf && \ + chown -R www-data:www-data /var/lib/nginx -CMD ["nginx", "-g", "daemon off;"] +# Define mountable directories. +VOLUME ["/etc/nginx/sites-enabled", "/etc/nginx/certs", "/etc/nginx/conf.d", "/var/log/nginx", "/var/www/html"] + +# Define working directory. +WORKDIR /etc/nginx + +# Define default command. +CMD ["nginx"] + +# Expose ports. +EXPOSE 80 +EXPOSE 443