paulmataruso/docker-zulip
1
0
Fork 0
mirror of https://github.com/zulip/docker-zulip.git synced 2025-11-04 05:53:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

Renamed the entrypoint.sh to docker-entrypoint.sh

Browse Source 
(To fit in for the official zulip/zulip project)
This commit is contained in:
Alexander Trost
2016-04-24 10:53:40 +02:00
parent 410f00e6de
commit d3ae865088
3 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
Dockerfile
View File

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

2
custom_zulip_files/puppet/zulip/files/postgresql/process_fts_updates
View File

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

0
entrypoint.sh → docker-entrypoint.sh
View File