Merge pull request #1726 from infosiftr/redis-config

Update redis and add new redis-basics-config test

library/redis

@@ -1,33 +1,33 @@
 # maintainer: InfoSiftr <github@infosiftr.com> (@infosiftr)
 
-2.8.23: git://github.com/docker-library/redis@41278185d321eb90ee6f898ff63c9b1db6a61a47 2.8
-2.8: git://github.com/docker-library/redis@41278185d321eb90ee6f898ff63c9b1db6a61a47 2.8
-2: git://github.com/docker-library/redis@41278185d321eb90ee6f898ff63c9b1db6a61a47 2.8
+2.8.23: git://github.com/docker-library/redis@6cb8a8015f126e2a7251c5d011b86b657e9febd6 2.8
+2.8: git://github.com/docker-library/redis@6cb8a8015f126e2a7251c5d011b86b657e9febd6 2.8
+2: git://github.com/docker-library/redis@6cb8a8015f126e2a7251c5d011b86b657e9febd6 2.8
 
-2.8.23-32bit: git://github.com/docker-library/redis@41278185d321eb90ee6f898ff63c9b1db6a61a47 2.8/32bit
-2.8-32bit: git://github.com/docker-library/redis@41278185d321eb90ee6f898ff63c9b1db6a61a47 2.8/32bit
-2-32bit: git://github.com/docker-library/redis@41278185d321eb90ee6f898ff63c9b1db6a61a47 2.8/32bit
+2.8.23-32bit: git://github.com/docker-library/redis@6cb8a8015f126e2a7251c5d011b86b657e9febd6 2.8/32bit
+2.8-32bit: git://github.com/docker-library/redis@6cb8a8015f126e2a7251c5d011b86b657e9febd6 2.8/32bit
+2-32bit: git://github.com/docker-library/redis@6cb8a8015f126e2a7251c5d011b86b657e9febd6 2.8/32bit
 
-3.0.7: git://github.com/docker-library/redis@41278185d321eb90ee6f898ff63c9b1db6a61a47 3.0
-3.0: git://github.com/docker-library/redis@41278185d321eb90ee6f898ff63c9b1db6a61a47 3.0
+3.0.7: git://github.com/docker-library/redis@6cb8a8015f126e2a7251c5d011b86b657e9febd6 3.0
+3.0: git://github.com/docker-library/redis@6cb8a8015f126e2a7251c5d011b86b657e9febd6 3.0
 
-3.0.7-32bit: git://github.com/docker-library/redis@41278185d321eb90ee6f898ff63c9b1db6a61a47 3.0/32bit
-3.0-32bit: git://github.com/docker-library/redis@41278185d321eb90ee6f898ff63c9b1db6a61a47 3.0/32bit
+3.0.7-32bit: git://github.com/docker-library/redis@6cb8a8015f126e2a7251c5d011b86b657e9febd6 3.0/32bit
+3.0-32bit: git://github.com/docker-library/redis@6cb8a8015f126e2a7251c5d011b86b657e9febd6 3.0/32bit
 
-3.0.7-alpine: git://github.com/docker-library/redis@41278185d321eb90ee6f898ff63c9b1db6a61a47 3.0/alpine
-3.0-alpine: git://github.com/docker-library/redis@41278185d321eb90ee6f898ff63c9b1db6a61a47 3.0/alpine
+3.0.7-alpine: git://github.com/docker-library/redis@6cb8a8015f126e2a7251c5d011b86b657e9febd6 3.0/alpine
+3.0-alpine: git://github.com/docker-library/redis@6cb8a8015f126e2a7251c5d011b86b657e9febd6 3.0/alpine
 
