Unify docker-compose-nossl.yml and docker-compose-ssl.yml

This commit is contained in:
Yi EungJun committed 2016-06-03 00:06:42 +09:00
1 parent 928bcc25a1
commit 811360572e
7 files changed
+58 -38

No files matched your search

+2 -5
View File
@@ -3,9 +3,9 @@ FROM ubuntu:14.04
RUN apt-get update && apt-get install -y nginx
RUN rm /etc/nginx/sites-enabled/default
RUN ln -s /etc/nginx/sites-available/mattermost /etc/nginx/sites-enabled/mattermost
ADD mattermost /etc/nginx/sites-available/
COPY mattermost /etc/nginx/sites-available/
COPY mattermost-ssl /etc/nginx/sites-available/
ADD docker-entry.sh /
RUN chmod +x /docker-entry.sh
@@ -14,9 +14,6 @@ RUN chmod +x /docker-entry.sh
RUN ln -sf /dev/stdout /var/log/nginx/access.log
RUN ln -sf /dev/stderr /var/log/nginx/error.log
# 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