Skip to content

Commit 1272287

Browse files
committed
chore: revert back to 2.8 haproxy
1 parent d52c3f3 commit 1272287

File tree

7 files changed

+9
-7
lines changed

7 files changed

+9
-7
lines changed

pg15/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ ARG VERSION
2828
ARG PG_MAJOR_VERSION
2929
ARG PG_VERSION
3030
ARG POSTGIS_MAJOR=3
31-
ARG HAPROXY_VERSION=3.3
31+
ARG HAPROXY_VERSION=2.8
3232

3333
LABEL fly.app_role=postgres_cluster
3434
LABEL fly.version=${VERSION}

pg15/Dockerfile-timescaledb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ ARG VERSION
2929
ARG PG_MAJOR_VERSION
3030
ARG PG_VERSION
3131
ARG POSTGIS_MAJOR=3
32-
ARG HAPROXY_VERSION=3.3
32+
ARG HAPROXY_VERSION=2.8
3333

3434
LABEL fly.app_role=postgres_cluster
3535
LABEL fly.version=${VERSION}

pg16/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ ARG VERSION
2525
ARG PG_MAJOR_VERSION
2626
ARG PG_VERSION
2727
ARG POSTGIS_MAJOR=3
28-
ARG HAPROXY_VERSION=3.3
28+
ARG HAPROXY_VERSION=2.8
2929
ARG REPMGR_VERSION=5.4.1-1build2
3030

3131
ENV PGDATA=/data/postgresql

pg16/Dockerfile-timescaledb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ ARG VERSION
2525
ARG PG_MAJOR_VERSION
2626
ARG PG_VERSION
2727
ARG POSTGIS_MAJOR=3
28-
ARG HAPROXY_VERSION=3.3
28+
ARG HAPROXY_VERSION=2.8
2929
ARG REPMGR_VERSION=5.4.1-1build2
3030

3131
ENV PGDATA=/data/postgresql

pg17/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ ARG VERSION
2525
ARG PG_MAJOR_VERSION
2626
ARG PG_VERSION
2727
ARG POSTGIS_MAJOR=3
28-
ARG HAPROXY_VERSION=3.3
28+
ARG HAPROXY_VERSION=2.8
2929
ARG REPMGR_VERSION=5.5.0+debpgdg-3.pgdg24.04+1
3030

3131
ENV PGDATA=/data/postgresql

pg17/Dockerfile-timescaledb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ ARG VERSION
2525
ARG PG_MAJOR_VERSION
2626
ARG PG_VERSION
2727
ARG POSTGIS_MAJOR=3
28-
ARG HAPROXY_VERSION=3.3
28+
ARG HAPROXY_VERSION=2.8
2929
ARG REPMGR_VERSION=5.5.0+debpgdg-3.pgdg24.04+1
3030

3131
ENV PGDATA=/data/postgresql

pg18/Dockerfile

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,9 @@ RUN apt-get update && apt-get install --no-install-recommends -y \
7474
postgresql-${PG_MAJOR_VERSION}-postgis-$POSTGIS_MAJOR-scripts
7575

7676
# Haproxy
77-
RUN apt-get update && apt-get install --no-install-recommends -y \
77+
RUN apt-get update && apt-get install --no-install-recommends -y software-properties-common && \
78+
add-apt-repository ppa:vbernat/haproxy-${HAPROXY_VERSION} && \
79+
apt-get update && apt-get install --no-install-recommends -y \
7880
haproxy=$HAPROXY_VERSION.\* \
7981
&& apt autoremove -y && apt clean
8082

0 commit comments

Comments
 (0)