paxton
/
mailcow
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #891 from mailcow/dev 

Dev
master
André Peters 2018-01-13 22:50:33 +01:00 committed by GitHub
parent 25cff7de6e 42923698fd
commit d3c834f43e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
data/Dockerfiles/dovecot/Dockerfile
View File

@ -65,6 +65,8 @@ RUN apt-get update && apt-get -y --no-install-recommends install \
RUN curl https://www.dovecot.org/releases/2.3/dovecot-$DOVECOT_VERSION.tar.gz | tar xvz \ RUN curl https://www.dovecot.org/releases/2.3/dovecot-$DOVECOT_VERSION.tar.gz | tar xvz \
&& cd dovecot-ce-$DOVECOT_VERSION \ && cd dovecot-ce-$DOVECOT_VERSION \
&& curl -L -o src/lib-compression/ostream-zlib.c https://raw.githubusercontent.com/dovecot/core/master/src/lib-compression/ostream-zlib.c \
&& curl -L -o src/doveadm/doveadm-zlib.c https://raw.githubusercontent.com/dovecot/core/43a6cdb3561dcfc5950542ce62509a7747a977ae/src/doveadm/doveadm-zlib.c \
&& ./configure --with-mysql --with-lzma --with-lz4 --with-ssl=openssl --with-notify=inotify --with-storages=mdbox,sdbox,maildir,mbox,imapc,pop3c --with-bzlib --with-zlib \ && ./configure --with-mysql --with-lzma --with-lz4 --with-ssl=openssl --with-notify=inotify --with-storages=mdbox,sdbox,maildir,mbox,imapc,pop3c --with-bzlib --with-zlib \
&& make -j3 \ && make -j3 \
&& make install \ && make install \

2
docker-compose.yml
View File

@ -146,7 +146,7 @@ services:
- sogo - sogo
dovecot-mailcow: dovecot-mailcow:
image: mailcow/dovecot:1.14 image: mailcow/dovecot:1.15
build: ./data/Dockerfiles/dovecot build: ./data/Dockerfiles/dovecot
cap_add: cap_add:
- NET_BIND_SERVICE - NET_BIND_SERVICE

6
helper-scripts/backup_and_restore.sh
View File

@ -61,7 +61,7 @@ function backup() {
debian:stretch-slim /bin/tar -cvpzf /backup/backup_vmail.tar.gz /vmail debian:stretch-slim /bin/tar -cvpzf /backup/backup_vmail.tar.gz /vmail
;;& ;;&
redis|all) redis|all)
docker exec -it $(docker ps -qf name=redis) redis-cli save docker exec $(docker ps -qf name=redis) redis-cli save
docker run --rm \ docker run --rm \
-v ${BACKUP_LOCATION}/mailcow-${DATE}:/backup \ -v ${BACKUP_LOCATION}/mailcow-${DATE}:/backup \
-v $(docker volume ls -qf name=redis):/redis \ -v $(docker volume ls -qf name=redis):/redis \
@ -74,14 +74,14 @@ function backup() {
debian:stretch-slim /bin/tar -cvpzf /backup/backup_rspamd.tar.gz /rspamd debian:stretch-slim /bin/tar -cvpzf /backup/backup_rspamd.tar.gz /rspamd
;;& ;;&
postfix|all) postfix|all)
docker run -it --rm \ docker run --rm \
-v ${BACKUP_LOCATION}/mailcow-${DATE}:/backup \ -v ${BACKUP_LOCATION}/mailcow-${DATE}:/backup \
-v $(docker volume ls -qf name=postfix):/postfix \ -v $(docker volume ls -qf name=postfix):/postfix \
debian:stretch-slim /bin/tar -cvpzf /backup/backup_postfix.tar.gz /postfix debian:stretch-slim /bin/tar -cvpzf /backup/backup_postfix.tar.gz /postfix
;;& ;;&
mysql|all) mysql|all)
SQLIMAGE=$(grep -iEo '(mysql|mariadb)\:.+' ${COMPOSE_FILE}) SQLIMAGE=$(grep -iEo '(mysql|mariadb)\:.+' ${COMPOSE_FILE})
docker run -it --rm \ docker run --rm \
--network $(docker network ls -qf name=mailcow) \ --network $(docker network ls -qf name=mailcow) \
-v $(docker volume ls -qf name=mysql):/var/lib/mysql/ \ -v $(docker volume ls -qf name=mysql):/var/lib/mysql/ \
--entrypoint= \ --entrypoint= \