From 507443592198d427077ac93f03ae930934229ed9 Mon Sep 17 00:00:00 2001
From: Adar Nimrod <nimrod@shore.co.il>
Date: Sat, 21 Sep 2019 18:24:00 +0300
Subject: [PATCH] Docker Compose improvements.

- Sort keys in docker-compose.yml.
- Use Docker Hub images for caching and name the images the same were
applicable.
- Mark the volumes for backup.
---
 docker-compose.yml | 18 ++++++++++++++----
 1 file changed, 14 insertions(+), 4 deletions(-)

diff --git a/docker-compose.yml b/docker-compose.yml
index e819724..ca3ee41 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -5,24 +5,30 @@ services:
   imap:
     build:
       context: dovecot/
+    environment:
+      LDAP_BASEDN: &ldap_basedn 'dc=nowhere,dc=com'
+      LDAP_URIS: &ldap_uris ldap://slapd
     ports:
       - 993:993
-    environment:
-      LDAP_URIS: ldap://slapd
-      LDAP_BASEDN: 'dc=nowhere,dc=com'
     volumes:
-      - mail:/var/mail
       - _run_dovecot:/run/dovecot
+      - mail:/var/mail
 
   clamd:
     build:
+      cache_from:
+        - adarnimrod/clamd
       context: clamd/
+    image: adarnimrod/clamd
     volumes:
       - _run_clamav:/run/clamav
 
   spamd:
     build:
+      cache_from:
+        - adarnimrod/spamd
       context: spamd/
+    image: adarnimrod/spamd
     volumes:
       - _run_spamd:/run/spamd
       - mail:/var/mail:ro
@@ -39,7 +45,11 @@ volumes:
   _run_clamav:
   _run_dovecot:
   mail:
+    labels:
+      snapshot: 'true'
   sa_learn:
+    labels:
+      snapshot: 'true'
 
 networks:
   default:
-- 
GitLab