From f811631bfff70e31c63b65feb775d9551601884c Mon Sep 17 00:00:00 2001
From: Ola Tarkowska <A.Tarkowska@dundee.ac.uk>
Date: Tue, 29 Mar 2016 23:02:54 +0100
Subject: [PATCH] use redis and fix gunicorn IP

---
 home/jobs/OMERO-web/config.xml | 12 +++++++-----
 web/Dockerfile                 |  1 +
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/home/jobs/OMERO-web/config.xml b/home/jobs/OMERO-web/config.xml
index c57ffa19..3756a93c 100644
--- a/home/jobs/OMERO-web/config.xml
+++ b/home/jobs/OMERO-web/config.xml
@@ -73,10 +73,12 @@ source $HOME/omero-virtualenv/bin/activate
 source $OMERO_INSTALL/settings.env
 
 # redis IP
-REDIS_IP=$(getent hosts 'redis' | awk '{print $1}')
-
+REDIS_IP=$(getent hosts &apos;redis&apos; | awk &apos;{print $1}&apos;)
+WEB_IP=$(hostname -I)
 pip install --upgrade --no-deps --force-reinstall -r $OMERO_DIST/share/web/requirements-py27-nginx.txt
 
+pip install django-redis-cache&gt;=1.6.5
+
 #start-config
 $OMERO_DIST/bin/omero config set omero.web.application_server &apos;wsgi-tcp&apos;
 $OMERO_DIST/bin/omero config set omero.web.application_server.max_requests 0
@@ -85,10 +87,10 @@ $OMERO_DIST/bin/omero config set omero.web.prefix &apos;/web&apos;
 $OMERO_DIST/bin/omero config set omero.web.static_url &apos;/web/static/&apos;
 $OMERO_DIST/bin/omero config set omero.web.static_root &apos;/home/omero/static/web&apos;
 
-#$OMERO_DIST/bin/omero config set omero.web.session_engine &apos;django.contrib.sessions.backends.cache&apos;
-#$OMERO_DIST/bin/omero config set omero.web.caches &apos;{&quot;default&quot;: {&quot;BACKEND&quot;: &quot;redis_cache.RedisCache&quot;,&quot;LOCATION&quot;: &quot;$REDIS_IP:6379&quot;}}&apos;
+$OMERO_DIST/bin/omero config set omero.web.session_engine &apos;django.contrib.sessions.backends.cache&apos;
+$OMERO_DIST/bin/omero config set omero.web.caches &apos;{&quot;default&quot;: {&quot;BACKEND&quot;: &quot;redis_cache.RedisCache&quot;,&quot;LOCATION&quot;: &quot;&apos;$REDIS_IP&apos;:6379&quot;}}&apos;
 
-$OMERO_DIST/bin/omero config set omero.web.application_server.host SPACENAME-ci.docker.openmicroscopy.org
+$OMERO_DIST/bin/omero config set omero.web.application_server.host $WEB_IP
 $OMERO_DIST/bin/omero config set omero.web.application_server.port 4080
 
 $OMERO_DIST/bin/omero web config nginx --http &quot;$OMERO_WEB_PORT&quot; &gt;$OMERO_DIST/nginx.conf.tmp
diff --git a/web/Dockerfile b/web/Dockerfile
index 601d1708..72189d9f 100644
--- a/web/Dockerfile
+++ b/web/Dockerfile
@@ -47,6 +47,7 @@ RUN sed -i.bak -re 's/(systemctl daemon-reload)/#\1/' $OMERO_INSTALL/step06_cent
 WORKDIR /tmp/omero-install/linux
 
 RUN JAVAVER=$JAVAVER PGVER=nopg bash install_centos7_nginx.sh
+RUN yum install -y redis python-redis && yum clean all
 
 RUN yum install -y http://download-aws.ej-technologies.com/exe4j/exe4j_linux_5_0_1.rpm