diff --git a/Dockerfile b/Dockerfile
index b56a3d4..c6c535b 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -16,9 +16,8 @@ RUN /usr/bin/apt-get update -yqq \
  && /bin/rm /bin/sh && ln -s /bin/bash /bin/sh \
  && /usr/sbin/groupadd -r selfoss \
  && /usr/sbin/useradd -r -m -s /bin/bash -g selfoss selfoss \
- && /usr/bin/curl -L -o /tmp/selfoss.tar.gz https://github.com/SSilence/selfoss/archive/2.15.tar.gz
-
-RUN /bin/su - selfoss -c '/bin/tar xzf /tmp/selfoss.tar.gz -C /home/selfoss --strip-components=1' \
+ && /usr/bin/curl -L -o /tmp/selfoss.tar.gz https://github.com/SSilence/selfoss/archive/2.15.tar.gz \
+ && /bin/su - selfoss -c '/bin/tar xzf /tmp/selfoss.tar.gz -C /home/selfoss --strip-components=1' \
  && /bin/rm -f /tmp/selfoss.tar.gz \
  && /bin/rm -f /home/selfoss/selfoss*.zip \
  && /bin/mkdir /var/lib/selfoss \
@@ -27,7 +26,7 @@ RUN /bin/su - selfoss -c '/bin/tar xzf /tmp/selfoss.tar.gz -C /home/selfoss --st
 
 VOLUME /var/lib/selfoss
 ENTRYPOINT ["/usr/local/bin/docker-entrypoint.sh"]
-ADD ./docker-entrypoint.sh /usr/local/bin
+ADD ./docker-entrypoint.sh /usr/local/bin/
 ADD ./run.php /home/selfoss/
 
 EXPOSE 8080
diff --git a/run.php b/run.php
index 93b7d4e..67048b5 100644
--- a/run.php
+++ b/run.php
@@ -29,6 +29,7 @@ if (php_sapi_name() == 'cli-server') {
         // taken from cli arg, hack for updater
         $_SERVER["SERVER_ADDR"] = '127.0.0.1';
         $_SERVER["SERVER_NAME"] = '127.0.0.1';
+        $_SERVER["SERVER_PORT"] = '80';
         require("index.php");
     }