From 16c0959897c145047017be05103fa88d41de7a97 Mon Sep 17 00:00:00 2001
From: Sora Morimoto <sora@morimoto.io>
Date: Wed, 27 Mar 2024 07:08:51 +0900
Subject: [PATCH] Update Docker tag for postgres timescale variant to v16

Signed-off-by: Sora Morimoto <sora@morimoto.io>
---
 Dockerfile-timescaledb | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/Dockerfile-timescaledb b/Dockerfile-timescaledb
index 16e79b48..b47de8e1 100644
--- a/Dockerfile-timescaledb
+++ b/Dockerfile-timescaledb
@@ -1,5 +1,5 @@
-ARG PG_VERSION=15.6
-ARG PG_MAJOR_VERSION=15
+ARG PG_VERSION=16.2
+ARG PG_MAJOR_VERSION=16
 ARG VERSION=custom
 
 FROM golang:1.20
@@ -23,6 +23,7 @@ ENV PGDATA=/data/postgresql
 ENV PGPASSFILE=/data/.pgpass
 ARG VERSION
 ARG PG_MAJOR_VERSION
+ARG TIMESCALEDB_VERSION=2.14.2
 ARG POSTGIS_MAJOR=3
 ARG HAPROXY_VERSION=2.8
 
@@ -32,7 +33,7 @@ LABEL fly.pg-version=${PG_VERSION}
 LABEL fly.pg-manager=repmgr
 
 RUN apt-get update && apt-get install --no-install-recommends -y \
-    ca-certificates iproute2 curl bash dnsutils vim haproxy socat procps ssh gnupg rsync barman-cli barman barman-cli-cloud cron \
+    ca-certificates iproute2 curl bash dnsutils vim socat procps ssh gnupg rsync barman-cli barman barman-cli-cloud cron \
     && apt autoremove -y
 
 # Repmgr
@@ -42,15 +43,15 @@ RUN apt-get update && \
     apt-get install -y ./postgresql-${PG_MAJOR_VERSION}-repmgr_5.3.3-2_amd64.deb \
     && rm ./postgresql-${PG_MAJOR_VERSION}-repmgr_5.3.3-2_amd64.deb
 
-RUN echo "deb https://packagecloud.io/timescale/timescaledb/debian/ $(cat /etc/os-release | grep VERSION_CODENAME | cut -d'=' -f2) main" > /etc/apt/sources.list.d/timescaledb.list \
+RUN echo "deb https://packagecloud.io/timescale/timescaledb/debian $(. /etc/os-release && echo "$VERSION_CODENAME") main" > /etc/apt/sources.list.d/timescaledb.list \
     && curl -L https://packagecloud.io/timescale/timescaledb/gpgkey | apt-key add -
 
 # TimescaleDB and PostGIS
 RUN apt-get update && apt-get install --no-install-recommends -y \
-    postgresql-$PG_MAJOR_VERSION-postgis-$POSTGIS_MAJOR \
-    postgresql-$PG_MAJOR_VERSION-postgis-$POSTGIS_MAJOR-scripts \
-    timescaledb-2-postgresql-$PG_MAJOR_VERSION \
-    timescaledb-toolkit-postgresql-$PG_MAJOR_VERSION \
+    postgresql-${PG_MAJOR_VERSION}-postgis-${POSTGIS_MAJOR} \
+    postgresql-${PG_MAJOR_VERSION}-postgis-${POSTGIS_MAJOR}-scripts \
+    timescaledb-2-${TIMESCALEDB_VERSION}-postgresql-${PG_MAJOR_VERSION} \
+    timescaledb-toolkit-postgresql-${PG_MAJOR_VERSION} \
     && apt autoremove -y
 
 # Haproxy
@@ -77,5 +78,4 @@ ENV TIMESCALEDB_ENABLED=true
 
 EXPOSE 5432
 
-
 CMD ["start"]