From ae3dec28a4bac209861eaaa2b647e84733d92f7d Mon Sep 17 00:00:00 2001
From: Ignas Mikalajunas <ignas@devzero.io>
Date: Wed, 2 Jul 2025 21:26:08 +0300
Subject: [PATCH 1/5] Install the same loader version as the timescale version

---
 Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Dockerfile b/Dockerfile
index 55fa1f2..74e99dc 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -21,7 +21,7 @@ RUN <<EOT
 
   # Install Timescale
   apt-get update
-  apt-get install -y --no-install-recommends "timescaledb-2-postgresql-$POSTGRES_VERSION=$TIMESCALE_VERSION~debian$VERSION_ID"
+  apt-get install -y --no-install-recommends "timescaledb-2-postgresql-$POSTGRES_VERSION=$TIMESCALE_VERSION~debian$VERSION_ID" "timescaledb-2-loader-postgresql-$POSTGRES_VERSION=$TIMESCALE_VERSION~debian$VERSION_ID"
 
   # Cleanup
   apt-get purge -y curl

From 1312ce95b913f32f780ce529440da47039e4fde5 Mon Sep 17 00:00:00 2001
From: Ignas Mikalajunas <ignas@devzero.io>
Date: Tue, 8 Jul 2025 21:38:48 +0300
Subject: [PATCH 2/5] Bump timescale version, remove pg14 support

---
 .github/workflows/build.yaml | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index aa3f33f..20925cb 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -4,7 +4,7 @@ on: push
 
 env:
   # renovate datasource=github-releases depName=timescale/timescaledb
-  TIMESCALE_VERSION: 2.19.3
+  TIMESCALE_VERSION: 2.21.0
 
 jobs:
   build:
@@ -26,10 +26,7 @@ jobs:
           - postgres_version: "15"
             # renovate datasource=docker depName=ghcr.io/cloudnative-pg/postgresql
             cnpg_version: 15.13-9
-          - postgres_version: "14"
-            # renovate datasource=docker depName=ghcr.io/cloudnative-pg/postgresql
-            cnpg_version: 14.18-9
-    steps:
+w    steps:
       - name: Checkout
         uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
       - name: Get CloudNativePG version

From 454ca4abcb96ce9620092588eff7ba1b16964ec5 Mon Sep 17 00:00:00 2001
From: Ignas Mikalajunas <ignas@devzero.io>
Date: Thu, 11 Sep 2025 02:10:55 +0300
Subject: [PATCH 3/5] Bump timescaledb to 2.21.3

---
 .github/workflows/build.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index c13f762..71bbac8 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -4,7 +4,7 @@ on: push
 
 env:
   # renovate datasource=github-releases depName=timescale/timescaledb
-  TIMESCALE_VERSION: 2.21.0
+  TIMESCALE_VERSION: 2.21.3
 
 jobs:
   build:

From 95bdf22470d41efdc926ec7e6e26313f43fef7aa Mon Sep 17 00:00:00 2001
From: Ignas Mikalajunas <ignas@devzero.io>
Date: Wed, 26 Nov 2025 13:27:29 +0200
Subject: [PATCH 4/5] Added timescale toolkit and updated timescaledb

---
 .github/workflows/build.yaml | 16 ++++++++++++++--
 Dockerfile                   |  6 ++++++
 2 files changed, 20 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index 71bbac8..5bdb6c4 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -4,7 +4,10 @@ on: push
 
 env:
   # renovate datasource=github-releases depName=timescale/timescaledb
-  TIMESCALE_VERSION: 2.21.3
+  TIMESCALE_VERSION: 2.22.1
+
+  # renovate datasource=github-releases depName=timescale/timescaledb-toolkit
+  TIMESCALE_TOOLKIT_VERSION: 1.21.0
 
 jobs:
   build:
@@ -47,6 +50,14 @@ jobs:
             echo "minor=$(cut -d. -f-2 <<<"$TIMESCALE_VERSION")"
             echo "major=$(cut -d. -f1 <<<"$TIMESCALE_VERSION")"
           } >> $GITHUB_OUTPUT
+      - name: Get Timescale Toolkit version
+        id: timescale_toolkit
+        run: |
+          {
+            echo "version=$TIMESCALE_TOOLKIT_VERSION"
+            echo "minor=$(cut -d. -f-2 <<<"$TIMESCALE_TOOLKIT_VERSION")"
+            echo "major=$(cut -d. -f1 <<<"$TIMESCALE_TOOLKIT_VERSION")"
+          } >> $GITHUB_OUTPUT
       - name: Docker meta
         id: meta
         uses: docker/metadata-action@902fa8ec7d6ecbf8d84d538b9b233a880e428804 # v5.7.0
@@ -78,13 +89,14 @@ jobs:
           context: .
           pull: true
           push: ${{ github.ref_name == 'main' }}
-          platforms: linux/amd64,linux/arm64/v8
+          platforms: linux/amd64
           tags: ${{ steps.meta.outputs.tags }}
           labels: ${{ steps.meta.outputs.labels }}
           build-args: |
             POSTGRES_VERSION=${{ matrix.postgres_version }}
             CLOUDNATIVEPG_VERSION=${{ steps.cnpg.outputs.version }}
             TIMESCALE_VERSION=${{ steps.timescale.outputs.version }}
+            TIMESCALE_TOOLKIT_VERSION=${{ steps.timescale_toolkit.outputs.version }}
           cache-from: type=gha
           cache-to: type=gha,mode=max
 
diff --git a/Dockerfile b/Dockerfile
index 74e99dc..eca789e 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -7,6 +7,7 @@ USER root
 
 ARG POSTGRES_VERSION
 ARG TIMESCALE_VERSION
+ARG TIMESCALE_TOOLKIT_VERSION
 RUN <<EOT
   set -eux
 
@@ -23,6 +24,11 @@ RUN <<EOT
   apt-get update
   apt-get install -y --no-install-recommends "timescaledb-2-postgresql-$POSTGRES_VERSION=$TIMESCALE_VERSION~debian$VERSION_ID" "timescaledb-2-loader-postgresql-$POSTGRES_VERSION=$TIMESCALE_VERSION~debian$VERSION_ID"
 
+
+  # Install Timescale Toolkit
+  apt-get update
+  apt-get install -y --no-install-recommends "timescaledb-toolkit-postgresql-$POSTGRES_VERSION=1:$TIMESCALE_TOOLKIT_VERSION~debian$VERSION_ID"
+
   # Cleanup
   apt-get purge -y curl
   rm /etc/apt/sources.list.d/timescaledb.list /etc/apt/trusted.gpg.d/timescale.gpg

From 10d11669c3efb7e92d3a31bdb5e21fc1c410d641 Mon Sep 17 00:00:00 2001
From: Ignas Mikalajunas <ignas@devzero.io>
Date: Wed, 26 Nov 2025 13:54:48 +0200
Subject: [PATCH 5/5] Turn arm builds back on, we need them for mac development

---
 .github/workflows/build.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index 5bdb6c4..74358ad 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -89,7 +89,7 @@ jobs:
           context: .
           pull: true
           push: ${{ github.ref_name == 'main' }}
-          platforms: linux/amd64
+          platforms: linux/amd64,linux/arm64/v8
           tags: ${{ steps.meta.outputs.tags }}
           labels: ${{ steps.meta.outputs.labels }}
           build-args: |