Support for memcached

salopensource · Aug 11, 2015 · 0e32607 · 0e32607
1 parent 4673947
commit 0e32607
Show file tree

Hide file tree

Showing 3 changed files with 33 additions and 1 deletion.
diff --git a/docker/README.md b/docker/README.md
@@ -62,4 +62,24 @@ $ docker run -d --name="sal" \
   macadmins/sal:2.0.1
 ```
 
+# Advanced usage
 
+Sal supports the use of memcached for improving performance. It exects a linked memcached container and will use it if there is a container named ``memcached``:
+
+``` bash
+$ docker run -d \
+  --restart="always" \
+  --name="memcached" \
+  memcached:1.4.24
+
+$ docker run -d --name="sal" \
+  -p 80:8000 \
+  --link postgres-sal:db \
+  --link memcached:memcached \
+  -e ADMIN_PASS=pass \
+  -e DB_NAME=sal \
+  -e DB_USER=admin \
+  -e DB_PASS=password \
+  --restart="always" \
+  macadmins/sal:2.0.1
+```
diff --git a/docker/settings.py b/docker/settings.py
@@ -12,6 +12,17 @@
     }
 }
 
+# Memcached
+if os.environ.has_key('MEMCACHED_PORT_11211_TCP_ADDR'):
+    CACHES = {
+        'default': {
+            'BACKEND': 'django.core.cache.backends.memcached.MemcachedCache',
+            'LOCATION': [
+                '%s:%s' % (os.environ['MEMCACHED_PORT_11211_TCP_ADDR'], os.environ['MEMCACHED_PORT_11211_TCP_PORT']),
+            ]
+        }
+    }
+
 # PG Database
 if os.environ.has_key('DB_PORT_5432_TCP_ADDR'):
     DATABASES = {

diff --git a/setup/requirements.txt b/setup/requirements.txt
@@ -17,4 +17,5 @@ requests==2.5.0
 six==1.9.0
 urllib3==1.10
 wsgiref==0.1.2
-djangorestframework==3.1.3
+djangorestframework==3.1.3
+python-memcached==1.57