From 0799fd6fcaa3ee64ace5b871b85364ab8918f9aa Mon Sep 17 00:00:00 2001
From: BodoBolero <peterbendel@neon.tech>
Date: Wed, 6 Nov 2024 10:35:26 +0100
Subject: [PATCH] need higher version of pgcopydb

---
 .github/workflows/benchmarking.yml |  8 ++++----
 build-tools.Dockerfile             | 11 ++++++++++-
 2 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/benchmarking.yml b/.github/workflows/benchmarking.yml
index 869579a8e7..04c4089e2a 100644
--- a/.github/workflows/benchmarking.yml
+++ b/.github/workflows/benchmarking.yml
@@ -62,7 +62,7 @@ jobs:
       PG_CONFIG: /tmp/neon/pg_install/v16/bin/pg_config
     runs-on: [ self-hosted, us-east-2, x64 ]
     container:
-      image: neondatabase/build-tools:pinned-bookworm
+      image: neondatabase/build-tools:62b0e0c53ed967d40b302d322ee0aa76626cac5f3d20b47bed6b7ee8350c78d2-bookworm-x64
       credentials:
         username: ${{ secrets.NEON_DOCKERHUB_USERNAME }}
         password: ${{ secrets.NEON_DOCKERHUB_PASSWORD }}
@@ -88,11 +88,11 @@ jobs:
     - name: invoke pg_config
       run: |
         /tmp/neon/pg_install/v16/bin/pg_config --bindir
+        ${PG_CONFIG} --bindir
 
-    - name: Install pgcopydb
+    - name: Invoke pgcopydb
       run: |
-        apt update
-        apt-get install pgcopydb
+        pgcopydb --version
         pgcopydb --help
 
   bench:
diff --git a/build-tools.Dockerfile b/build-tools.Dockerfile
index a18fcee75d..8ede6204de 100644
--- a/build-tools.Dockerfile
+++ b/build-tools.Dockerfile
@@ -55,9 +55,18 @@ RUN set -e \
         xz-utils \
         zlib1g-dev \
         zstd \
-        $([[ "${DEBIAN_VERSION}" = "bookworm" ]] && echo pgcopydb || true) \
     && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
 
+# Conditional installation of pgcopydb from unstable repository for Bookworm only (need version 0.17-1 or higher)
+RUN if [ "${DEBIAN_VERSION}" = "bookworm" ]; then \
+        echo "deb http://deb.debian.org/debian unstable main" > /etc/apt/sources.list.d/unstable.list \
+        && apt update \
+        && apt install -y -t unstable pgcopydb \
+        && rm /etc/apt/sources.list.d/unstable.list \
+        && apt update \
+        && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*; \
+    fi
+
 # sql_exporter
 
 # Keep the version the same as in compute/compute-node.Dockerfile and