diff --git a/Dockerfile b/Dockerfile index 8985435..2b27532 100644 --- a/Dockerfile +++ b/Dockerfile @@ -36,8 +36,8 @@ RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y \ # add ttrss as the only nginx site ADD ttrss.nginx.conf /etc/nginx/sites-available/ttrss -RUN ln -s /etc/nginx/sites-available/ttrss /etc/nginx/sites-enabled/ttrss -RUN rm /etc/nginx/sites-enabled/default +RUN ln -s /etc/nginx/sites-available/ttrss /etc/nginx/sites-enabled/ttrss \ + && rm /etc/nginx/sites-enabled/default # install ttrss and patch configuration WORKDIR /var/www @@ -54,17 +54,6 @@ RUN cp config.php-dist config.php \ && chown www-data:www-data -R /var/www \ && mkdir -p /var/run/php -# expose only nginx HTTP port -EXPOSE 80 - -# complete path to ttrss -ENV SELF_URL_PATH http://localhost - -# expose default database credentials via ENV in order to ease overwriting -ENV DB_NAME ttrss -ENV DB_USER ttrss -ENV DB_PASS ttrss - # always re-configure database with current ENV when RUNning container, then monitor all services ADD configure-db.php /configure-db.php ADD supervisord.conf /etc/supervisor/conf.d/supervisord.conf