From bf92563764101a1d680d904e82af038ead2e2966 Mon Sep 17 00:00:00 2001 From: Daniel Berteaud Date: Sun, 11 Feb 2024 22:17:02 +0100 Subject: [PATCH] Update rendered example --- example/images/ldap2pg/Dockerfile | 2 +- example/images/patroni/Dockerfile | 2 +- example/images/pg-upgrade/Dockerfile | 2 +- example/images/postgres-major-upgrade/Dockerfile | 2 +- example/init/pki | 10 +++++----- example/manage.nomad.hcl | 4 +++- example/postgres.nomad.hcl | 1 + 7 files changed, 13 insertions(+), 10 deletions(-) diff --git a/example/images/ldap2pg/Dockerfile b/example/images/ldap2pg/Dockerfile index b9ebc5e..43cde4b 100644 --- a/example/images/ldap2pg/Dockerfile +++ b/example/images/ldap2pg/Dockerfile @@ -12,7 +12,7 @@ RUN set -eux &&\ chown root:root ldap2pg &&\ chmod 755 ldap2pg -FROM danielberteaud/alpine:24.1-8 +FROM danielberteaud/alpine:24.2-1 MAINTAINER Daniel Berteaud ENV PGHOST=localhost \ diff --git a/example/images/patroni/Dockerfile b/example/images/patroni/Dockerfile index 18f0ac3..521ddc2 100644 --- a/example/images/patroni/Dockerfile +++ b/example/images/patroni/Dockerfile @@ -1,4 +1,4 @@ -FROM danielberteaud/postgres:15.24.1-5 +FROM danielberteaud/postgres:15.24.2-1 MAINTAINER Daniel Berteaud ARG PATRONI_VERSION=3.2.2 diff --git a/example/images/pg-upgrade/Dockerfile b/example/images/pg-upgrade/Dockerfile index bb76141..535545f 100644 --- a/example/images/pg-upgrade/Dockerfile +++ b/example/images/pg-upgrade/Dockerfile @@ -1,4 +1,4 @@ -FROM danielberteaud/alpine:24.1-8 +FROM danielberteaud/alpine:24.2-1 MAINTAINER Daniel Berteaud ARG PG_FROM= \ diff --git a/example/images/postgres-major-upgrade/Dockerfile b/example/images/postgres-major-upgrade/Dockerfile index 51d8eb3..68b3bf1 100644 --- a/example/images/postgres-major-upgrade/Dockerfile +++ b/example/images/postgres-major-upgrade/Dockerfile @@ -1,4 +1,4 @@ -FROM danielberteaud/alma:9.24.1-6 +FROM danielberteaud/alma:9.24.2-1 MAINTAINER Daniel Berteaud ENV PG_BASE_DATA=/data/db/ diff --git a/example/init/pki b/example/init/pki index 061731f..8109839 100755 --- a/example/init/pki +++ b/example/init/pki @@ -11,7 +11,7 @@ set -euo pipefail TMP=$(mktemp -d) INITIAL_SETUP=false -if [ "$(vault secrets list -format json | jq -r '.["/pki/postgres/"].type')" != "pki" ]; then +if [ "$(vault secrets list -format json | jq -r '.["pki/postgres/"].type')" != "pki" ]; then INITIAL_SETUP=true fi @@ -30,12 +30,12 @@ vault secrets tune -max-lease-ttl=131400h /pki/postgres # Configure PKI URLs echo "Configure URL endpoints" vault write /pki/postgres/config/urls \ - issuing_certificates="${VAULT_ADDR}/v1//pki/postgres/ca" \ - crl_distribution_points="${VAULT_ADDR}/v1//pki/postgres/crl" \ - ocsp_servers="${VAULT_ADDR}/v1//pki/postgres/ocsp" + issuing_certificates="${VAULT_ADDR}/v1/pki/postgres/ca" \ + crl_distribution_points="${VAULT_ADDR}/v1/pki/postgres/crl" \ + ocsp_servers="${VAULT_ADDR}/v1/pki/postgres/ocsp" vault write /pki/postgres/config/cluster \ - path="${VAULT_ADDR}/v1//pki/postgres" + path="${VAULT_ADDR}/v1/pki/postgres" vault write /pki/postgres/config/crl \ auto_rebuild=true \ diff --git a/example/manage.nomad.hcl b/example/manage.nomad.hcl index 586033c..e499720 100644 --- a/example/manage.nomad.hcl +++ b/example/manage.nomad.hcl @@ -26,6 +26,7 @@ job "postgres-manage" { proxy { upstreams { destination_name = "postgres" + destination_type = "service" local_bind_port = 5432 } } @@ -60,7 +61,7 @@ job "postgres-manage" { user = 1053 config { - image = "danielberteaud/wait-for:24.1-1" + image = "danielberteaud/wait-for:24.2-1" readonly_rootfs = true pids_limit = 20 } @@ -96,6 +97,7 @@ job "postgres-manage" { policies = ["postgres"] env = false disable_file = true + change_mode = "noop" } diff --git a/example/postgres.nomad.hcl b/example/postgres.nomad.hcl index d7ba84d..a63ba7a 100644 --- a/example/postgres.nomad.hcl +++ b/example/postgres.nomad.hcl @@ -150,6 +150,7 @@ job "postgres" { policies = ["postgres"] env = false disable_file = true + change_mode = "noop" } # Use a template block instead of env {} so we can fetch values from vault