From 2bbbb13b0eaa3545ab83c5b2763633d5d2be2b6b Mon Sep 17 00:00:00 2001
From: andryyy <andre.peters@debinux.de>
Date: Sun, 5 Mar 2017 13:41:41 +0100
Subject: [PATCH 1/3] Change install and update description

---
 docs/install.md | 31 +++++++------------------------
 1 file changed, 7 insertions(+), 24 deletions(-)

diff --git a/docs/install.md b/docs/install.md
index e45d203f..ce3b623a 100644
--- a/docs/install.md
+++ b/docs/install.md
@@ -24,7 +24,7 @@ nano mailcow.conf
 ```
 If you plan to use a reverse proxy, you can, for example, bind HTTPS to 127.0.0.1 on port 8443 and HTTP to 127.0.0.1 on port 8080.
 
-5\. Run the composer file.
+5\. Run the composer file. It will pull images and build containers.
 ```
 docker-compose up -d
 ```
@@ -33,40 +33,23 @@ Done!
 
 You can now access **https://${MAILCOW_HOSTNAME}** with the default credentials `admin` + password `moohoo`.
 
-It may take a while for MySQL to warm up, so please wait half a minute.
-
 The database will be initialized right after a connection to MySQL can be established.
 
 # Update mailcow
 
-There is no update routine.
-
-You need to refresh your pulled repository clone by running `git pull` - this will likely fail due to changes to your local configuration. But that's why we use git! :-)
-
-Whatever file has local changes, add and commit it to your repository clone. For example:
+There is no update routine. You need to refresh your pulled repository clone and apply your local changes (if any). Actually there are many ways to merge local changes. Here is one to
+stash all local changes, pull changes from the remote master branch and apply your stash on top of it:
 
 ```
-git add data/conf/postfix/main.cf data/conf/dovecot/dovecot.conf
-git commit -m "My changes to main.cf and dovecot.conf
+git stash
+git pull
+git stash pop
 ```
 
-Try running `git pull` again and resolve conflicts, if any.
-
-Now update all images, apply changes to containers and restart all services:
+Pull new images (if any) and recreate changed containers:
 
 ```
 docker-compose pull
 docker-compose up -d --remove-orphans
-docker-compose restart
 ```
 
-## Development branch (not recommended)
-
-When you checkout the "dev" git branch, you will most likely end up using the "master" images with code base of "dev".
-If there were critical changes to the images in dev, mailcow will not work.
-
-But you can still build the images by yourself:
-
-```
-docker-compose up -d --build
-```

From 252150016fddad2a000c59ef9d8f661cf21e2619 Mon Sep 17 00:00:00 2001
From: andryyy <andre.peters@debinux.de>
Date: Sun, 5 Mar 2017 13:51:56 +0100
Subject: [PATCH 2/3] Add comments to update

---
 docs/install.md | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/docs/install.md b/docs/install.md
index ce3b623a..7423f888 100644
--- a/docs/install.md
+++ b/docs/install.md
@@ -41,8 +41,11 @@ There is no update routine. You need to refresh your pulled repository clone and
 stash all local changes, pull changes from the remote master branch and apply your stash on top of it:
 
 ```
+# Stash local changes
 git stash
+# Re-pull master
 git pull
+# Apply stash and remove it
 git stash pop
 ```
 

From 6d7b6a92eecc8295ed59c91377c7873732a3ecba Mon Sep 17 00:00:00 2001
From: andryyy <andre.peters@debinux.de>
Date: Sun, 5 Mar 2017 14:04:00 +0100
Subject: [PATCH 3/3] Fix docker-compose

---
 docker-compose.yml | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/docker-compose.yml b/docker-compose.yml
index 8812a704..bc03a1cd 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -58,7 +58,11 @@ services:
     rspamd-mailcow:
       image: andryyy/mailcow-dockerized:rspamd
       build: ./data/Dockerfiles/rspamd
-      command: "sleep 25; /usr/bin/rspamd -f -u _rspamd -g _rspamd"
+      command: > 
+        /bin/bash -c "
+        sleep 5;
+        /usr/bin/rspamd -f -u _rspamd -g _rspamd
+        "
       depends_on:
         nginx-mailcow:
           condition: service_healthy