Skip to content

Commit

Permalink
Merge pull request #1724 from infosiftr/redis-basics-persistent
Browse files Browse the repository at this point in the history 
Add new "redis-basics-persistent" test to verify persistence
  • Loading branch information
@yosifkit
yosifkit committed May 10, 2016
2 parents 2c8d4e8 + 4136b5e commit e9c58d8
Show file tree
Hide file tree
Showing 4 changed files with 40 additions and 24 deletions.
48 changes: 24 additions & 24 deletions library/redis
View file
Original file line number Diff line number Diff line change
@@ -1,33 +1,33 @@
# maintainer: InfoSiftr <github@infosiftr.com> (@infosiftr)

2.8.23: git://github.com/docker-library/redis@bc3ca850f4a2a2e9e5d4b3b8272e5536b4d21d24 2.8
2.8: git://github.com/docker-library/redis@bc3ca850f4a2a2e9e5d4b3b8272e5536b4d21d24 2.8
2: git://github.com/docker-library/redis@bc3ca850f4a2a2e9e5d4b3b8272e5536b4d21d24 2.8
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-32bit: git://github.com/docker-library/redis@bc3ca850f4a2a2e9e5d4b3b8272e5536b4d21d24 2.8/32bit
2.8-32bit: git://github.com/docker-library/redis@bc3ca850f4a2a2e9e5d4b3b8272e5536b4d21d24 2.8/32bit
2-32bit: git://github.com/docker-library/redis@bc3ca850f4a2a2e9e5d4b3b8272e5536b4d21d24 2.8/32bit
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

3.0.7: git://github.com/docker-library/redis@bc3ca850f4a2a2e9e5d4b3b8272e5536b4d21d24 3.0
3.0: git://github.com/docker-library/redis@bc3ca850f4a2a2e9e5d4b3b8272e5536b4d21d24 3.0
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-32bit: git://github.com/docker-library/redis@bc3ca850f4a2a2e9e5d4b3b8272e5536b4d21d24 3.0/32bit
3.0-32bit: git://github.com/docker-library/redis@bc3ca850f4a2a2e9e5d4b3b8272e5536b4d21d24 3.0/32bit
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-alpine: git://github.com/docker-library/redis@bc3ca850f4a2a2e9e5d4b3b8272e5536b4d21d24 3.0/alpine
3.0-alpine: git://github.com/docker-library/redis@bc3ca850f4a2a2e9e5d4b3b8272e5536b4d21d24 3.0/alpine
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.2.0: git://github.com/docker-library/redis@23b10607ef1810379d16664bcdb43723aa007266 3.2
3.2: git://github.com/docker-library/redis@23b10607ef1810379d16664bcdb43723aa007266 3.2
3: git://github.com/docker-library/redis@23b10607ef1810379d16664bcdb43723aa007266 3.2
latest: git://github.com/docker-library/redis@23b10607ef1810379d16664bcdb43723aa007266 3.2
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-32bit: git://github.com/docker-library/redis@23b10607ef1810379d16664bcdb43723aa007266 3.2/32bit
3.2-32bit: git://github.com/docker-library/redis@23b10607ef1810379d16664bcdb43723aa007266 3.2/32bit
3-32bit: git://github.com/docker-library/redis@23b10607ef1810379d16664bcdb43723aa007266 3.2/32bit
32bit: git://github.com/docker-library/redis@23b10607ef1810379d16664bcdb43723aa007266 3.2/32bit
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-alpine: git://github.com/docker-library/redis@23b10607ef1810379d16664bcdb43723aa007266 3.2/alpine
3.2-alpine: git://github.com/docker-library/redis@23b10607ef1810379d16664bcdb43723aa007266 3.2/alpine
3-alpine: git://github.com/docker-library/redis@23b10607ef1810379d16664bcdb43723aa007266 3.2/alpine
alpine: git://github.com/docker-library/redis@23b10607ef1810379d16664bcdb43723aa007266 3.2/alpine
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
1 change: 1 addition & 0 deletions test/config.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -138,6 +138,7 @@ imageTests+=(
'
[redis]='
redis-basics
redis-basics-persistent
'
[rethinkdb]='
'
Expand Down
1 change: 1 addition & 0 deletions test/tests/redis-basics-persistent/real-run.sh
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
../redis-basics/run.sh
14 changes: 14 additions & 0 deletions test/tests/redis-basics-persistent/run.sh
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
#!/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
CMD ["--appendonly", "yes"]
EOD

exec "$dir/real-run.sh" "$newImage"

0 comments on commit e9c58d8

Please sign in to comment.