From 9ab4d924bfd1cd798763b694ad680c3e3eb79f11 Mon Sep 17 00:00:00 2001 From: Alexander Trost Date: Wed, 28 Dec 2016 14:03:00 +0100 Subject: [PATCH] Test with VIRTUALENV_NEEDED and TRAVIS env var set --- Dockerfile | 4 ++-- custom_zulip_files/scripts/setup/postgres-init-db | 1 - 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/Dockerfile b/Dockerfile index 67c03d8..1a3fbbd 100644 --- a/Dockerfile +++ b/Dockerfile @@ -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 && \ diff --git a/custom_zulip_files/scripts/setup/postgres-init-db b/custom_zulip_files/scripts/setup/postgres-init-db index 63a01cc..334f5a8 100755 --- a/custom_zulip_files/scripts/setup/postgres-init-db +++ b/custom_zulip_files/scripts/setup/postgres-init-db @@ -73,4 +73,3 @@ if [ "$DEPLOYMENT_TYPE" != "dockervoyager" ]; then fi echo "Database created" -