diff --git a/README.md b/README.md index 7ee8a56..1359df2 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ # dokku postgres (beta) [![Build Status](https://img.shields.io/travis/dokku/dokku-postgres.svg?branch=master "Build Status")](https://travis-ci.org/dokku/dokku-postgres) [![IRC Network](https://img.shields.io/badge/irc-freenode-blue.svg "IRC Freenode")](https://webchat.freenode.net/?channels=dokku) -Official postgres plugin for dokku. Currently defaults to installing [postgres 9.5.2](https://hub.docker.com/_/postgres/). +Official postgres plugin for dokku. Currently defaults to installing [postgres 9.5.4](https://hub.docker.com/_/postgres/). ## requirements @@ -47,7 +47,7 @@ dokku postgres:create lolipop # it *must* be compatible with the # official postgres image export POSTGRES_IMAGE="postgres" -export POSTGRES_IMAGE_VERSION="9.5.2" +export POSTGRES_IMAGE_VERSION="9.5.4" # you can also specify custom environment # variables to start the postgres service @@ -157,7 +157,7 @@ OR At the moment a database can’t be upgraded (or downgraded) inplace. Instead a clone has to be made, like this: ```shell -# Our original DB using default PG 9.5.2 +# Our original DB using default PG 9.5.4 $ dokku postgres:create db9.4 # Migrate it like this for example diff --git a/config b/config index 198986e..4ff8872 100644 --- a/config +++ b/config @@ -1,6 +1,6 @@ #!/usr/bin/env bash export POSTGRES_IMAGE=${POSTGRES_IMAGE:="postgres"} -export POSTGRES_IMAGE_VERSION=${POSTGRES_IMAGE_VERSION:="9.5.2"} +export POSTGRES_IMAGE_VERSION=${POSTGRES_IMAGE_VERSION:="9.5.4"} export POSTGRES_ROOT=${POSTGRES_ROOT:="/var/lib/dokku/services/postgres"} export PLUGIN_COMMAND_PREFIX="postgres" diff --git a/tests/bin/docker b/tests/bin/docker index 32ea252..9b4d7c0 100755 --- a/tests/bin/docker +++ b/tests/bin/docker @@ -33,15 +33,15 @@ case "$1" in echo '4eeaae231d5e elasticsearch:1.7.5 "/docker-entrypoint." 11 seconds ago Up 10 seconds 9200/tcp, 9300/tcp dokku.elasticsearch.l' echo '2b20a383226d frodenas/couchdb:1.6 "/scripts/run.sh" 11 seconds ago Up 10 seconds 5984/tcp dokku.couchdb.l' echo '76a0e7154483 jlachowski/grafana-graphite-statsd:2.5.0 "/usr/bin/supervisor" 11 seconds ago Up 10 seconds 80/tcp, 2003/tcp, 8126/tcp, 8125/udp dokku.graphite.l' - echo '94df08fe5550 mariadb:10.1.13 "/docker-entrypoint." 11 seconds ago Up 10 seconds 3306/tcp dokku.mariadb.l' - echo 'ef27fec191ba memcached:1.4.25 "/entrypoint.sh memc" 11 seconds ago Up 10 seconds 11211/tcp dokku.memcached.l' - echo 'c0f74fc90377 mongo:3.2.6 "/entrypoint.sh mong" 11 seconds ago Up 10 seconds 27017/tcp dokku.mongo.l' - echo '0f33b1c86da9 mysql:5.7.10 "/entrypoint.sh mysq" 11 seconds ago Up 10 seconds 3306/tcp dokku.mysql.l' - echo '9f10b6dc12d5 nats:0.8.1 "/entrypoint.sh redi" 11 seconds ago Up 10 seconds 4222/tcp dokku.nats.l' - echo '7f899b723c08 postgres:9.5.2 "/docker-entrypoint." 11 seconds ago Up 10 seconds 5432/tcp dokku.postgres.l' - echo '5e50a462661e rabbitmq:3.6.1-management "/docker-entrypoint." 11 seconds ago Up 10 seconds 5672/tcp, 15672/tcp dokku.rabbitmq.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.2 "rethinkdb --bind al" 11 seconds ago Up 10 seconds 8080/tcp, 28015/tcp, 29015/tcp dokku.rethinkdb.l' + echo '94df08fe5550 mariadb:10.1.16 "/docker-entrypoint." 11 seconds ago Up 10 seconds 3306/tcp dokku.mariadb.l' + echo 'ef27fec191ba memcached:1.4.31 "/entrypoint.sh memc" 11 seconds ago Up 10 seconds 11211/tcp dokku.memcached.l' + echo 'c0f74fc90377 mongo:3.2.9 "/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 '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 'dc98c2939a80 rethinkdb:2.3.5 "rethinkdb --bind al" 11 seconds ago Up 10 seconds 8080/tcp, 28015/tcp, 29015/tcp dokku.rethinkdb.l' fi ;; exec) @@ -75,15 +75,15 @@ case "$1" in echo "elasticsearch 1.7.5 89ed89918502 2 days ago 522.1 MB" echo "frodenas/couchdb 1.6 cb9a62e007eb 2 days ago 537 MB" echo "jlachowski/grafana-graphite-statsd 2.5.0 75dcd48a5eef 2 days ago 936.4 MB" - echo "mariadb 10.1.13 f2485761e714 2 days ago 302.2 MB" - echo "memcached 1.4.25 8a05b51f8876 2 days ago 132.4 MB" - echo "mongo 3.2.6 12eadb136159 2 days ago 291.1 MB" - echo "mysql 5.7.10 57d56ac47bed 2 days ago 321.3 MB" - echo "nats 0.8.1 9216d5a4eec8 2 days ago 109.3 MB" - echo "postgres 9.5.2 6412eb70175e 2 days ago 265.7 MB" - echo "rabbitmq 3.6.1-management 327b803301e9 2 days ago 143.5 MB" - echo "redis 3.0.7 9216d5a4eec8 2 days ago 109.3 MB" - echo "rethinkdb 2.3.2 f27010a550ec 2 days ago 196.3 MB" + echo "mariadb 10.1.16 f2485761e714 2 days ago 302.2 MB" + echo "memcached 1.4.31 8a05b51f8876 2 days ago 132.4 MB" + echo "mongo 3.2.9 12eadb136159 2 days ago 291.1 MB" + echo "mysql 5.7.12 57d56ac47bed 2 days ago 321.3 MB" + 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 "rethinkdb 2.3.5 f27010a550ec 2 days ago 196.3 MB" echo "svendowideit/ambassador latest 0d2200edc53e 2 days ago 7.241 MB" ;; pull) diff --git a/tests/service_list.bats b/tests/service_list.bats index 14c5fd0..e2fbecf 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 postgres:9.5.2 running - -" + assert_contains "${lines[*]}" "l postgres:9.5.4 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 postgres:9.5.2 running 5432->4242 -" + assert_contains "${lines[*]}" "l postgres:9.5.4 running 5432->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 postgres:9.5.2 running - my_app" + assert_contains "${lines[*]}" "l postgres:9.5.4 running - my_app" dokku --force apps:destroy my_app }