-3.2.0: git://github.com/docker-library/redis@41278185d321eb90ee6f898ff63c9b1db6a61a47 3.2
-3.2: git://github.com/docker-library/redis@41278185d321eb90ee6f898ff63c9b1db6a61a47 3.2
-3: git://github.com/docker-library/redis@41278185d321eb90ee6f898ff63c9b1db6a61a47 3.2
-latest: git://github.com/docker-library/redis@41278185d321eb90ee6f898ff63c9b1db6a61a47 3.2
+3.2.0: git://github.com/docker-library/redis@6cb8a8015f126e2a7251c5d011b86b657e9febd6 3.2
+3.2: git://github.com/docker-library/redis@6cb8a8015f126e2a7251c5d011b86b657e9febd6 3.2
+3: git://github.com/docker-library/redis@6cb8a8015f126e2a7251c5d011b86b657e9febd6 3.2
+latest: git://github.com/docker-library/redis@6cb8a8015f126e2a7251c5d011b86b657e9febd6 3.2
 
-3.2.0-32bit: git://github.com/docker-library/redis@41278185d321eb90ee6f898ff63c9b1db6a61a47 3.2/32bit
-3.2-32bit: git://github.com/docker-library/redis@41278185d321eb90ee6f898ff63c9b1db6a61a47 3.2/32bit
-3-32bit: git://github.com/docker-library/redis@41278185d321eb90ee6f898ff63c9b1db6a61a47 3.2/32bit
-32bit: git://github.com/docker-library/redis@41278185d321eb90ee6f898ff63c9b1db6a61a47 3.2/32bit
+3.2.0-32bit: git://github.com/docker-library/redis@6cb8a8015f126e2a7251c5d011b86b657e9febd6 3.2/32bit
+3.2-32bit: git://github.com/docker-library/redis@6cb8a8015f126e2a7251c5d011b86b657e9febd6 3.2/32bit
+3-32bit: git://github.com/docker-library/redis@6cb8a8015f126e2a7251c5d011b86b657e9febd6 3.2/32bit
+32bit: git://github.com/docker-library/redis@6cb8a8015f126e2a7251c5d011b86b657e9febd6 3.2/32bit
 
-3.2.0-alpine: git://github.com/docker-library/redis@41278185d321eb90ee6f898ff63c9b1db6a61a47 3.2/alpine
-3.2-alpine: git://github.com/docker-library/redis@41278185d321eb90ee6f898ff63c9b1db6a61a47 3.2/alpine
-3-alpine: git://github.com/docker-library/redis@41278185d321eb90ee6f898ff63c9b1db6a61a47 3.2/alpine
-alpine: git://github.com/docker-library/redis@41278185d321eb90ee6f898ff63c9b1db6a61a47 3.2/alpine
+3.2.0-alpine: git://github.com/docker-library/redis@6cb8a8015f126e2a7251c5d011b86b657e9febd6 3.2/alpine
+3.2-alpine: git://github.com/docker-library/redis@6cb8a8015f126e2a7251c5d011b86b657e9febd6 3.2/alpine
+3-alpine: git://github.com/docker-library/redis@6cb8a8015f126e2a7251c5d011b86b657e9febd6 3.2/alpine
+alpine: git://github.com/docker-library/redis@6cb8a8015f126e2a7251c5d011b86b657e9febd6 3.2/alpine

test/config.sh

@@ -138,6 +138,7 @@ imageTests+=(
 	'
 	[redis]='
 		redis-basics
+		redis-basics-config
 		redis-basics-persistent
 	'
 	[rethinkdb]='

test/tests/redis-basics-config/real-run.sh

@@ -0,0 +1 @@
+../redis-basics/run.sh

test/tests/redis-basics-config/run.sh

@@ -0,0 +1,15 @@
+#!/bin/bash
+set -eo pipefail
+
+dir="$(dirname "$(readlink -f "$BASH_SOURCE")")"
+
+image="$1"
+
+newImage="$("$dir/../image-name.sh" librarytest/redis-basics-persistent "$image")"
+"$dir/../docker-build.sh" "$dir" "$newImage" <<EOD
+FROM $image
+RUN echo 'save 60 1000' > ../test.conf
+CMD ["../test.conf", "--appendonly", "yes"]
+EOD
+
+exec "$dir/real-run.sh" "$newImage"