Resolve "/wp-admin redirects to :8080"

Closes #117 (closed)

wp-docker/Dockerfile

@@ -23,10 +23,16 @@ ENV PORT 8080
 ENV TLS_PORT 8443
 ENV TRUSTED_PROXY_IP 10.0.0.0/8
 
-RUN sed -i "s/\<80\>/$PORT/g" /etc/apache2/sites-available/000-default.conf /etc/apache2/ports.conf
-RUN sed -i "s/\<443\>/$TLS_PORT/g" /etc/apache2/sites-available/default-ssl.conf /etc/apache2/ports.conf
-RUN sed "s/\tCustomLog \${APACHE_LOG_DIR}\/access.log combined/\tCustomLog \${APACHE_LOG_DIR}\/access.log remoteip/g" /etc/apache2/sites-available/000-default.conf /etc/apache2/sites-available/default-ssl.conf
+# Remove port numbers from VirtualHosts
+RUN sed -i "s/:80//g" /etc/apache2/sites-available/000-default.conf
+RUN sed -i "s/:443//g" /etc/apache2/sites-available/default-ssl.conf
+
+# Set correct port in ports.conf
+RUN sed -i "s/\<80\>/$PORT/g" /etc/apache2/ports.conf
+RUN sed -i "s/\<443\>/$TLS_PORT/g" /etc/apache2/ports.conf
 
+# Log remote IP addresses instead of the LoadBalancer IP
+RUN sed "s/\tCustomLog \${APACHE_LOG_DIR}\/access.log combined/\tCustomLog \${APACHE_LOG_DIR}\/access.log remoteip/g" /etc/apache2/sites-available/000-default.conf /etc/apache2/sites-available/default-ssl.conf
 RUN echo "RemoteIPTrustedProxy $TRUSTED_PROXY_IP" >> /etc/apache2/apache2.conf
 RUN echo "RemoteIPHeader X-Forwarded-For" >> /etc/apache2/apache2.conf
 # Add custom log format called "remoteip" that uses remoteip module