Skip to content

Commit 0a655fd

Browse files
committed
Another
1 parent 49ab4b4 commit 0a655fd

File tree

1 file changed

+14
-27
lines changed

1 file changed

+14
-27
lines changed

Dockerfile

Lines changed: 14 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -1,31 +1,18 @@
1-
#
2-
# Nginx Dockerfile
3-
#
4-
# https://github.com/dockerfile/nginx
5-
#
1+
OM nginx:1.9
2+
MAINTAINER Kyle Mathews "mathews.kyle@gmail.com"
63

7-
# Pull base image.
8-
FROM ubuntu:yakkety
4+
RUN rm /etc/nginx/nginx.conf /etc/nginx/mime.types
5+
COPY nginx.conf /etc/nginx/nginx.conf
6+
COPY basic.conf /etc/nginx/basic.conf
7+
COPY mime.types /etc/nginx/mime.types
8+
RUN mkdir /etc/nginx/ssl
9+
COPY default /etc/nginx/sites-enabled/default
10+
COPY default-ssl /etc/nginx/sites-available/default-ssl
11+
COPY directive-only /etc/nginx/directive-only
12+
COPY location /etc/nginx/location
913

10-
# Install Nginx.
11-
RUN \
12-
apt-get update && \
13-
apt-get install -y software-properties-common && \
14-
add-apt-repository -y ppa:nginx/stable && \
15-
apt-get install -y nginx && \
16-
rm -rf /var/lib/apt/lists/* && \
17-
echo "\ndaemon off;" >> /etc/nginx/nginx.conf && \
18-
chown -R www-data:www-data /var/lib/nginx
14+
# expose both the HTTP (80) and HTTPS (443) ports
15+
EXPOSE 80 443
1916

20-
# Define mountable directories.
21-
#VOLUME ["/etc/nginx/sites-enabled", "/etc/nginx/certs", "/etc/nginx/conf.d", "/var/log/nginx", "/var/www/html"]
17+
CMD ["nginx"]
2218

23-
# Define working directory.
24-
#WORKDIR /etc/nginx
25-
26-
# Define default command.
27-
#CMD ["nginx"]
28-
29-
# Expose ports.
30-
EXPOSE 80
31-
EXPOSE 443

0 commit comments

Comments
 (0)