Merge branch 'master' into feature-traefik

2017-09-16 17:54:09 +02:00
parent 9ee795a694 68ba514297
commit a08185911d
27 changed files with 364 additions and 24 deletions
--- a/docker-compose.yml.dist
+++ b/docker-compose.yml.dist
@@ -71,7 +71,7 @@ services:

  antivirus:
    # build: clamav
-    image: mailu/clamav:$VERSION
+    image: mailu/$ANTIVIRUS:$VERSION
    restart: always
    env_file: .env
    volumes: