From 31d87720d73dd0242446ab03feac0035055ebfe4 Mon Sep 17 00:00:00 2001 From: BodoBolero Date: Thu, 7 Nov 2024 16:01:43 +0100 Subject: [PATCH] undo changes to Dockerfile - these changes are in separate PR --- build-tools.Dockerfile | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) diff --git a/build-tools.Dockerfile b/build-tools.Dockerfile index 8ede6204de..93f1e48afa 100644 --- a/build-tools.Dockerfile +++ b/build-tools.Dockerfile @@ -38,7 +38,7 @@ RUN set -e \ libseccomp-dev \ libsqlite3-dev \ libssl-dev \ - $([[ "${DEBIAN_VERSION}" = "bullseye" ]] && echo libstdc++-10-dev || echo libstdc++-11-dev) \ + $([[ "${DEBIAN_VERSION}" = "bullseye" ]] && libstdc++-10-dev || libstdc++-11-dev) \ libtool \ libxml2-dev \ libxmlsec1-dev \ @@ -57,16 +57,6 @@ RUN set -e \ zstd \ && 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