Merge pull request #301 from danielfornarini/fix/postgres-create-with…

…-docker Fix postgres:create when running inside a docker container
dokku · Aug 20, 2023 · 9656968 · 9656968
2 parents 3a676c2 + 23c11bf
commit 9656968
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 1 deletion.
diff --git a/functions b/functions
@@ -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"
 

diff --git 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"

diff --git 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/* .