From 283b46ff871a7a1649f1c2bb712d45a791f19bbd Mon Sep 17 00:00:00 2001 From: Sora Morimoto Date: Wed, 21 Jun 2023 01:39:26 +0900 Subject: [PATCH 1/2] Update HAProxy repository to keep up with Debian version of postgres image Signed-off-by: Sora Morimoto --- Dockerfile | 6 +++--- Dockerfile-timescaledb | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Dockerfile b/Dockerfile index 1e5e1444..18efc61e 100644 --- a/Dockerfile +++ b/Dockerfile @@ -40,11 +40,11 @@ RUN apt-get update && apt-get install --no-install-recommends -y \ # Haproxy RUN curl https://haproxy.debian.net/bernat.debian.org.gpg \ - | gpg --dearmor > /usr/share/keyrings/haproxy.debian.net.gpg + | gpg --dearmor > /usr/share/keyrings/haproxy.debian.net.gpg RUN echo deb "[signed-by=/usr/share/keyrings/haproxy.debian.net.gpg]" \ - http://haproxy.debian.net bullseye-backports-${HAPROXY_VERSION} main \ - > /etc/apt/sources.list.d/haproxy.list + http://haproxy.debian.net bookworm-backports-${HAPROXY_VERSION} main \ + > /etc/apt/sources.list.d/haproxy.list RUN apt-get update && apt-get install --no-install-recommends -y \ haproxy=$HAPROXY_VERSION.\* \ diff --git a/Dockerfile-timescaledb b/Dockerfile-timescaledb index 52a15c88..8bab9767 100644 --- a/Dockerfile-timescaledb +++ b/Dockerfile-timescaledb @@ -47,11 +47,11 @@ RUN apt-get update && apt-get install --no-install-recommends -y \ # Haproxy RUN curl https://haproxy.debian.net/bernat.debian.org.gpg \ - | gpg --dearmor > /usr/share/keyrings/haproxy.debian.net.gpg + | gpg --dearmor > /usr/share/keyrings/haproxy.debian.net.gpg RUN echo deb "[signed-by=/usr/share/keyrings/haproxy.debian.net.gpg]" \ - http://haproxy.debian.net bullseye-backports-${HAPROXY_VERSION} main \ - > /etc/apt/sources.list.d/haproxy.list + http://haproxy.debian.net bookworm-backports-${HAPROXY_VERSION} main \ + > /etc/apt/sources.list.d/haproxy.list RUN apt-get update && apt-get install --no-install-recommends -y \ haproxy=$HAPROXY_VERSION.\* \ From 890e9825cb0892c3c4a34ae15a5ed359cddfde17 Mon Sep 17 00:00:00 2001 From: Sora Morimoto Date: Wed, 21 Jun 2023 01:40:54 +0900 Subject: [PATCH 2/2] Update HAProxy version to latest LTS Signed-off-by: Sora Morimoto --- Dockerfile | 2 +- Dockerfile-timescaledb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index 18efc61e..d528ecaf 100644 --- a/Dockerfile +++ b/Dockerfile @@ -22,7 +22,7 @@ ENV PGDATA=/data/postgresql ARG VERSION ARG PG_MAJOR_VERSION ARG POSTGIS_MAJOR=3 -ARG HAPROXY_VERSION=2.7 +ARG HAPROXY_VERSION=2.8 LABEL fly.app_role=postgres_cluster LABEL fly.version=${VERSION} diff --git a/Dockerfile-timescaledb b/Dockerfile-timescaledb index 8bab9767..ab821c46 100644 --- a/Dockerfile-timescaledb +++ b/Dockerfile-timescaledb @@ -23,7 +23,7 @@ ENV PGDATA=/data/postgresql ARG VERSION ARG PG_MAJOR_VERSION ARG POSTGIS_MAJOR=3 -ARG HAPROXY_VERSION=2.7 +ARG HAPROXY_VERSION=2.8 LABEL fly.app_role=postgres_cluster LABEL fly.version=${VERSION}