From 71207b05fe9e9e9c8cd147cae85e15515b9d8535 Mon Sep 17 00:00:00 2001
From: andryyy <andre.peters@debinux.de>
Date: Tue, 20 Jun 2017 00:02:03 +0200
Subject: [PATCH] Update update.sh

---
 update.sh | 26 ++++++++++++++++++--------
 1 file changed, 18 insertions(+), 8 deletions(-)

diff --git a/update.sh b/update.sh
index 7f0a63a8..ceccedbd 100755
--- a/update.sh
+++ b/update.sh
@@ -2,28 +2,38 @@
 
 set -o pipefail
 export LC_ALL=C
-DATE=$(date)
+DATE=$(date +%Y-%m-%d_%H_%M_%S)
 BRANCH=$(git rev-parse --abbrev-ref HEAD)
 
+for image in "phpfpm" "dovecot" "postfix" "sogo" "unbound" "rspamd" "clamd"; do
+if [[ ! -z $(docker images mailcow/${image} -q) ]]; then
+    echo -e "\e[32mSaving mailcow/${image} to mailcow/${image}:${DATE}...\e[90m"
+    docker tag mailcow/${image} mailcow/${image}:${DATE}
+fi
+done
+
 # Silently fixing remote url from andryyy to mailcow
 git remote set-url origin https://github.com/mailcow/mailcow-dockerized
 echo -e "\e[32mCommitting current status...\e[90m"
 git add -u
 git commit -am "Before update on ${DATE}" > /dev/null
 echo -e "\e[32mFetching updated code from remote...\e[90m"
-git fetch origin ${BRANCH}
+git fetch origin master
 echo -e "\e[32mMerging local with remote code...\e[90m"
 git merge -Xtheirs -Xpatience -m "After update on ${DATE}"
 
 if [[ $? == 1 ]]; then
-  echo -e "\e[31mRun into conflict, trying to fix...\e[90m"
-  git status --porcelain | grep -E "UD|DU" | awk '{print $2}' | xargs rm -v
-  git add -A
-  git commit -m "After update on ${DATE}" > /dev/null
-  git checkout .
-  echo -e "\e[32mRemoved and recreated files if necessary.\e[90m"
+        echo -e "\e[31mRun into conflict, trying to fix...\e[90m"
+        git status --porcelain | grep -E "UD|DU" | awk '{print $2}' | xargs rm -v
+        git add -A
+        git commit -m "After update on ${DATE}" > /dev/null
+        git checkout .
+        echo -e "\e[32mRemoved and recreated files if necessary.\e[90m"
 fi
 echo -e "\e[32mDone!\e[0m"
+echo
+echo -e "\e[32mHashes to revert to:\e[0m"
+git reflog --color=always | grep "Before update on "
 
 # TODO: Menu, select hard reset etc.
 #git reset --hard origin/${BRANCH}