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 + ./build.sh It will build and tag the following images : 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 \ 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); } /** 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;