From f1c37a3c7c86738cbce3a881114ac30598ea33ee Mon Sep 17 00:00:00 2001 From: Sora Morimoto Date: Tue, 25 Jul 2023 00:59:31 +0900 Subject: [PATCH] Update HAProxy version to latest LTS (#205) * Update HAProxy repository to keep up with Debian version of postgres image Signed-off-by: Sora Morimoto * Update HAProxy version to latest LTS Signed-off-by: Sora Morimoto --------- Signed-off-by: Sora Morimoto --- Dockerfile | 8 ++++---- Dockerfile-timescaledb | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/Dockerfile b/Dockerfile index 1e5e1444..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} @@ -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..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} @@ -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.\* \