diff --git a/Dockerfile b/Dockerfile index 58e5c1b..5a670ea 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1 +1 @@ -FROM postgres:16.2 +FROM postgres:17.0 diff --git a/README.md b/README.md index 67d73e0..87bfaec 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ # dokku postgres [![Build Status](https://img.shields.io/github/actions/workflow/status/dokku/dokku-postgres/ci.yml?branch=master&style=flat-square "Build Status")](https://github.com/dokku/dokku-postgres/actions/workflows/ci.yml?query=branch%3Amaster) [![IRC Network](https://img.shields.io/badge/irc-libera-blue.svg?style=flat-square "IRC Libera")](https://webchat.libera.chat/?channels=dokku) -Official postgres plugin for dokku. Currently defaults to installing [postgres 16.2](https://hub.docker.com/_/postgres/). +Official postgres plugin for dokku. Currently defaults to installing [postgres 17.0](https://hub.docker.com/_/postgres/). ## Requirements diff --git a/docs/create.md b/docs/create.md index 1d70706..a81f148 100644 --- a/docs/create.md +++ b/docs/create.md @@ -1,5 +1,13 @@ Official Postgres "$DOCKER_BIN" image ls does not include postgis extension (amongst others). The following example creates a new postgres service using `postgis/postgis:13-3.1` image, which includes the `postgis` extension. ```shell +# use the appropriate image-version for your use-case dokku postgres:create postgis-database --image "postgis/postgis" --image-version "13-3.1" ``` + +To use pgvector instead, run the following: + +```shell +# use the appropriate image-version for your use-case +dokku postgres:create pgvector-database --image "pgvector/pgvector" --image-version "pg17" +``` diff --git a/functions b/functions index a09b4c8..9442d72 100755 --- a/functions +++ b/functions @@ -18,7 +18,7 @@ service_connect() { local SERVICE_TTY_OPTS has_tty && SERVICE_TTY_OPTS="-t" - "$DOCKER_BIN" container exec --env=LANG=C.UTF-8 --env=LC_ALL=C.UTF-8 -i $SERVICE_TTY_OPTS "$SERVICE_NAME" psql -h localhost -U postgres "$DATABASE_NAME" + "$DOCKER_BIN" container exec --env=LANG=C.UTF-8 --env=LC_ALL=C.UTF-8 -i $SERVICE_TTY_OPTS "$SERVICE_NAME" psql -v ON_ERROR_STOP=1 -h localhost -U postgres "$DATABASE_NAME" } service_create() { diff --git a/plugin.toml b/plugin.toml index 1c9b51c..1e51937 100644 --- a/plugin.toml +++ b/plugin.toml @@ -1,4 +1,4 @@ [plugin] description = "dokku postgres service plugin" -version = "1.36.4" +version = "1.39.0" [plugin.config] diff --git a/tests/link_networks.bats b/tests/link_networks.bats index f75dfbe..3d37638 100755 --- a/tests/link_networks.bats +++ b/tests/link_networks.bats @@ -48,7 +48,7 @@ teardown() { assert_output_contains bridge 0 assert_output_contains custom-network - run docker inspect dokku.$PLUGIN_COMMAND_PREFIX.ls -f '{{range $net,$v := .NetworkSettings.Networks}}{{range $k,$alias := $v.Aliases}}{{printf "alias:%s\n" $alias}}{{end}}{{end}}' + run docker inspect dokku.$PLUGIN_COMMAND_PREFIX.ls -f '{{range $net,$v := .NetworkSettings.Networks}}{{range $k,$alias := $v.DNSNames}}{{printf "alias:%s\n" $alias}}{{end}}{{end}}' echo "output: $output" echo "status: $status" assert_success @@ -120,7 +120,7 @@ teardown() { assert_output_contains custom-network assert_output_contains bridge - run docker inspect dokku.$PLUGIN_COMMAND_PREFIX.ls -f '{{range $net,$v := .NetworkSettings.Networks}}{{range $k,$alias := $v.Aliases}}{{printf "alias:%s\n" $alias}}{{end}}{{end}}' + run docker inspect dokku.$PLUGIN_COMMAND_PREFIX.ls -f '{{range $net,$v := .NetworkSettings.Networks}}{{range $k,$alias := $v.DNSNames}}{{printf "alias:%s\n" $alias}}{{end}}{{end}}' echo "output: $output" echo "status: $status" assert_success @@ -192,7 +192,7 @@ teardown() { assert_output_contains bridge assert_output_contains custom-network - run docker inspect dokku.$PLUGIN_COMMAND_PREFIX.ls -f '{{range $net,$v := .NetworkSettings.Networks}}{{range $k,$alias := $v.Aliases}}{{printf "alias:%s\n" $alias}}{{end}}{{end}}' + run docker inspect dokku.$PLUGIN_COMMAND_PREFIX.ls -f '{{range $net,$v := .NetworkSettings.Networks}}{{range $k,$alias := $v.DNSNames}}{{printf "alias:%s\n" $alias}}{{end}}{{end}}' echo "output: $output" echo "status: $status" assert_success @@ -258,7 +258,7 @@ teardown() { assert_output_contains bridge assert_output_contains custom-network - run docker inspect dokku.$PLUGIN_COMMAND_PREFIX.lsa -f '{{range $net,$v := .NetworkSettings.Networks}}{{range $k,$alias := $v.Aliases}}{{printf "alias:%s\n" $alias}}{{end}}{{end}}' + run docker inspect dokku.$PLUGIN_COMMAND_PREFIX.lsa -f '{{range $net,$v := .NetworkSettings.Networks}}{{range $k,$alias := $v.DNSNames}}{{printf "alias:%s\n" $alias}}{{end}}{{end}}' echo "output: $output" echo "status: $status" assert_success diff --git a/tests/shellcheck-exclude b/tests/shellcheck-exclude index 9a160cf..9fbac74 100644 --- a/tests/shellcheck-exclude +++ b/tests/shellcheck-exclude @@ -1,4 +1,5 @@ # SC1090 - Can't follow non-constant source. Use a directive to specify location - https://github.com/koalaman/shellcheck/wiki/SC1090 +# SC1091 - Not following - # SC2034 - Variable appears unused. Verify it or export it - https://github.com/koalaman/shellcheck/wiki/SC2034 # SC2155 - Declare and assign separately to avoid masking return values - https://github.com/koalaman/shellcheck/wiki/SC2155 # SC2206 - Quote to prevent word splitting/globbing, or split robustly with mapfile or read -a - https://github.com/koalaman/shellcheck/wiki/SC2206