Răsfoiți Sursa

[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

andryyy 6 ani în urmă
părinte
comite
9aca90c75f
3 a modificat fișierele cu 4 adăugiri și 2 ștergeri
  1. 1 1
      data/Dockerfiles/sogo/bootstrap-sogo.sh
  2. 1 1
      docker-compose.yml
  3. 2 0
      update.sh

+ 1 - 1
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

+ 1 - 1
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}

+ 2 - 0
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