Renamed the entrypoint.sh to docker-entrypoint.sh

(To fit in for the official zulip/zulip project)

Dockerfile

@@ -3,8 +3,6 @@ MAINTAINER Alexander Trost <galexrt@googlemail.com>
 
 ENV ZULIP_VERSION="1.3.10" DATA_DIR="/data"
 
-ADD entrypoint.sh /sbin/entrypoint.sh
-
 RUN apt-get -q update && \
     apt-get -q dist-upgrade -y && \
     mkdir -p "$DATA_DIR" /root/zulip && \
@@ -13,18 +11,21 @@ RUN apt-get -q update && \
     rm -rf /tmp/zulip-server.tar.gz
 
 ADD custom_zulip_files/ /root/custom_zulip
-ADD includes/createZulipAdmin.sh /opt/createZulipAdmin.sh
 
 RUN rm -rf /root/zulip/puppet && \
     cp -rf /root/custom_zulip/* /root/zulip && \
     rm -rf /root/custom_zulip && \
     VOYAGER_CLASS="zulip::dockervoyager" DEPLOYMENT_TYPE="dockervoyager" ADDITIONAL_PACKAGES="python-dev python-six python-pbs" \
-    /root/zulip/scripts/setup/install && \
-    chown zulip:zulip /opt/createZulipAdmin.sh && \
+    /root/zulip/scripts/setup/install
+
+ADD includes/createZulipAdmin.sh /opt/createZulipAdmin.sh
+
+RUN chown zulip:zulip /opt/createZulipAdmin.sh && \
     apt-get -qq autoremove --purge -y && \
     apt-get -qq clean && \
     rm -rf /root/zulip/puppet/ /var/lib/apt/lists/* /tmp/* /var/tmp/*
 
+ADD docker-entrypoint.sh /sbin/entrypoint.sh
 ADD setup_files/ /opt/files
 ADD includes/supervisor/conf.d/zulip_postsetup.conf /etc/supervisor/conf.d/zulip_postsetup.conf
 

custom_zulip_files/puppet/zulip/files/postgresql/process_fts_updates

@@ -44,7 +44,7 @@ try:
     os.environ['DJANGO_SETTINGS_MODULE'] = 'zproject.settings'
     from django.conf import settings
     remote_postgres_host = settings.REMOTE_POSTGRES_HOST
-except ImportError as e:
+except ImportError, e:
     # process_fts_updates also supports running locally on a remote
     # postgres server; in that case, one can just connect to localhost
     remote_postgres_host = ''