Use redis 3.0.5

Closes #30
This commit is contained in:
Jose Diaz-Gonzalez
2015-10-18 18:54:43 -04:00
committed by Jose Diaz-Gonzalez
parent c21ac89529
commit 2e7a3ce709
5 changed files with 8 additions and 8 deletions

View File

@@ -1,6 +1,6 @@
# dokku redis (beta) [![Build Status](https://img.shields.io/travis/dokku/dokku-redis.svg?branch=master "Build Status")](https://travis-ci.org/dokku/dokku-redis) [![IRC Network](https://img.shields.io/badge/irc-freenode-blue.svg "IRC Freenode")](https://webchat.freenode.net/?channels=dokku) # dokku redis (beta) [![Build Status](https://img.shields.io/travis/dokku/dokku-redis.svg?branch=master "Build Status")](https://travis-ci.org/dokku/dokku-redis) [![IRC Network](https://img.shields.io/badge/irc-freenode-blue.svg "IRC Freenode")](https://webchat.freenode.net/?channels=dokku)
Official redis plugin for dokku. Currently defaults to installing [redis 3.0.4](https://hub.docker.com/_/redis/). Official redis plugin for dokku. Currently defaults to installing [redis 3.0.5](https://hub.docker.com/_/redis/).
## requirements ## requirements

2
config
View File

@@ -1,6 +1,6 @@
#!/usr/bin/env bash #!/usr/bin/env bash
export REDIS_IMAGE=${REDIS_IMAGE:="redis"} export REDIS_IMAGE=${REDIS_IMAGE:="redis"}
export REDIS_IMAGE_VERSION=${REDIS_IMAGE_VERSION:="3.0.4"} export REDIS_IMAGE_VERSION=${REDIS_IMAGE_VERSION:="3.0.5"}
export REDIS_ROOT=${REDIS_ROOT:="/var/lib/dokku/services/redis"} export REDIS_ROOT=${REDIS_ROOT:="/var/lib/dokku/services/redis"}
export PLUGIN_COMMAND_PREFIX="redis" export PLUGIN_COMMAND_PREFIX="redis"

View File

@@ -38,7 +38,7 @@ case "$1" in
echo "0f33b1c86da9 mysql:5.7 \"/entrypoint.sh mysq 11 seconds ago Up 10 seconds 3306/tcp dokku.mysql.l" echo "0f33b1c86da9 mysql:5.7 \"/entrypoint.sh mysq 11 seconds ago Up 10 seconds 3306/tcp dokku.mysql.l"
echo "7f899b723c08 postgres:9.5 \"/docker-entrypoint. 11 seconds ago Up 10 seconds 5432/tcp dokku.postgres.l" echo "7f899b723c08 postgres:9.5 \"/docker-entrypoint. 11 seconds ago Up 10 seconds 5432/tcp dokku.postgres.l"
echo "5e50a462661e rabbitmq:3.5.4-management \"/docker-entrypoint. 11 seconds ago Up 10 seconds 5672/tcp, 15672/tcp dokku.rabbitmq.l" echo "5e50a462661e rabbitmq:3.5.4-management \"/docker-entrypoint. 11 seconds ago Up 10 seconds 5672/tcp, 15672/tcp dokku.rabbitmq.l"
echo "c39ca00fa3c6 redis:3.0.4 \"/entrypoint.sh redi 11 seconds ago Up 10 seconds 6379/tcp dokku.redis.l" echo "c39ca00fa3c6 redis:3.0.5 \"/entrypoint.sh redi 11 seconds ago Up 10 seconds 6379/tcp dokku.redis.l"
echo "dc98c2939a80 rethinkdb:2.1.1 \"rethinkdb --bind al 11 seconds ago Up 10 seconds 8080/tcp, 28015/tcp, 29015/tcp dokku.rethinkdb.l" echo "dc98c2939a80 rethinkdb:2.1.1 \"rethinkdb --bind al 11 seconds ago Up 10 seconds 8080/tcp, 28015/tcp, 29015/tcp dokku.rethinkdb.l"
fi fi
;; ;;
@@ -77,7 +77,7 @@ case "$1" in
echo "mysql 5.7 57d56ac47bed 13 days ago 321.3 MB" echo "mysql 5.7 57d56ac47bed 13 days ago 321.3 MB"
echo "postgres 9.5 6412eb70175e 11 days ago 265.7 MB" echo "postgres 9.5 6412eb70175e 11 days ago 265.7 MB"
echo "rabbitmq 3.5.4-management 327b803301e9 13 days ago 143.5 MB" echo "rabbitmq 3.5.4-management 327b803301e9 13 days ago 143.5 MB"
echo "redis 3.0.4 9216d5a4eec8 13 days ago 109.3 MB" echo "redis 3.0.5 9216d5a4eec8 13 days ago 109.3 MB"
echo "rethinkdb 2.1.1 f27010a550ec 13 days ago 196.3 MB" echo "rethinkdb 2.1.1 f27010a550ec 13 days ago 196.3 MB"
echo "svendowideit/ambassador latest 0d2200edc53e 21 months ago 7.241 MB" echo "svendowideit/ambassador latest 0d2200edc53e 21 months ago 7.241 MB"
;; ;;

View File

@@ -31,6 +31,6 @@ teardown() {
@test "($PLUGIN_COMMAND_PREFIX:import) success" { @test "($PLUGIN_COMMAND_PREFIX:import) success" {
export ECHO_DOCKER_COMMAND="true" export ECHO_DOCKER_COMMAND="true"
run dokku "$PLUGIN_COMMAND_PREFIX:import" l < "$PLUGIN_DATA_ROOT/fake.rdb" run dokku "$PLUGIN_COMMAND_PREFIX:import" l < "$PLUGIN_DATA_ROOT/fake.rdb"
assert_output "docker run --rm -i -v $PLUGIN_DATA_ROOT/l/data:/data redis:3.0.4 bash -c cat > /data/dump.rdb && chown redis: /data/dump.rdb" assert_output "docker run --rm -i -v $PLUGIN_DATA_ROOT/l/data:/data redis:3.0.5 bash -c cat > /data/dump.rdb && chown redis: /data/dump.rdb"
} }

View File

@@ -11,20 +11,20 @@ teardown() {
@test "($PLUGIN_COMMAND_PREFIX:list) with no exposed ports, no linked apps" { @test "($PLUGIN_COMMAND_PREFIX:list) with no exposed ports, no linked apps" {
run dokku "$PLUGIN_COMMAND_PREFIX:list" run dokku "$PLUGIN_COMMAND_PREFIX:list"
assert_contains "${lines[*]}" "l redis:3.0.4 running - -" assert_contains "${lines[*]}" "l redis:3.0.5 running - -"
} }
@test "($PLUGIN_COMMAND_PREFIX:list) with exposed ports" { @test "($PLUGIN_COMMAND_PREFIX:list) with exposed ports" {
dokku "$PLUGIN_COMMAND_PREFIX:expose" l 4242 dokku "$PLUGIN_COMMAND_PREFIX:expose" l 4242
run dokku "$PLUGIN_COMMAND_PREFIX:list" run dokku "$PLUGIN_COMMAND_PREFIX:list"
assert_contains "${lines[*]}" "l redis:3.0.4 running 6379->4242 -" assert_contains "${lines[*]}" "l redis:3.0.5 running 6379->4242 -"
} }
@test "($PLUGIN_COMMAND_PREFIX:list) with linked app" { @test "($PLUGIN_COMMAND_PREFIX:list) with linked app" {
dokku apps:create my_app dokku apps:create my_app
dokku "$PLUGIN_COMMAND_PREFIX:link" l my_app dokku "$PLUGIN_COMMAND_PREFIX:link" l my_app
run dokku "$PLUGIN_COMMAND_PREFIX:list" run dokku "$PLUGIN_COMMAND_PREFIX:list"
assert_contains "${lines[*]}" "l redis:3.0.4 running - my_app" assert_contains "${lines[*]}" "l redis:3.0.5 running - my_app"
dokku --force apps:destroy my_app dokku --force apps:destroy my_app
} }