Remove the original puppet/zulip/mainfests folder and move the custom one in.

This commit is contained in:
Alexander Trost
2015-10-29 22:54:49 +01:00
parent 1c25496617
commit fe9f067458

View File

@@ -18,6 +18,7 @@ RUN wget -q -O /root/zulip-ppa.asc https://zulip.com/dist/keys/zulip-ppa.asc &&
cd /root/zulip && \ cd /root/zulip && \
git clone https://github.com/zulip/zulip.git . && \ git clone https://github.com/zulip/zulip.git . && \
git checkout "$ZULIP_VERSION" && \ git checkout "$ZULIP_VERSION" && \
rm -rf /root/zulip/puppet/zulip/manifests && \
mv -f /root/puppet-zulip /root/zulip/puppet/zulip && \ mv -f /root/puppet-zulip /root/zulip/puppet/zulip && \
/root/zulip/scripts/zulip-puppet-apply -f && \ /root/zulip/scripts/zulip-puppet-apply -f && \
cp -fa /root/zulip/zproject/local_settings_template.py /etc/zulip/settings.py && \ cp -fa /root/zulip/zproject/local_settings_template.py /etc/zulip/settings.py && \