From 91d7df92ca7f78948d701cfbb4163590079a3a77 Mon Sep 17 00:00:00 2001
From: Dhruv Dang <dhruv@fika.co>
Date: Sun, 24 Jan 2016 00:56:17 -0800
Subject: [PATCH 1/2] Support custom redis.conf files

Even though the `$SERVICE_ROOT/config` volume is mapped to the `/usr/local/etc/redis` folder in the container, any specified `redis.conf` file in `$SERVICE_ROOT/config` will not be used by the running `redis-server` process. This pull request solves that problem, by downloading the `redis-stable/redis.conf` file from the redis website to `$SERVICE_ROOT/config/redis.conf`, then runs the redis server process in the container as `redis-server /usr/local/etc/redis/redis.conf`.

Users of `dokku-redis` will be able to configure the `$SERVICE_ROOT/config/redis.conf` file to their liking, restart the redis container and then see their changed configuration in effect.

This references [this issue](https://github.com/dokku/dokku-redis/issues/30).
---
 commands | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/commands b/commands
index 71aea8e..ee2f947 100755
--- a/commands
+++ b/commands
@@ -32,6 +32,7 @@ case "$1" in
     mkdir -p "$SERVICE_ROOT" || dokku_log_fail "Unable to create service directory"
     mkdir -p "$SERVICE_ROOT/data" || dokku_log_fail "Unable to create service data directory"
     mkdir -p "$SERVICE_ROOT/config" || dokku_log_fail "Unable to create service config directory"
+    curl http://download.redis.io/redis-stable/redis.conf > "$SERVICE_ROOT/config/redis.conf" || dokku_log_fail "Unable to download the default redis.conf to the config directory"
     touch "$LINKS_FILE"
 
     dokku_log_info1 "Starting container"
@@ -41,7 +42,7 @@ case "$1" in
       echo "" > "$SERVICE_ROOT/ENV"
     fi
     SERVICE_NAME=$(get_service_name "$SERVICE")
-    ID=$(docker run --name "$SERVICE_NAME" -v "$SERVICE_ROOT/data:/data" -v "$SERVICE_ROOT/config:/usr/local/etc/redis" --env-file="$SERVICE_ROOT/ENV" -d --restart always --label dokku=service --label dokku.service=redis "$PLUGIN_IMAGE:$PLUGIN_IMAGE_VERSION")
+    ID=$(docker run --name "$SERVICE_NAME" -v "$SERVICE_ROOT/data:/data" -v "$SERVICE_ROOT/config:/usr/local/etc/redis" --env-file="$SERVICE_ROOT/ENV" -d --restart always --label dokku=service --label dokku.service=redis "$PLUGIN_IMAGE:$PLUGIN_IMAGE_VERSION" redis-server /usr/local/etc/redis/redis.conf)
     echo "$ID" > "$SERVICE_ROOT/ID"
 
     dokku_log_verbose_quiet "Waiting for container to be ready"

From 0cbd4a860821306c2a0ef4f370389179c4d10cff Mon Sep 17 00:00:00 2001
From: Dhruv Dang <dhruv@fika.co>
Date: Mon, 25 Jan 2016 00:22:55 -0800
Subject: [PATCH 2/2] Pull the correct default redis.conf

Pulls the correct default `redis.conf`file based on the version supplied in the `REDIS_IMAGE_VERSION` environment variable
---
 commands | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/commands b/commands
index ee2f947..b6b68bf 100755
--- a/commands
+++ b/commands
@@ -32,7 +32,7 @@ case "$1" in
     mkdir -p "$SERVICE_ROOT" || dokku_log_fail "Unable to create service directory"
     mkdir -p "$SERVICE_ROOT/data" || dokku_log_fail "Unable to create service data directory"
     mkdir -p "$SERVICE_ROOT/config" || dokku_log_fail "Unable to create service config directory"
-    curl http://download.redis.io/redis-stable/redis.conf > "$SERVICE_ROOT/config/redis.conf" || dokku_log_fail "Unable to download the default redis.conf to the config directory"
+    curl "https://raw.githubusercontent.com/antirez/redis/${REDIS_IMAGE_VERSION:0:3}/redis.conf" > "$SERVICE_ROOT/config/redis.conf" || dokku_log_fail "Unable to download the default redis.conf to the config directory"
     touch "$LINKS_FILE"
 
     dokku_log_info1 "Starting container"