Release 1.34.1

Merge pull request #300 from dokku/dependabot/docker/postgres-15.4
chore(deps): bump postgres from 15.3 to 15.4
2023-08-16 22:36:09 -04:00 · 2023-08-16 22:35:55 -04:00 · 2023-08-14 02:41:35 +00:00 · 2023-05-28 01:00:01 -04:00 · 2023-05-27 22:34:06 -04:00 · 2023-05-27 22:33:27 -04:00
7 changed files with 24 additions and 12 deletions
--- a/2
+++ b/2
@@ -1 +1 @@
-FROM postgres:15.2
+FROM postgres:15.4
--- 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 15.2](https://hub.docker.com/_/postgres/).
+Official postgres plugin for dokku. Currently defaults to installing [postgres 15.4](https://hub.docker.com/_/postgres/).

 ## Requirements

--- a/4
+++ b/4
@@ -457,7 +457,7 @@ service_container_rm() {
  local ID

  service_pause "$SERVICE"
-  ID=$("$DOCKER_BIN" container ps -aq --no-trunc --filter "name=^/$SERVICE_NAME$" --format '{{ .ID }}') || true
+  ID=$("$DOCKER_BIN" container ps -aq --no-trunc --filter "name=^/$SERVICE_NAME$") || true
  # this may be 'true' in tests...
  if [[ -z "$ID" ]] || [[ "$ID" == "true" ]]; then
    return 0
@@ -939,7 +939,7 @@ service_pause() {
  declare SERVICE="$1"
  local SERVICE_ROOT="$PLUGIN_DATA_ROOT/$SERVICE"
  local SERVICE_NAME="$(get_service_name "$SERVICE")"
-  local ID=$("$DOCKER_BIN" container ps -aq --no-trunc --filter "name=^/$SERVICE_NAME$" --format '{{ .ID }}') || true
+  local ID=$("$DOCKER_BIN" container ps -aq --no-trunc --filter "name=^/$SERVICE_NAME$") || true
  [[ -z $ID ]] && dokku_log_warn "Service is already paused" && return 0

  if [[ -n $ID ]]; then
--- a/8
+++ b/8
@@ -149,7 +149,9 @@ service_create_container() {

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

  suppress_output "$DOCKER_BIN" container start "$(cat "$SERVICE_ROOT/ID")"
  service_port_reconcile_status "$SERVICE"
@@ -191,7 +193,7 @@ service_start() {
  local QUIET="$2"
  local SERVICE_ROOT="$PLUGIN_DATA_ROOT/$SERVICE"
  local SERVICE_NAME="$(get_service_name "$SERVICE")"
-  local ID=$("$DOCKER_BIN" container ps -aq --no-trunc --filter "status=running" --filter "name=^/$SERVICE_NAME$" --format '{{ .ID }}') || true
+  local ID=$("$DOCKER_BIN" container ps -aq --no-trunc --filter "status=running" --filter "name=^/$SERVICE_NAME$") || true
  if [[ -n $ID ]]; then
    [[ -z $QUIET ]] && dokku_log_warn "Service is already started"
    if [[ ! -f "$SERVICE_ROOT/ID" ]] || [[ "$(cat "$SERVICE_ROOT/ID")" != "$ID" ]]; then
@@ -202,7 +204,7 @@ service_start() {
  fi

  dokku_log_info2_quiet "Starting container"
-  local PREVIOUS_ID=$("$DOCKER_BIN" container ps -aq --no-trunc --filter "status=exited" --filter "name=^/$SERVICE_NAME$" --format '{{ .ID }}') || true
+  local PREVIOUS_ID=$("$DOCKER_BIN" container ps -aq --no-trunc --filter "status=exited" --filter "name=^/$SERVICE_NAME$") || true
  local PASSWORD="$(service_password "$SERVICE")"

  if [[ -n $PREVIOUS_ID ]]; then
--- a/plugin.toml
+++ b/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku postgres service plugin"
-version = "1.33.0"
+version = "1.34.1"
 [plugin.config]
--- a/scripts/create_ssl_certs.sh
+++ b/scripts/create_ssl_certs.sh
@@ -0,0 +1,7 @@
+#!/bin/sh
+
+postgres_service_dir="$1"
+
+cd "$postgres_service_dir"
+mkdir certs && cd certs
+openssl req -new -newkey rsa:4096 -x509 -days 365000 -nodes -out server.crt -keyout server.key -batch
--- a/scripts/enable_ssl.sh
+++ b/scripts/enable_ssl.sh
@@ -1,7 +1,10 @@
-#!/bin/bash
-pushd /var/lib/postgresql/data >/dev/null
-openssl req -new -newkey rsa:4096 -x509 -days 365000 -nodes -out server.crt -keyout server.key -batch
+#!/bin/sh
+
+cd /var/lib/postgresql/data
+
+cp ../certs/* .
+chown postgres:postgres server.key
 chmod 600 server.key
+
 sed -i "s/^#ssl = off/ssl = on/" postgresql.conf
 sed -i "s/^#ssl_ciphers =.*/ssl_ciphers = 'AES256+EECDH:AES256+EDH'/" postgresql.conf
-popd >/dev/null
Author	SHA1	Message	Date
Jose Diaz-Gonzalez	3a676c2549	Release 1.34.1 Some checks failed tagged-release / tagged-release (push) Has been cancelled Details	2023-08-16 22:36:09 -04:00
Jose Diaz-Gonzalez	11fef8aec9	Merge pull request #300 from dokku/dependabot/docker/postgres-15.4 chore(deps): bump postgres from 15.3 to 15.4	2023-08-16 22:35:55 -04:00
dependabot[bot]	1af6da45e9	chore(deps): bump postgres from 15.3 to 15.4 Bumps postgres from 15.3 to 15.4. --- updated-dependencies: - dependency-name: postgres dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com>	2023-08-14 02:41:35 +00:00
Jose Diaz-Gonzalez	bfc0f18759	Release 1.34.0 Some checks failed tagged-release / tagged-release (push) Has been cancelled Details	2023-05-28 01:00:01 -04:00
Jose Diaz-Gonzalez	9df82c58da	Release 1.33.2 Some checks failed tagged-release / tagged-release (push) Has been cancelled Details	2023-05-27 22:34:06 -04:00
josegonzalez	ee2d2f10f7	Merge pull request #260 from erickedji/master fix: create ssl certs outside container	2023-05-27 22:33:27 -04:00
josegonzalez	9f3d24ca9f	Merge branch 'master' into master	2023-05-27 19:45:41 -04:00
Jose Diaz-Gonzalez	6128801308	Release 1.33.1 Some checks failed tagged-release / tagged-release (push) Has been cancelled Details	2023-05-13 12:42:31 -04:00
josegonzalez	8edb644d11	Merge pull request #293 from dokku/dependabot/docker/postgres-15.3 chore(deps): bump postgres from 15.2 to 15.3	2023-05-13 12:42:15 -04:00
dependabot[bot]	3181bb114e	chore(deps): bump postgres from 15.2 to 15.3 Bumps postgres from 15.2 to 15.3. --- updated-dependencies: - dependency-name: postgres dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com>	2023-05-12 02:57:10 +00:00
Komlan KEDJI	09926fbecd	fix: create ssl certs outside container This enables support for alpine-based images like timescaledb (no bash/openssl). Fixes #153 Fixes timescale/timescaledb-docker#99	2022-09-04 09:37:10 +00:00