adding redis as an experimental

ome · Mar 25, 2016 · 7d1a1ce · 7d1a1ce
1 parent 602daa8
commit 7d1a1ce
Show file tree

Hide file tree

Showing 12 changed files with 108 additions and 0 deletions.
diff --git a/linux/install_centos6_py27_apache24.sh b/linux/install_centos6_py27_apache24.sh
@@ -2,6 +2,7 @@
 
 set -e -u -x
 
+EXPERIMENTAL=${EXPERIMENTAL:-false}
 OMEROVER=${OMEROVER:-latest}
 WEBAPPS=${WEBAPPS:-false}
 PGVER=${PGVER:-pg94}
@@ -18,6 +19,10 @@ bash -eux step01_centos6_py27_ice_deps.sh
 
 bash -eux step01_centos6_py27_deps.sh
 
+if $EXPERIMENTAL" ; then
+    bash -eux step01_centos6_py27_deps_experimental.sh
+fi
+
 # install Postgres
 bash -eux step01_centos6_pg_deps.sh
 

diff --git a/linux/install_centos6_py27_ius_apache22.sh b/linux/install_centos6_py27_ius_apache22.sh
@@ -2,6 +2,7 @@
 
 set -e -u -x
 
+EXPERIMENTAL=${EXPERIMENTAL:-false}
 OMEROVER=${OMEROVER:-latest}
 WEBAPPS=${WEBAPPS:-false}
 PGVER=${PGVER:-pg94}
@@ -25,6 +26,10 @@ bash -eux step02_centos6_py27_ius_setup.sh
 
 bash -eux step01_centos6_py27_ius_virtualenv_deps.sh
 
+if $EXPERIMENTAL" ; then
+    bash -eux step01_centos6_py27_ius_deps_experimental.sh
+fi
+
 if [[ "$PGVER" =~ ^(pg94|pg95)$ ]]; then
 	bash -eux step03_all_postgres.sh
 fi

diff --git a/linux/install_centos6_py27_ius_apache24.sh b/linux/install_centos6_py27_ius_apache24.sh
@@ -2,6 +2,7 @@
 
 set -e -u -x
 
+EXPERIMENTAL=${EXPERIMENTAL:-false}
 OMEROVER=${OMEROVER:-latest}
 WEBAPPS=${WEBAPPS:-false}
 PGVER=${PGVER:-pg94}
@@ -25,6 +26,10 @@ bash -eux step02_centos6_py27_ius_setup.sh
 
 bash -eux step01_centos6_py27_ius_virtualenv_deps.sh
 
+if $EXPERIMENTAL" ; then
+    bash -eux step01_centos6_py27_ius_deps_experimental.sh
+fi
+
 if [[ "$PGVER" =~ ^(pg94|pg95)$ ]]; then
 	bash -eux step03_all_postgres.sh
 fi

diff --git a/linux/install_centos6_py27_ius_nginx.sh b/linux/install_centos6_py27_ius_nginx.sh
@@ -2,6 +2,7 @@
 
 set -e -u -x
 
+EXPERIMENTAL=${EXPERIMENTAL:-false}
 OMEROVER=${OMEROVER:-latest}
 WEBAPPS=${WEBAPPS:-false}
 PGVER=${PGVER:-pg94}
@@ -25,6 +26,10 @@ bash -eux step02_centos6_py27_ius_setup.sh
 
 bash -eux step01_centos6_py27_ius_virtualenv_deps.sh
 
+if $EXPERIMENTAL" ; then
+    bash -eux step01_centos6_py27_ius_deps_experimental.sh
+fi
+
 if [[ "$PGVER" =~ ^(pg94|pg95)$ ]]; then
 	bash -eux step03_all_postgres.sh
 fi

diff --git a/linux/install_centos6_py27_nginx.sh b/linux/install_centos6_py27_nginx.sh
@@ -2,6 +2,7 @@
 
 set -e -u -x
 
+EXPERIMENTAL=${EXPERIMENTAL:-false}
 OMEROVER=${OMEROVER:-latest}
 WEBAPPS=${WEBAPPS:-false}
 PGVER=${PGVER:-pg94}
@@ -18,6 +19,10 @@ bash -eux step01_centos6_py27_ice_deps.sh
 
 bash -eux step01_centos6_py27_deps.sh
 
+if $EXPERIMENTAL" ; then
+    bash -eux step01_centos6_py27_deps_experimental.sh
+fi
+
 # install Postgres
 bash -eux step01_centos6_pg_deps.sh
 

