paulmataruso/docker-zulip
1
0
Fork 0
mirror of https://github.com/zulip/docker-zulip.git synced 2025-11-09 16:36:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

Test with VIRTUALENV_NEEDED and TRAVIS env var set

Browse Source
This commit is contained in:
Alexander Trost
2016-12-28 14:03:00 +01:00
parent e7174cc1eb
commit 9ab4d924bf
2 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Dockerfile
View File

@@ -14,8 +14,8 @@ COPY custom_zulip_files/ /root/custom_zulip
RUN cp -rf /root/custom_zulip/* /root/zulip && \
rm -rf /root/custom_zulip && \
PUPPET_CLASSES="zulip::dockervoyager" DEPLOYMENT_TYPE="dockervoyager" ADDITIONAL_PACKAGES="python-dev python-six python-pbs" \
/root/zulip/scripts/setup/install || cat /var/log/zulip/install.log; exit 1
PUPPET_CLASSES="zulip::dockervoyager" DEPLOYMENT_TYPE="dockervoyager" ADDITIONAL_PACKAGES="python-dev python-six python-pbs" VIRTUALENV_NEEDED="no" TRAVIS="yes" \
/root/zulip/scripts/setup/install || cat /var/log/zulip/install.log
RUN cp -a /root/zulip/zproject/prod_settings_template.py /etc/zulip/settings.py && \
ln -nsf /etc/zulip/settings.py /root/zulip/zproject/prod_settings.py && \

1
custom_zulip_files/scripts/setup/postgres-init-db
View File

@@ -73,4 +73,3 @@ if [ "$DEPLOYMENT_TYPE" != "dockervoyager" ]; then
fi
echo "Database created"