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

Fix for the zulip manifests

Browse Source
This commit is contained in:
Alexander Trost
2015-10-30 09:49:16 +01:00
parent 74654cf25c
commit 25937df9fa
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
Dockerfile
View File

@@ -4,7 +4,7 @@ MAINTAINER Alexander Trost <galexrt@googlemail.com>
ENV ZULIP_VERSION="master" DATA_DIR="/data"
ADD entrypoint.sh /entrypoint.sh
ADD puppet/zulip/ /root/puppet-zulip
ADD puppet/zulip /root/puppet-zulip
RUN wget -q -O /root/zulip-ppa.asc https://zulip.com/dist/keys/zulip-ppa.asc && \
apt-key add /root/zulip-ppa.asc && \
@@ -19,7 +19,8 @@ RUN wget -q -O /root/zulip-ppa.asc https://zulip.com/dist/keys/zulip-ppa.asc &&
git clone https://github.com/zulip/zulip.git . && \
git checkout "$ZULIP_VERSION" && \
rm -rf /root/zulip/puppet/zulip/manifests /root/zulip/puppet/zulip_internal/manifests && \
mv -f /root/puppet-zulip /root/zulip/puppet/zulip && \
mv -f /root/puppet-zulip/* /root/zulip/puppet/zulip && \
rm -rf /root/puppet-zulip && \
/root/zulip/scripts/zulip-puppet-apply -f && \
cp -fa /root/zulip/zproject/local_settings_template.py /etc/zulip/settings.py && \
ln -nsf /etc/zulip/settings.py /root/zulip/zproject/local_settings.py && \