switch to port 80

Dockerfile

@@ -28,15 +28,12 @@ COPY docker/apache/apache2.conf /etc/apache2/apache2.conf
 # Set permissionsso apache can write to logs without root
 RUN mkdir -p /var/run/apache2 /var/lock/apache2 /var/log/apache2 ; chown -R www-data:www-data /var/lock/apache2 /var/log/apache2 /var/run/apache2
 
-# Drop permissions - everything below here done without root
-USER www-data
-
 # Copy in code
 WORKDIR /var/www
 COPY --chown=www-data:www-data web /var/www/web
 
 # Expose default port
-EXPOSE 8080
+EXPOSE 80
 
 ENTRYPOINT ["/usr/local/bin/dumb-init", "--"]
 CMD ["/usr/sbin/apache2ctl", "-DFOREGROUND"]

docker-compose-prod.yml

@@ -7,4 +7,4 @@ services:
   web:
     image: divinumofficiumweb/divinumofficium:latest
     ports:
-      - 80:8080
+      - 80:80

docker-compose.yml

@@ -14,4 +14,4 @@ services:
     volumes:
       - ./web:/var/www/web
     ports:
-      - 8080:8080
+      - 8080:80

docker/apache/ports.conf

@@ -1,4 +1,4 @@
-Listen 8080
+Listen 80
 
 # vim: syntax=apache ts=4 sw=4 sts=4 sr noet