From 9aca90c75fcacbbf4074d7ad2dceb6434a97d3f1 Mon Sep 17 00:00:00 2001 From: andryyy Date: Sat, 22 Dec 2018 16:56:50 +0100 Subject: [PATCH] [SOGo] Fix file path of sogo-full.svg [Compose] Updated SOGo image [Update] Add user.name and user.email for local git config if missing --- data/Dockerfiles/sogo/bootstrap-sogo.sh | 2 +- docker-compose.yml | 2 +- update.sh | 2 ++ 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/data/Dockerfiles/sogo/bootstrap-sogo.sh b/data/Dockerfiles/sogo/bootstrap-sogo.sh index 3810f758..b0c51273 100755 --- a/data/Dockerfiles/sogo/bootstrap-sogo.sh +++ b/data/Dockerfiles/sogo/bootstrap-sogo.sh @@ -176,6 +176,6 @@ if patch -sfN --dry-run /usr/lib/GNUstep/SOGo/Templates/UIxAclEditor.wox < /acl. fi # Copy logo, if any -[[ -f /etc/sogo/sogo-full.svg ]] && cp /etc/sogo/sogo_full.svg /usr/lib/GNUstep/SOGo/WebServerResources/img/sogo-full.svg +[[ -f /etc/sogo/sogo-full.svg ]] && cp /etc/sogo/sogo-full.svg /usr/lib/GNUstep/SOGo/WebServerResources/img/sogo-full.svg exec gosu sogo /usr/sbin/sogod diff --git a/docker-compose.yml b/docker-compose.yml index 749727a3..3add2eed 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -138,7 +138,7 @@ services: - phpfpm sogo-mailcow: - image: mailcow/sogo:1.47 + image: mailcow/sogo:1.48 build: ./data/Dockerfiles/sogo environment: - DBNAME=${DBNAME} diff --git a/update.sh b/update.sh index 5b38d7d0..10f7f4e0 100755 --- a/update.sh +++ b/update.sh @@ -249,6 +249,8 @@ docker-compose down # Silently fixing remote url from andryyy to mailcow git remote set-url origin https://github.com/mailcow/mailcow-dockerized echo -e "\e[32mCommitting current status...\e[0m" +[[ -z "$(git config user.name)" ]] && git config user.name moo +[[ -z "$(git config user.email)" ]] && git config user.email moo@cow.moo git update-index --assume-unchanged data/conf/rspamd/override.d/worker-controller-password.inc git add -u git commit -am "Before update on ${DATE}" > /dev/null