Release 1.34.2

Merge pull request #301 from danielfornarini/fix/postgres-create-with-docker
Fix postgres:create when running inside a docker container
2023-08-20 12:27:33 -04:00 · 2023-08-20 12:27:22 -04:00 · 2023-08-16 14:16:58 +02:00
4 changed files with 6 additions and 2 deletions
--- a/2
+++ b/2
@@ -149,7 +149,7 @@ service_create_container() {

  dokku_log_verbose_quiet "Securing connection to database"
  service_pause "$SERVICE" >/dev/null
-  "$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)/scripts/create_ssl_certs.sh" "$SERVICE_HOST_ROOT" &>/dev/null
+  "$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)/scripts/create_ssl_certs.sh" "$SERVICE_ROOT" &>/dev/null
  "$DOCKER_BIN" container run --rm -i -v "$SERVICE_HOST_ROOT/data:/var/lib/postgresql/data" -v "$SERVICE_HOST_ROOT/certs:/var/lib/postgresql/certs" "$PLUGIN_IMAGE:$PLUGIN_IMAGE_VERSION" bash -s <"$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)/scripts/enable_ssl.sh" &>/dev/null
  rm -rf "$SERVICE_HOST_ROOT/certs"

--- a/plugin.toml
+++ b/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku postgres service plugin"
-version = "1.34.1"
+version = "1.34.2"
 [plugin.config]
--- a/scripts/create_ssl_certs.sh
+++ b/scripts/create_ssl_certs.sh
@@ -1,5 +1,7 @@
 #!/bin/sh

+set -e
+
 postgres_service_dir="$1"

 cd "$postgres_service_dir"
--- a/scripts/enable_ssl.sh
+++ b/scripts/enable_ssl.sh
@@ -1,5 +1,7 @@
 #!/bin/sh

+set -e
+
 cd /var/lib/postgresql/data

 cp ../certs/* .
Author	SHA1	Message	Date
Jose Diaz-Gonzalez	201eac3809	Release 1.34.2 Some checks failed tagged-release / tagged-release (push) Has been cancelled Details	2023-08-20 12:27:33 -04:00
Jose Diaz-Gonzalez	965696813b	Merge pull request #301 from danielfornarini/fix/postgres-create-with-docker Fix postgres:create when running inside a docker container	2023-08-20 12:27:22 -04:00
Piero Dotti	23c11bfddd	fix(service_create_container): using SERVICE_ROOT instead of SERVICE_HOST_ROOT when creating the ssl certs Since the script create_ssl_certs.sh is executed from inside the container, the directory is not the host one, but the container one.	2023-08-16 14:16:58 +02:00