From dffd977cac99b7442219d4bf63334294eb1f45b6 Mon Sep 17 00:00:00 2001
From: Miguel Martinez <miguel@bitnami.com>
Date: Wed, 27 May 2015 19:23:25 -0700
Subject: [PATCH] Redis image first version

---
 bitnami/redis/Dockerfile      | 20 ++++++++++++++++++++
 bitnami/redis/entrypoint.sh   |  9 +++++++++
 bitnami/redis/post-install.sh | 29 +++++++++++++++++++++++++++++
 3 files changed, 58 insertions(+)
 create mode 100644 bitnami/redis/Dockerfile
 create mode 100755 bitnami/redis/entrypoint.sh
 create mode 100644 bitnami/redis/post-install.sh

diff --git a/bitnami/redis/Dockerfile b/bitnami/redis/Dockerfile
new file mode 100644
index 000000000000..a696539b2f03
--- /dev/null
+++ b/bitnami/redis/Dockerfile
@@ -0,0 +1,20 @@
+FROM ubuntu-debootstrap:14.04
+MAINTAINER Bitnami
+
+ENV BITNAMI_APP_NAME redis
+ENV BITNAMI_APP_VERSION 2.8.20-0
+
+ADD https://storage.googleapis.com/bitnami-artifacts/install.sh?GoogleAccessId=432889337695-e1gggo94k5qubupjsb35tajs91bdu0hg@developer.gserviceaccount.com&Expires=1434934078&Signature=QNkAu%2F8E2RlalSQy4n1sxMhsGKF%2FVltr6zu65HU6A9H0HKOgl6u9etqy9w6OwD4DsLMxYuy2uymOK3iDc5RbfkAMncKI1zJpxcwRQ4Mt43Oe8PBXKbQYcZ7mQaYPtpnjYblDs1S2p12Pu5NTDJHK2hJ1MrIUYwBup5n60R6OJRI%3D /tmp/install.sh
+ADD post-install.sh /tmp/post-install.sh
+
+RUN stack=1 sh /tmp/install.sh --disable-components common
+
+EXPOSE 6379
+VOLUME ["/data", "/conf", "/logs"]
+
+ENV PATH /usr/local/bitnami/redis/bin:/usr/local/bitnami/common/bin:$PATH
+
+COPY entrypoint.sh /entrypoint.sh
+ENTRYPOINT ["/entrypoint.sh"]
+
+CMD ["redis-server", "/usr/local/bitnami/redis/etc/redis.conf"]
diff --git a/bitnami/redis/entrypoint.sh b/bitnami/redis/entrypoint.sh
new file mode 100755
index 000000000000..50e89589e9f9
--- /dev/null
+++ b/bitnami/redis/entrypoint.sh
@@ -0,0 +1,9 @@
+#!/bin/bash
+
+if [ ! "$(ls -A /conf)" ]; then
+  cp -r /usr/local/bitnami/redis/etc/conf.defaults/* /usr/local/bitnami/redis/etc/conf
+fi
+
+# TODO, Add random password
+
+exec "$@"
diff --git a/bitnami/redis/post-install.sh b/bitnami/redis/post-install.sh
new file mode 100644
index 000000000000..12536e488903
--- /dev/null
+++ b/bitnami/redis/post-install.sh
@@ -0,0 +1,29 @@
+#!/bin/bash
+
+INSTALL_DIR=$1
+cd $INSTALL_DIR
+
+# remove unneeded files
+rm -rf $INSTALL_DIR/scripts
+
+# set up default config
+mkdir $INSTALL_DIR/etc/conf.defaults
+mv $INSTALL_DIR/etc/redis.conf $INSTALL_DIR/etc/conf.defaults
+ln -s $INSTALL_DIR/etc/conf/redis.conf $INSTALL_DIR/etc/redis.conf
+
+# set up data
+mkdir $INSTALL_DIR/var/data
+
+# symlink mount points at root to install dir
+ln -s $INSTALL_DIR/etc/conf /conf
+ln -s $INSTALL_DIR/var/data /data
+ln -s $INSTALL_DIR/var/log /logs
+
+# set up logging to stdout
+ln -sf /dev/stdout /logs/redis-server.log
+
+# Conf modifications
+sed -i -e 's:\(dir '$INSTALL_DIR'/var\):\1/data:' $INSTALL_DIR/etc/conf.defaults/redis.conf
+sed -i -e 's:\(daemonize\) yes:\1 no:' $INSTALL_DIR/etc/conf.defaults/redis.conf
+
+