Moved the includes/zulip-puppet to the repo root

This commit is contained in:
Alexander Trost
2015-10-20 10:17:56 +02:00
parent 3592466631
commit 6fc77ad243
39 changed files with 2 additions and 2 deletions

View File

@@ -10,7 +10,7 @@ ENV ZULIP_DIR="/home/zulip" ZULIP_VERSION="1.3.6" DATA_DIR="/data" \
ZULIP_CUSTOM_SETTINGS=""
ADD entrypoint.sh /entrypoint.sh
ADD includes/zulip-puppet /root/zulip-puppet
ADD zulip-puppet /root/zulip-puppet
RUN apt-get -qq update -q && \
apt-get -qq dist-upgrade -y && \
DEBIAN_FRONTEND=noninteractive apt-get -qq install -y puppet git wget python-dev python-six python-pbs expect && \

View File

@@ -10,6 +10,6 @@ ___
See https://zulip.org/server.html for details about the Zulip Server
The folder [includes/zulip](includes/zulip) contains modified puppet manifests for **Zulip server**.
The folder [zulip-puppet](zulip-puppet) contains modified puppet manifests for **Zulip server**.
The puppet manifests just install **Zulip server** not more, not less.
The original puppet manifests are taken from the https://github.com/zulip/zulip Repo.