X-Git-Url: https://code.citadel.org/?p=citadel-docker.git;a=blobdiff_plain;f=Dockerfile;fp=Dockerfile;h=38711f29ad96a0dfc17e8e79f7c9641af124a295;hp=71bb53660eb225dfd37c6e314486d0f821f7ff94;hb=ba96c571eb2061b2ebf3b9b64f66f66e0683f412;hpb=2bb55e4ad7fe19905142babb26f5dc76ae06354f

diff --git a/Dockerfile b/Dockerfile
index 71bb536..38711f2 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -15,27 +15,16 @@ RUN sh -c 'cd /tmp/ctdl_build/citadel/libcitadel && ./bootstrap && ./configure -
 RUN sh -c 'cd /tmp/ctdl_build/citadel/citadel && ./bootstrap && ./configure && make && make install'
 RUN sh -c 'cd /tmp/ctdl_build/citadel/webcit && ./bootstrap && ./configure && make && make install'
 RUN sh -c 'cd /tmp/ctdl_build/citadel/textclient && ./bootstrap && ./configure --prefix=/usr && make && make install'
-RUN sh -c 'cd / && rm -vfr /tmp/ctdl_build'
+RUN sh -c 'cd /tmp && rm -vfr /tmp/ctdl_build'
 RUN sh -c 'rm -vrf /usr/local/citadel/data /usr/local/citadel/files /usr/local/citadel/keys /usr/local/webcit/keys'
 
 # Supervisor
 ADD supervisor.conf /etc/
 ADD citadel-docker-startup.sh /usr/local/bin/
+RUN sh -c 'chmod 755 /usr/local/bin/citadel-docker-startup.sh'
 
 # Ports
-EXPOSE 25/tcp
-EXPOSE 80/tcp
-EXPOSE 110/tcp
-EXPOSE 119/tcp
-EXPOSE 143/tcp
-EXPOSE 443/tcp
-EXPOSE 465/tcp
-EXPOSE 504/tcp
-EXPOSE 563/tcp
-EXPOSE 587/tcp
-EXPOSE 993/tcp
-EXPOSE 995/tcp
-EXPOSE 2020/tcp
-EXPOSE 5222/tcp
+EXPOSE 25 80 110 119 143 443 465 504 563 587 993 995 2020 5222
 
+# Let's go!
 CMD /usr/local/bin/citadel-docker-startup.sh