From 22a54827ff6be9919756e35009430287804d4ebd Mon Sep 17 00:00:00 2001
From: Thomas VIAL <github@ifusio.com>
Date: Sat, 28 Mar 2015 16:44:40 +0100
Subject: [PATCH] Working image.

---
 Dockerfile          |  2 +-
 README.md           | 20 ++++++++++++++++++--
 start-mailserver.sh |  3 ---
 3 files changed, 19 insertions(+), 6 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 51f64e90..f56e32a3 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -19,7 +19,7 @@ RUN sed -i -r 's/^(CRON|ENABLED)=0/\1=1/g' /etc/default/spamassassin
 RUN sed -i -r 's/#(@|   \\%)bypass/\1bypass/g' /etc/amavis/conf.d/15-content_filter_mode
 RUN adduser clamav amavis
 RUN adduser amavis clamav
-RUN echo "/dev/shm   /var/lib/amavis   tmpfs defaults,noexec,nodev,nosuid,size=150m,mode=750,uid=$(id -u amavis),gid=$(id -g clamav) 0 0" >> /etc/fstab
+# RUN echo "/dev/shm   /var/lib/amavis   tmpfs defaults,noexec,nodev,nosuid,size=150m,mode=750,uid=$(id -u amavis),gid=$(id -g clamav) 0 0" >> /etc/fstab
 
 # Enables Clamav
 RUN mkdir -p /var/log/clamav && chown -R clamav:root /var/log/clamav
diff --git a/README.md b/README.md
index c66be9df..0e4e8933 100644
--- a/README.md
+++ b/README.md
@@ -1,8 +1,19 @@
 # docker-mailserver
 
+A fullstack but simple mailserver (smtp, imap, antispam, antivirus...)
+
+Includes:
+- postfix
+- courier-imap
+- spamassasin
+- clamav
+- amavis
+
+Only config files, no *sql database required.
+
 ## installation
 
-TODO when automatic build will be enabled.
+	docker pull tvial/docker-mailserver
 
 ## build
 
@@ -25,6 +36,11 @@ TODO when automatic build will be enabled.
 	    - ./configs/spamassassin:/etc/spamassassin
 	  environment:
 	    docker_mail_domain: "my-domain.com"
+	    # format is user@domain.tld|clear_password
 	    docker_mail_users:
 	      - "username1@my-domain.com|username1password"
-	      - "username2@my-domain.com|username2password"
\ No newline at end of file
+	      - "username2@my-domain.com|username2password"
+
+# wanna help?
+
+Fork, improve and PR. ;-)
\ No newline at end of file
diff --git a/start-mailserver.sh b/start-mailserver.sh
index b247332f..256f2031 100644
--- a/start-mailserver.sh
+++ b/start-mailserver.sh
@@ -33,9 +33,6 @@ chown -R 5000:5000 /var/mail
 echo "Creating /etc/mailname"
 echo $docker_mail_domain > /etc/mailname
 
-# echo "Mouting /var/lib/amavis as tmpfs"
-# mount /var/lib/amavis
-
 echo "Starting daemons"
 /etc/init.d/fam start
 /etc/init.d/saslauthd start