diff --git a/linux/install_centos7_apache24.sh b/linux/install_centos7_apache24.sh
@@ -2,6 +2,7 @@
 
 set -e -u -x
 
+EXPERIMENTAL=${EXPERIMENTAL:-false}
 OMEROVER=${OMEROVER:-latest}
 WEBAPPS=${WEBAPPS:-false}
 PGVER=${PGVER:-pg94}
@@ -18,6 +19,10 @@ bash -eux step01_centos7_ice_deps.sh
 
 bash -eux step01_centos7_deps.sh
 
+if $EXPERIMENTAL" ; then
+    bash -eux step01_centos7_deps_experimental.sh
+fi
+
 # install Postgres
 bash -eux step01_centos7_pg_deps.sh
 

diff --git a/linux/install_centos7_nginx.sh b/linux/install_centos7_nginx.sh
@@ -2,6 +2,7 @@
 
 set -e -u -x
 
+EXPERIMENTAL=${EXPERIMENTAL:-false}
 OMEROVER=${OMEROVER:-latest}
 WEBAPPS=${WEBAPPS:-false}
 PGVER=${PGVER:-pg94}
@@ -18,6 +19,10 @@ bash -eux step01_centos7_ice_deps.sh
 
 bash -eux step01_centos7_deps.sh
 
+if $EXPERIMENTAL" ; then
+    bash -eux step01_centos7_deps_experimental.sh
+fi
+
 # install Postgres
 bash -eux step01_centos7_pg_deps.sh
 

diff --git a/linux/step01_centos6_py27_deps_experimental.sh b/linux/step01_centos6_py27_deps_experimental.sh
@@ -0,0 +1,13 @@
+#!/bin/bash
+
+#!/bin/bash
+
+yum -y install redis python-redis
+
+set +u
+source /opt/rh/python27/enable
+set -u
+
+pip install django-redis-cache=>1.6.5
+
+deactivate
diff --git a/linux/step01_centos6_py27_ius_deps_experimental.sh b/linux/step01_centos6_py27_ius_deps_experimental.sh
@@ -0,0 +1,13 @@
+#!/bin/bash
+
+#!/bin/bash
+
+yum -y install redis python-redis
+
+set +u
+source /opt/rh/python27/enable
+set -u
+
+pip install django-redis-cache=>1.6.5
+
+deactivate
diff --git a/linux/step01_centos7_deps_experimental.sh b/linux/step01_centos7_deps_experimental.sh
@@ -0,0 +1,5 @@
+#!/bin/bash
+
+yum -y install redis python-redis
+
+pip install django-redis-cache=>1.6.5
diff --git a/osx/install_homebrew.sh b/osx/install_homebrew.sh
@@ -2,7 +2,14 @@
 
 set -e -u -x
 
+EXPERIMENTAL=${EXPERIMENTAL:-false}
+
 bash -eux step01_deps.sh
 bash -eux step02_omero.sh
+
+if $EXPERIMENTAL" ; then
+    bash -eux step01_deps_experimental.sh
+fi
+
 bash -eux step03_nginx.sh
 bash -eux step04_test.sh
diff --git a/osx/step01_deps_experimental.sh b/osx/step01_deps_experimental.sh
@@ -0,0 +1,35 @@
+#!/usr/bin/env bash
+# Installs OMERO requirements
+
+set -e
+set -u
+set -x
+
+export PATH=/usr/local/bin:$PATH
+export LANG=${LANG:-en_US.UTF-8}
+export LANGUAGE=${LANGUAGE:-en_US:en}
+
+# Test whether this script is run in a job environment
+JOB_NAME=${JOB_NAME:-}
+if [[ -n $JOB_NAME ]]; then
+    DEFAULT_TESTING_MODE=true
+else
+    DEFAULT_TESTING_MODE=false
+fi
+TESTING_MODE=${TESTING_MODE:-$DEFAULT_TESTING_MODE}
+
+###################################################################
+# Redis installation
+###################################################################
+
+# Install redis
+brew install redis
+ln -sfv /usr/local/opt/redis/*.plist ~/Library/LaunchAgents
+launchctl load ~/Library/LaunchAgents/homebrew.mxcl.redis.plist
+
+# Install django-cache-redis
+pip install django-cache-redis=>1.6.5
+
+# Set up redis session backend
+omero config set omero.web.session_engine 'django.contrib.sessions.backends.cache'
+omero config set omero.web.caches '{"default": {"BACKEND": "redis_cache.RedisCache","LOCATION": "127.0.0.1:6379"}}'