From 15e4df4b325e6e1172f3273e158c1b748e7670b3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Bauer?= Date: Fri, 6 Jan 2017 16:09:55 +0100 Subject: [PATCH] cleanup entrypoint & install file --- README.md | 8 ++++++-- docker-entrypoint.sh | 4 ---- install-zammad.sh | 2 ++ 3 files changed, 8 insertions(+), 6 deletions(-) diff --git a/README.md b/README.md index a4e4071..89524e9 100644 --- a/README.md +++ b/README.md @@ -9,8 +9,7 @@ You're going to love Zammad! ## What is zammad-docker-compose repo for? -This repo is meant to be the starting point for somebody who likes to test zammad. -If you like to run zammad in production you should use one of the DEB or RPM packages. +This repo is meant to be the starting point for somebody who likes to use dockerized Zammad in production. ## Getting started with zammad-docker-compose @@ -25,6 +24,11 @@ If you like to run zammad in production you should use one of the DEB or RPM pac * docker-compose up +#### Updating Zammad + +* docker-compose pull +* docker-compose up + ### Building locally * docker-compose -f docker-compose-build.yml up diff --git a/docker-entrypoint.sh b/docker-entrypoint.sh index aef7ee7..2ceb24a 100644 --- a/docker-entrypoint.sh +++ b/docker-entrypoint.sh @@ -1,10 +1,6 @@ #!/bin/bash ZAMMAD_DIR="/home/zammad" -GIT_URL="https://github.com/zammad/zammad.git" -GIT_BRANCH="develop" -#GIT_URL="https://github.com/monotek/zammad.git" -#GIT_BRANCH="unicorn" RAILS_SERVER="puma" RAILS_ENV="production" DEBUG="no" diff --git a/install-zammad.sh b/install-zammad.sh index 1cd28f5..5692dc8 100644 --- a/install-zammad.sh +++ b/install-zammad.sh @@ -3,6 +3,8 @@ ZAMMAD_DIR="/home/zammad" GIT_URL="https://github.com/zammad/zammad.git" GIT_BRANCH="develop" +#GIT_URL="https://github.com/monotek/zammad.git" +#GIT_BRANCH="unicorn" # install zammad echo "installing zammad..."