From 5ff2445998388d25eef0ac9c6d76255a08ceaa8a Mon Sep 17 00:00:00 2001 From: Jose Diaz-Gonzalez Date: Sat, 27 Aug 2016 21:20:45 -0400 Subject: [PATCH] Downgrade redis --- README.md | 2 +- config | 2 +- tests/bin/docker | 4 ++-- tests/service_import.bats | 2 +- tests/service_list.bats | 6 +++--- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/README.md b/README.md index 98de273..60769d6 100644 --- a/README.md +++ b/README.md @@ -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) -Official redis plugin for dokku. Currently defaults to installing [redis 3.2.3](https://hub.docker.com/_/redis/). +Official redis plugin for dokku. Currently defaults to installing [redis 3.0.7](https://hub.docker.com/_/redis/). ## requirements diff --git a/config b/config index d59db58..cec388e 100755 --- a/config +++ b/config @@ -1,6 +1,6 @@ #!/usr/bin/env bash export REDIS_IMAGE=${REDIS_IMAGE:="redis"} -export REDIS_IMAGE_VERSION=${REDIS_IMAGE_VERSION:="3.2.3"} +export REDIS_IMAGE_VERSION=${REDIS_IMAGE_VERSION:="3.0.7"} export REDIS_ROOT=${REDIS_ROOT:="/var/lib/dokku/services/redis"} export PLUGIN_COMMAND_PREFIX="redis" diff --git a/tests/bin/docker b/tests/bin/docker index 9b4d7c0..10edc74 100755 --- a/tests/bin/docker +++ b/tests/bin/docker @@ -40,7 +40,7 @@ case "$1" in echo '9f10b6dc12d5 nats:0.9.4 "/entrypoint.sh redi" 11 seconds ago Up 10 seconds 4222/tcp dokku.nats.l' echo '7f899b723c08 postgres:9.5.4 "/docker-entrypoint." 11 seconds ago Up 10 seconds 5432/tcp dokku.postgres.l' echo '5e50a462661e rabbitmq:3.6.5-management "/docker-entrypoint." 11 seconds ago Up 10 seconds 5672/tcp, 15672/tcp dokku.rabbitmq.l' - echo 'c39ca00fa3c6 redis:3.2.3 "/entrypoint.sh redi" 11 seconds ago Up 10 seconds 6379/tcp dokku.redis.l' + echo 'c39ca00fa3c6 redis:3.0.7 "/entrypoint.sh redi" 11 seconds ago Up 10 seconds 6379/tcp dokku.redis.l' echo 'dc98c2939a80 rethinkdb:2.3.5 "rethinkdb --bind al" 11 seconds ago Up 10 seconds 8080/tcp, 28015/tcp, 29015/tcp dokku.rethinkdb.l' fi ;; @@ -82,7 +82,7 @@ case "$1" in echo "nats 0.9.4 9216d5a4eec8 2 days ago 109.3 MB" echo "postgres 9.5.4 6412eb70175e 2 days ago 265.7 MB" echo "rabbitmq 3.6.5-management 327b803301e9 2 days ago 143.5 MB" - echo "redis 3.2.3 9216d5a4eec8 2 days ago 109.3 MB" + echo "redis 3.0.7 9216d5a4eec8 2 days ago 109.3 MB" echo "rethinkdb 2.3.5 f27010a550ec 2 days ago 196.3 MB" echo "svendowideit/ambassador latest 0d2200edc53e 2 days ago 7.241 MB" ;; diff --git a/tests/service_import.bats b/tests/service_import.bats index cd6c8a3..366f257 100755 --- a/tests/service_import.bats +++ b/tests/service_import.bats @@ -31,6 +31,6 @@ teardown() { @test "($PLUGIN_COMMAND_PREFIX:import) success" { export ECHO_DOCKER_COMMAND="true" 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.2.3 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.7 bash -c cat > /data/dump.rdb && chown redis: /data/dump.rdb" } diff --git a/tests/service_list.bats b/tests/service_list.bats index 443c002..9be3252 100755 --- a/tests/service_list.bats +++ b/tests/service_list.bats @@ -11,20 +11,20 @@ teardown() { @test "($PLUGIN_COMMAND_PREFIX:list) with no exposed ports, no linked apps" { run dokku "$PLUGIN_COMMAND_PREFIX:list" - assert_contains "${lines[*]}" "l redis:3.2.3 running - -" + assert_contains "${lines[*]}" "l redis:3.0.7 running - -" } @test "($PLUGIN_COMMAND_PREFIX:list) with exposed ports" { dokku "$PLUGIN_COMMAND_PREFIX:expose" l 4242 run dokku "$PLUGIN_COMMAND_PREFIX:list" - assert_contains "${lines[*]}" "l redis:3.2.3 running 6379->4242 -" + assert_contains "${lines[*]}" "l redis:3.0.7 running 6379->4242 -" } @test "($PLUGIN_COMMAND_PREFIX:list) with linked app" { dokku apps:create my_app dokku "$PLUGIN_COMMAND_PREFIX:link" l my_app run dokku "$PLUGIN_COMMAND_PREFIX:list" - assert_contains "${lines[*]}" "l redis:3.2.3 running - my_app" + assert_contains "${lines[*]}" "l redis:3.0.7 running - my_app" dokku --force apps:destroy my_app }