From 9d537532ce1d4035c35e29930ee3257ffc94e4f5 Mon Sep 17 00:00:00 2001
From: Alexandre BRACH <alexandre.brach@gmail.com>
Date: Thu, 14 Nov 2019 14:44:24 +0100
Subject: [PATCH 1/4] Embed README

---
 README.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index fb4b34870d..751efed810 100644
--- a/README.md
+++ b/README.md
@@ -63,9 +63,9 @@ The docker distribution come with 3 differents containers :
 
 ## How to build
 
-You can build all the images with the following command at the root directory :
+You can build all the images with the following command at the root directory, choosing an arbirary TAG name :
 
-    ./build <TAG>
+    ./build.sh <TAG>
 
 It will build and tag the following images :
 

From be73baae5b54ce2c3d825f5e47ae7345e43d4be0 Mon Sep 17 00:00:00 2001
From: aynsix <asr@esokia-webagency.com>
Date: Fri, 15 Nov 2019 17:12:02 +0400
Subject: [PATCH 2/4] redis function delete is deprecated

---
 lib/Alchemy/Phrasea/Cache/RedisCache.php              | 2 +-
 lib/Alchemy/Phrasea/Utilities/RedisSessionHandler.php | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/Alchemy/Phrasea/Cache/RedisCache.php b/lib/Alchemy/Phrasea/Cache/RedisCache.php
index 1130112563..365461256f 100644
--- a/lib/Alchemy/Phrasea/Cache/RedisCache.php
+++ b/lib/Alchemy/Phrasea/Cache/RedisCache.php
@@ -73,7 +73,7 @@ class RedisCache extends CacheProvider implements Cache
      */
     protected function doDelete($id)
     {
-        return $this->_redis->delete($id);
+        return $this->_redis->del($id);
     }
 
     /**
diff --git a/lib/Alchemy/Phrasea/Utilities/RedisSessionHandler.php b/lib/Alchemy/Phrasea/Utilities/RedisSessionHandler.php
index b2e8c008cc..fd5ee8470d 100644
--- a/lib/Alchemy/Phrasea/Utilities/RedisSessionHandler.php
+++ b/lib/Alchemy/Phrasea/Utilities/RedisSessionHandler.php
@@ -80,7 +80,7 @@ class RedisSessionHandler implements \SessionHandlerInterface
      */
     public function destroy($sessionId)
     {
-        return 1 === $this->redis->delete($this->prefix.$sessionId);
+        return 1 === $this->redis->del($this->prefix.$sessionId);
     }
 
     /**

From 962b7c9fa82fde158f4cb0f1030249b1ea56614f Mon Sep 17 00:00:00 2001
From: Alexandre BRACH <alexandre.brach@gmail.com>
Date: Fri, 15 Nov 2019 16:38:59 +0100
Subject: [PATCH 3/4] autoinstall #comment check vars on auto-install

---
 docker/phraseanet/auto-install.sh | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/docker/phraseanet/auto-install.sh b/docker/phraseanet/auto-install.sh
index 4028e5a614..b69490fd03 100755
--- a/docker/phraseanet/auto-install.sh
+++ b/docker/phraseanet/auto-install.sh
@@ -2,6 +2,16 @@
 
 set -xe
 
+if [ $INSTALL_ACCOUNT_EMAIL = ""]; then
+    echo "INSTALL_ACCOUNT_EMAIL var is not set."
+    exit 1
+fi
+
+if [ $INSTALL_ACCOUNT_PASSWORD = ""]; then
+    echo "INSTALL_ACCOUNT_PASSWORD var is not set."
+    exit 1
+fi
+
 /var/alchemy/Phraseanet/bin/setup system:install \
     --email=$INSTALL_ACCOUNT_EMAIL \
     --password=$INSTALL_ACCOUNT_PASSWORD \

From d73d5c26ee2f48c8e7983c33db96d6983639f37d Mon Sep 17 00:00:00 2001
From: Harrys Ravalomanana <hra@esokia.com>
Date: Mon, 18 Nov 2019 11:28:31 +0400
Subject: [PATCH 4/4] PHRAS-2823 #comment fix fontawesome on admin page #time
 1h

---
 resources/www/common/styles/main.scss | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/resources/www/common/styles/main.scss b/resources/www/common/styles/main.scss
index 805e018608..abcf466262 100644
--- a/resources/www/common/styles/main.scss
+++ b/resources/www/common/styles/main.scss
@@ -50,7 +50,9 @@ $mainMenuLinkBackgroundHoverColor: transparent;
   }
 }
 
-
+[class*=" icon-"].fa, [class^=icon-].fa, .fa {
+  font-family: Fontawesome!important;
+}
 [class^="icon-"], [class*=" icon-"].icomoon {
   display: inline-block;
   width: inherit;