From 4da8a12ee0e9041d69d2b81197167d4bc5f3d3e6 Mon Sep 17 00:00:00 2001
From: Felipe Larenas <wat.sh1ken@gmail.com>
Date: Wed, 25 Sep 2024 14:06:11 -0300
Subject: [PATCH 1/4] feat:add TimescaleDB Toolkit

---
 .github/workflows/build.yaml | 12 ++++++++++++
 Dockerfile                   |  5 +++++
 2 files changed, 17 insertions(+)

diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index fb740f9..59830c5 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -6,6 +6,9 @@ env:
   # renovate datasource=github-releases depName=timescale/timescaledb
   TIMESCALE_VERSION: 2.16.1
 
+  # renovate datasource=github-releases depName=timescale/timescaledb-toolkit
+  TIMESCALE_TOOLKIT_VERSION: 1.18.0
+
 jobs:
   build:
     name: Build Image (pg${{ matrix.postgres_version }})
@@ -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@v5
@@ -85,6 +96,7 @@ jobs:
             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 dfaf9d8..b619cdb 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,10 @@ RUN <<EOT
   apt-get update
   apt-get install -y --no-install-recommends "timescaledb-2-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=$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 9d1c80574a5d5c071a74e96d3e457230953b6091 Mon Sep 17 00:00:00 2001
From: Andrii K <andrey@kostenko.name>
Date: Sun, 27 Oct 2024 10:27:18 +0200
Subject: [PATCH 2/4] up timescaledb version

---
 .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 59830c5..3801243 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.16.1
+  TIMESCALE_VERSION: 2.17.1
 
   # renovate datasource=github-releases depName=timescale/timescaledb-toolkit
   TIMESCALE_TOOLKIT_VERSION: 1.18.0

From 23bb85c6e4703c975290e9164cfffee1418665d9 Mon Sep 17 00:00:00 2001
From: Andrii K <andrey@kostenko.name>
Date: Sun, 27 Oct 2024 10:29:12 +0200
Subject: [PATCH 3/4] remove arm

---
 .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 3801243..5dcc03e 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,linux/arm64/v8
+          platforms: linux/amd64
           tags: ${{ steps.meta.outputs.tags }}
           labels: ${{ steps.meta.outputs.labels }}
           build-args: |

From e9dcfc30e654644e6f2c2f53f44110bb96a312d6 Mon Sep 17 00:00:00 2001
From: Andrii K <andrey@kostenko.name>
Date: Sun, 27 Oct 2024 10:32:47 +0200
Subject: [PATCH 4/4] try to fix timescaledb toolkit

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

diff --git a/Dockerfile b/Dockerfile
index b619cdb..f944d4e 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -26,7 +26,7 @@ RUN <<EOT
 
   # Install Timescale Toolkit
   apt-get update
-  apt-get install -y --no-install-recommends "timescaledb-toolkit-postgresql-$POSTGRES_VERSION=$TIMESCALE_TOOLKIT_VERSION~debian$VERSION_ID"
+  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