From e7afb6808f1461f9ae2b784df312a8aa7004ba3e Mon Sep 17 00:00:00 2001 From: matthias Date: Tue, 31 Mar 2026 16:48:57 +0200 Subject: [PATCH 1/4] add python-json-logger --- docker/postgres-gis/Dockerfile | 2 +- docker/postgres/Dockerfile | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/docker/postgres-gis/Dockerfile b/docker/postgres-gis/Dockerfile index aaad2c1..852cf81 100644 --- a/docker/postgres-gis/Dockerfile +++ b/docker/postgres-gis/Dockerfile @@ -69,7 +69,7 @@ ENV PATHBACKUP = $PATH RUN wget https://smarden.org/runit/runit-2.3.0.tar.gz -P /package/ COPY cron_unprivileged.c /package/ -RUN pip3 install PyYAML setuptools pystache loader kazoo meld3 boto3 python-etcd psutil requests cdiff ydiff==1.4.2 --upgrade \ +RUN pip3 install PyYAML setuptools pystache loader kazoo meld3 boto3 python-etcd psutil requests cdiff ydiff==1.4.2 python-json-logger --upgrade \ && if [[ $PATRONI_VERSION == "multisite-"* ]]; then \ git clone -b $PATRONI_VERSION https://github.com/cybertec-postgresql/patroni; \ pip3 install ./patroni[kubernetes,etcd,etcd3]; \ diff --git a/docker/postgres/Dockerfile b/docker/postgres/Dockerfile index fd36c89..1fda351 100644 --- a/docker/postgres/Dockerfile +++ b/docker/postgres/Dockerfile @@ -67,7 +67,7 @@ ENV PATHBACKUP = $PATH RUN wget https://smarden.org/runit/runit-2.3.0.tar.gz -P /package/ COPY cron_unprivileged.c /package/ -RUN pip3 install PyYAML setuptools pystache loader kazoo meld3 boto3 python-etcd psutil requests cdiff ydiff==1.4.2 --upgrade \ +RUN pip3 install PyYAML setuptools pystache loader kazoo meld3 boto3 python-etcd psutil requests cdiff ydiff==1.4.2 python-json-logger --upgrade \ && if [[ $PATRONI_VERSION == "multisite-"* ]]; then \ git clone -b $PATRONI_VERSION https://github.com/cybertec-postgresql/patroni; \ pip3 install ./patroni[kubernetes,etcd,etcd3]; \ From 632a23fa53a5d4c302ee3b6ae066f58d92ffe98b Mon Sep 17 00:00:00 2001 From: matthias Date: Tue, 31 Mar 2026 16:49:19 +0200 Subject: [PATCH 2/4] send PATRONI-Log env to runit-context --- runit/patroni/run | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/runit/patroni/run b/runit/patroni/run index 334c897..d17393a 100755 --- a/runit/patroni/run +++ b/runit/patroni/run @@ -21,7 +21,7 @@ fi ulimit -c unlimited # Only small subset of environment variables is allowed. We don't want accidentally disclose sensitive information -for E in $(printenv -0 | tr '\n' ' ' | sed 's/\x00/\n/g' | grep -vE '^(KUBERNETES_(SERVICE|PORT|ROLE)[_=]|((POD_(IP|NAMESPACE))|HOSTNAME|PATH|RW_DIR|PGHOME|PGDATA|LC_ALL|ENABLE_PG_MON|LD_PRELOAD|NSS_WRAPPER_PASSWD|NSS_WRAPPER_GROUP)=)' | sed 's/=.*//g'); do +for E in $(printenv -0 | tr '\n' ' ' | sed 's/\x00/\n/g' | grep -vE '^(KUBERNETES_(SERVICE|PORT|ROLE)[_=]|((POD_(IP|NAMESPACE))|HOSTNAME|PATH|RW_DIR|PGHOME|PGDATA|LC_ALL|ENABLE_PG_MON|LD_PRELOAD|PATRONI_LOG_TYPE|NSS_WRAPPER_PASSWD|NSS_WRAPPER_GROUP)=)' | sed 's/=.*//g'); do unset $E done From d25b8b38eb0fec84029e2c08a600713f4184bc0c Mon Sep 17 00:00:00 2001 From: matthias Date: Tue, 31 Mar 2026 17:00:46 +0200 Subject: [PATCH 3/4] update go in exporter-container --- docker/exporter/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker/exporter/Dockerfile b/docker/exporter/Dockerfile index 27b6da2..0eb23b8 100644 --- a/docker/exporter/Dockerfile +++ b/docker/exporter/Dockerfile @@ -15,7 +15,7 @@ RUN ${PACKAGER} -y install --nodocs \ make \ && ${PACKAGER} -y clean all ; -RUN wget https://go.dev/dl/go1.25.7.linux-amd64.tar.gz && tar -xzf go1.25.7.linux-amd64.tar.gz && mv go /usr/local +RUN wget https://go.dev/dl/go1.26.1.linux-amd64.tar.gz && tar -xzf go1.26.1.linux-amd64.tar.gz && mv go /usr/local ENV PATH=$PATH:/usr/local/go/bin RUN git clone https://github.com/prometheus-community/postgres_exporter.git && cd postgres_exporter && make build; From cae0bf5ed52b09ceaeae5d221de123ab935ef0f5 Mon Sep 17 00:00:00 2001 From: matthias Date: Tue, 31 Mar 2026 18:20:00 +0200 Subject: [PATCH 4/4] remove unneeded env in patroni context --- runit/patroni/run | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/runit/patroni/run b/runit/patroni/run index d17393a..334c897 100755 --- a/runit/patroni/run +++ b/runit/patroni/run @@ -21,7 +21,7 @@ fi ulimit -c unlimited # Only small subset of environment variables is allowed. We don't want accidentally disclose sensitive information -for E in $(printenv -0 | tr '\n' ' ' | sed 's/\x00/\n/g' | grep -vE '^(KUBERNETES_(SERVICE|PORT|ROLE)[_=]|((POD_(IP|NAMESPACE))|HOSTNAME|PATH|RW_DIR|PGHOME|PGDATA|LC_ALL|ENABLE_PG_MON|LD_PRELOAD|PATRONI_LOG_TYPE|NSS_WRAPPER_PASSWD|NSS_WRAPPER_GROUP)=)' | sed 's/=.*//g'); do +for E in $(printenv -0 | tr '\n' ' ' | sed 's/\x00/\n/g' | grep -vE '^(KUBERNETES_(SERVICE|PORT|ROLE)[_=]|((POD_(IP|NAMESPACE))|HOSTNAME|PATH|RW_DIR|PGHOME|PGDATA|LC_ALL|ENABLE_PG_MON|LD_PRELOAD|NSS_WRAPPER_PASSWD|NSS_WRAPPER_GROUP)=)' | sed 's/=.*//g'); do unset $E done