close #2

Author: tifayuki

Dockerfile

@@ -11,8 +11,11 @@ RUN apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv C7917B12 && \
 # Add scripts
 ADD run.sh /run.sh
 ADD set_redis_password.sh /set_redis_password.sh
-ADD set_redis_mode.sh /set_redis_mode.sh
-RUN chmod 755 /*.sh
+RUN chmod +x /*.sh
+
+# SET environment variables
+ENV REDIS_MODE **None**
+ENV REDIS_TIMEOUT 0
 
 EXPOSE 6379
 CMD ["/run.sh"]

run.sh

@@ -1,9 +1,27 @@
 #!/bin/bash
-if [ ! -f /.redis_mode_set ]; then
-	/set_redis_mode.sh
+if [ "${REDIS_MODE}" == "**None**" ]; then
+    unset REDIS_MODE
 fi
+
+if [ ! -f /.redis_configured ]; then
+    if [ "$REDIS_MODE" == "LRU" ]; then
+        echo "=> Configuring redis as a LRU cache"
+        MAXMEMORY=${REDIS_MAXMEMORY:-"256mb"}
+        touch /etc/redis/redis_default.conf
+        echo "maxmemory $MAXMEMORY" >> /etc/redis/redis_default.conf
+        echo "maxmemory-policy allkeys-lru" >> /etc/redis/redis_default.conf
+    else
+        echo "=> Unknown $REDIS_MODE mode - ignoring"
+    fi
+
+    echo "=> Setting timeout to ${REDIS_TIMEOUT}"
+    echo timeout ${REDIS_TIMEOUT} >> /etc/redis/redis_default.conf
+
+    touch /.redis_configured
+fi
+
 if [ ! -f /.redis_password_set ]; then
-	/set_redis_password.sh
+        /set_redis_password.sh
 fi
 
-exec /usr/bin/redis-server /etc/redis/redis_default.conf
+exec /usr/bin/redis-server /etc/redis/redis_default.conf