From 499d8ba786b341e30d8d181d37bcc04d5887a599 Mon Sep 17 00:00:00 2001 From: Jose Diaz-Gonzalez Date: Wed, 11 May 2016 12:36:06 -0400 Subject: [PATCH] Downgrade mysql. Refs #56 --- README.md | 2 +- config | 2 +- tests/bin/docker | 4 ++-- tests/service_list.bats | 6 +++--- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/README.md b/README.md index 52523a4..68e01bc 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ # dokku mysql (beta) [![Build Status](https://img.shields.io/travis/dokku/dokku-mysql.svg?branch=master "Build Status")](https://travis-ci.org/dokku/dokku-mysql) [![IRC Network](https://img.shields.io/badge/irc-freenode-blue.svg "IRC Freenode")](https://webchat.freenode.net/?channels=dokku) -Official mysql plugin for dokku. Currently defaults to installing [mysql 5.7.12](https://hub.docker.com/_/mysql/). +Official mysql plugin for dokku. Currently defaults to installing [mysql 5.7.10](https://hub.docker.com/_/mysql/). ## requirements diff --git a/config b/config index 3644795..c9defa4 100644 --- a/config +++ b/config @@ -1,6 +1,6 @@ #!/usr/bin/env bash export MYSQL_IMAGE=${MYSQL_IMAGE:="mysql"} -export MYSQL_IMAGE_VERSION=${MYSQL_IMAGE_VERSION:="5.7.12"} +export MYSQL_IMAGE_VERSION=${MYSQL_IMAGE_VERSION:="5.7.10"} export MYSQL_ROOT=${MYSQL_ROOT:="/var/lib/dokku/services/mysql"} export PLUGIN_COMMAND_PREFIX="mysql" diff --git a/tests/bin/docker b/tests/bin/docker index 771e861..bae1ec9 100755 --- a/tests/bin/docker +++ b/tests/bin/docker @@ -35,7 +35,7 @@ case "$1" in echo "94df08fe5550 mariadb:10.0.21 \"/docker-entrypoint. 11 seconds ago Up 10 seconds 3306/tcp dokku.mariadb.l" echo "ef27fec191ba memcached:1.4.24 \"/entrypoint.sh memc 11 seconds ago Up 10 seconds 11211/tcp dokku.memcached.l" echo "c0f74fc90377 mongo:3.1.7 \"/entrypoint.sh mong 11 seconds ago Up 10 seconds 27017/tcp dokku.mongo.l" - echo "0f33b1c86da9 mysql:5.7.12 \"/entrypoint.sh mysq 11 seconds ago Up 10 seconds 3306/tcp dokku.mysql.l" + echo "0f33b1c86da9 mysql:5.7.10 \"/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 "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.3 \"/entrypoint.sh redi 11 seconds ago Up 10 seconds 6379/tcp dokku.redis.l" @@ -74,7 +74,7 @@ case "$1" in echo "mariadb 10.0.21 f2485761e714 11 days ago 302.2 MB" echo "memcached 1.4.24 8a05b51f8876 13 days ago 132.4 MB" echo "mongo 3.1.7 12eadb136159 13 days ago 291.1 MB" - echo "mysql 5.7.12 57d56ac47bed 13 days ago 321.3 MB" + echo "mysql 5.7.10 57d56ac47bed 13 days ago 321.3 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 "redis 3.0.3 9216d5a4eec8 13 days ago 109.3 MB" diff --git a/tests/service_list.bats b/tests/service_list.bats index 286a8dc..fe3db38 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 mysql:5.7.12 running - -" + assert_contains "${lines[*]}" "l mysql:5.7.10 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 mysql:5.7.12 running 3306->4242 -" + assert_contains "${lines[*]}" "l mysql:5.7.10 running 3306->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 mysql:5.7.12 running - my_app" + assert_contains "${lines[*]}" "l mysql:5.7.10 running - my_app" dokku --force apps:destroy my_app }