From db32a994f5adbf2ecdd108d9ca048806d78775b9 Mon Sep 17 00:00:00 2001 From: Jose Diaz-Gonzalez Date: Sat, 16 Mar 2019 21:45:35 -0400 Subject: [PATCH] feat: increase minimum dokku version --- .travis.yml | 6 ++---- README.md | 2 +- tests/service_unlink.bats | 15 ++------------- 3 files changed, 5 insertions(+), 18 deletions(-) diff --git a/.travis.yml b/.travis.yml index 81181d5..0630e9e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -3,8 +3,6 @@ dist: trusty language: bash env: - DOKKU_VERSION=master DOKKU_SYSTEM_GROUP=travis DOKKU_SYSTEM_USER=travis - - DOKKU_VERSION=v0.7.0 DOKKU_SYSTEM_GROUP=travis DOKKU_SYSTEM_USER=travis - - DOKKU_VERSION=v0.6.0 DOKKU_SYSTEM_GROUP=travis DOKKU_SYSTEM_USER=travis - - DOKKU_VERSION=v0.5.0 DOKKU_SYSTEM_GROUP=travis DOKKU_SYSTEM_USER=travis - - DOKKU_VERSION=v0.4.0 DOKKU_SYSTEM_GROUP=travis DOKKU_SYSTEM_USER=travis + - DOKKU_VERSION=v0.14.0 DOKKU_SYSTEM_GROUP=travis DOKKU_SYSTEM_USER=travis + - DOKKU_VERSION=v0.12.0 DOKKU_SYSTEM_GROUP=travis DOKKU_SYSTEM_USER=travis script: make test diff --git a/README.md b/README.md index ce5a628..7b4466a 100644 --- a/README.md +++ b/README.md @@ -4,7 +4,7 @@ Official mysql plugin for dokku. Currently defaults to installing [mysql 5.7.12] ## requirements -- dokku 0.4.x+ +- dokku 0.12.x+ - docker 1.8.x ## installation diff --git a/tests/service_unlink.bats b/tests/service_unlink.bats index 5475626..2a146bc 100755 --- a/tests/service_unlink.bats +++ b/tests/service_unlink.bats @@ -40,19 +40,8 @@ teardown() { dokku "$PLUGIN_COMMAND_PREFIX:link" l my_app >&2 dokku "$PLUGIN_COMMAND_PREFIX:unlink" l my_app - check_value="" - report_action="docker-options" - if [[ "$(dokku version)" == "master" ]]; then - check_value="Docker options build: Docker options deploy: --restart=on-failure:10 Docker options run:" - report_action="docker-options:report" - elif [[ "$(at-least-version 0.8.1 "$(dokku version)")" == "true" ]]; then - check_value="Docker options build: Docker options deploy: --restart=on-failure:10 Docker options run:" - report_action="docker-options:report" - elif [[ "$(at-least-version 0.7.0 "$(dokku version)")" == "true" ]]; then - check_value="Deploy options: --restart=on-failure:10" - fi - - options=$(dokku --quiet $report_action my_app | xargs) + check_value="Docker options build: Docker options deploy: --restart=on-failure:10 Docker options run:" + options=$(dokku --quiet docker-options:report my_app | xargs) assert_equal "$options" "$check_value" }