Self hosted FLOSS fitness/workout, nutrition and weight tracker
Combine Apache config commands
Scott Peshak74ee8c5f1ca2
diff --git a/extras/docker/apache/Dockerfile b/extras/docker/apache/Dockerfileindex cbe59c7bb..b43800073 100644--- a/extras/docker/apache/Dockerfile+++ b/extras/docker/apache/Dockerfile@@ -29,9 +29,11 @@ RUN apt-get update \&& rm -rf /var/lib/apt/lists/*# Configure apache-RUN a2dissite 000-default.confADD wger.conf /etc/apache2/sites-available/-RUN a2ensite wger+RUN a2dissite 000-default.conf \+ && a2ensite wger \+ && echo "ServerName localhost" >> /etc/apache2/conf-available/fqdn.conf \+ && a2enconf fqdn# Set up the applicationUSER wger@@ -65,8 +67,5 @@ RUN chmod o+w -R ~/db/ \USER root-RUN echo "ServerName localhost" >> /etc/apache2/conf-available/fqdn.conf \- && a2enconf fqdn-ENTRYPOINT ["/usr/sbin/apache2ctl"]CMD ["-D", "FOREGROUND"]