diff --git a/www/Dockerfile b/www/Dockerfile index d430958c87c6a80ebc30885886a108fe7152d3c0..8a9e26eea7ae10c19315838f8e2a9940d2889ff1 100644 --- a/www/Dockerfile +++ b/www/Dockerfile @@ -9,8 +9,7 @@ RUN apt-get update && apt-get install -y \ libjpeg-dev \ libsasl2-dev \ libldap2-dev \ - libssl-dev \ - nginx + libssl-dev # Python Packages RUN apt-get update && apt-get install -y \ @@ -29,8 +28,6 @@ RUN pip3 install \ uwsgi \ --upgrade -RUN ln -s /opt/nginx/nginx_warpinfra.conf /etc/nginx/sites-enabled/ -RUN rm /etc/nginx/sites-enabled/default RUN mkdir /opt/socket/ @@ -38,11 +35,10 @@ COPY misc/ldapdb_base.py /usr/local/lib/python3.4/dist-packages/ldapdb/backends/ COPY misc/entrypoint.sh /opt/entrypoint.sh ADD web /opt/warpinfra/ -ADD nginx /opt/nginx EXPOSE 8000 443 80 -VOLUME ["/opt/nginx", "/opt/warpinfra"] +VOLUME ["/opt/warpinfra"] ENTRYPOINT sh /opt/entrypoint.sh