flywithu/kopano-docker
1
0
Fork 0
mirror of https://github.com/zokradonh/kopano-docker synced 2025-10-31 02:17:47 +00:00
Code Issues Releases Wiki Activity

fix versioning of z-push

Browse Source 
add z-push version to setup.sh
remove leftover caddyfile

Signed-off-by: Felix Bartels <felix@host-consultants.de>
This commit is contained in:
Felix Bartels 2018-12-14 20:53:55 +01:00
parent d211cc224a
commit db7603e764
3 changed files with 6 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
docker-compose.yml-example
View File

@ -191,7 +191,7 @@ services:
- kopanonet - kopanonet
kopano_zpush: kopano_zpush:
image: ${docker_repo:?err}/kopano_zpush:${WEBAPP_VERSION} image: ${docker_repo:?err}/kopano_zpush:${ZPUSH_VERSION}
hostname: kopano_zpush hostname: kopano_zpush
container_name: kopano_zpush container_name: kopano_zpush
links: links:

5
setup.sh
View File

@ -27,6 +27,10 @@ if [ ! -e ./.env ]; then
read -p "Which tag do you want to use for Kopano WebApp? [$value_default]: " new_value read -p "Which tag do you want to use for Kopano WebApp? [$value_default]: " new_value
WEBAPP_VERSION=${new_value:-$value_default} WEBAPP_VERSION=${new_value:-$value_default}
value_default=latest
read -p "Which tag do you want to use for Z-Push? [$value_default]: " new_value
ZPUSH_VERSION=${new_value:-$value_default}
value_default="Kopano Demo" value_default="Kopano Demo"
read -p "Name of the Organisation for LDAP [$value_default]: " new_value read -p "Name of the Organisation for LDAP [$value_default]: " new_value
LDAP_ORGANISATION=${new_value:-$value_default} LDAP_ORGANISATION=${new_value:-$value_default}
@ -124,6 +128,7 @@ if [ ! -e ./.env ]; then
# for possible configuration values and their impact # for possible configuration values and their impact
CORE_VERSION=$CORE_VERSION CORE_VERSION=$CORE_VERSION
WEBAPP_VERSION=$WEBAPP_VERSION WEBAPP_VERSION=$WEBAPP_VERSION
ZPUSH_VERSION=$ZPUSH_VERSION
LDAP_ORGANISATION="$LDAP_ORGANISATION" LDAP_ORGANISATION="$LDAP_ORGANISATION"
LDAP_DOMAIN=$FQDN LDAP_DOMAIN=$FQDN

11
web/Caddyfile
View File

@ -1,11 +0,0 @@
webapp.kopano.demo {
tls self_signed
redir / /webapp
proxy /webapp kwebapp:80 {
transparent
websocket
}
}