From 38d9993b68bc29542ce106742d035d8a52ed6901 Mon Sep 17 00:00:00 2001 From: Felix Bartels Date: Tue, 14 May 2019 15:17:32 +0200 Subject: [PATCH] fix yes set as timezone (#157) * fix yes set as timezone value_default would not be empty but rather have yes as the value Signed-off-by: Felix Bartels * also add version control for ssl and kweb Signed-off-by: Felix Bartels --- docker-compose.yml | 4 ++-- setup.sh | 6 ++---- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index 9c0c290..70b4c1b 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -2,7 +2,7 @@ version: "3.5" services: web: - image: ${docker_repo:-zokradonh}/kopano_web + image: ${docker_repo:-zokradonh}/kopano_web:${KWEB_VERSION:-latest} restart: unless-stopped ports: - "${CADDY:-2015}:2015" @@ -178,7 +178,7 @@ services: - kopano-net kopano_ssl: - image: ${docker_repo:-zokradonh}/kopano_ssl + image: ${docker_repo:-zokradonh}/kopano_ssl:${SSL_VERSION:-latest} environment: - FQDN=${FQDN} - PKI_COUNTRY=NL diff --git a/setup.sh b/setup.sh index 55ee92c..4512586 100755 --- a/setup.sh +++ b/setup.sh @@ -184,10 +184,8 @@ if [ ! -e ./.env ]; then value_default=$(cat /etc/timezone) elif [ -f /etc/localtime ]; then value_default=$(readlink /etc/localtime|sed -n 's|^.*zoneinfo/||p') - fi - - if [ -z "${value_default}" ]; then - value_default="Europe/Berlin". + else + value_default="Europe/Berlin" fi read -r -p "Timezone to be used [$value_default]: " new_value