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.
This commit is contained in:
Piero Dotti
2023-08-16 14:16:58 +02:00
parent bfc0f18759
commit 23c11bfddd
3 changed files with 5 additions and 1 deletions

View File

@@ -149,7 +149,7 @@ service_create_container() {
dokku_log_verbose_quiet "Securing connection to database" dokku_log_verbose_quiet "Securing connection to database"
service_pause "$SERVICE" >/dev/null 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 "$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" rm -rf "$SERVICE_HOST_ROOT/certs"

View File

@@ -1,5 +1,7 @@
#!/bin/sh #!/bin/sh
set -e
postgres_service_dir="$1" postgres_service_dir="$1"
cd "$postgres_service_dir" cd "$postgres_service_dir"

View File

@@ -1,5 +1,7 @@
#!/bin/sh #!/bin/sh
set -e
cd /var/lib/postgresql/data cd /var/lib/postgresql/data
cp ../certs/* . cp ../certs/* .