Skip to content

Commit

Permalink
Update HAProxy version to latest LTS (#205)
Browse files Browse the repository at this point in the history
* Update HAProxy repository to keep up with Debian version of postgres image

Signed-off-by: Sora Morimoto <[email protected]>

* Update HAProxy version to latest LTS

Signed-off-by: Sora Morimoto <[email protected]>

---------

Signed-off-by: Sora Morimoto <[email protected]>
  • Loading branch information
smorimoto authored Jul 24, 2023
1 parent 90f7fb2 commit f1c37a3
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 8 deletions.
8 changes: 4 additions & 4 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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}
Expand All @@ -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.\* \
Expand Down
8 changes: 4 additions & 4 deletions Dockerfile-timescaledb
Original file line number Diff line number Diff line change
Expand Up @@ -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}
Expand All @@ -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.\* \
Expand Down

0 comments on commit f1c37a3

Please sign in to comment.