amorfo77/mailcow-dockerized
1
0 Fork 0
mirror of https://github.com/mailcow/mailcow-dockerized.git synced 2026-10-22 02:38:12 +00:00
Code Issues Projects Releases Wiki Activity

Fix conflict

Browse Source
This commit is contained in:
André Peters committed 2018-02-16 22:44:02 +01:00
2 parents 0bfd0838c2 2a3040de12
commit 1f09544f32
13 files changed
+60 -21
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

docker-compose.yml
+5 -1
View File
@@ -142,7 +142,7 @@ services:
- phpfpm
sogo-mailcow:
image: mailcow/sogo:1.16
image: mailcow/sogo:1.17
build: ./data/Dockerfiles/sogo
environment:
- DBNAME=${DBNAME}
@@ -165,7 +165,11 @@ services:
- sogo
dovecot-mailcow:
<<<<<<< HEAD
image: mailcow/dovecot:1.21
=======
image: mailcow/dovecot:1.22
>>>>>>> master
build: ./data/Dockerfiles/dovecot
cap_add:
- NET_BIND_SERVICE