From 71aefdbda2bffbe2f7bfba555797bee917abfb18 Mon Sep 17 00:00:00 2001
From: Nigel Kukard <nkukard@lbsd.net>
Date: Mon, 23 Dec 2024 02:44:20 +0000
Subject: [PATCH] chore: removed multiple versions of timescaledb
---
Dockerfile | 57 ------------------------------------------------------
1 file changed, 57 deletions(-)
diff --git a/Dockerfile b/Dockerfile
index 19561b1..c3cc543 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -110,68 +110,11 @@ RUN set -eux; \
fi
-FROM tsbuilder-base as tsbuilder-2.17.1
-
-ENV TIMESCALEDB_VER=2.17.1
-
-# Checkout the right version
-RUN set -eux; \
- cd build; \
- cd timescaledb; \
- git checkout "$TIMESCALEDB_VER"
-
-# Build
-RUN set -eux; \
- cd build; \
- cd "timescaledb"; \
-# Patching
-# patch -p1 < ../patches/timescaledb-2.14.0-fix-test-output.patch; \
- mkdir build; \
- cd build; \
- \
- cmake ..; \
- make VERBOSE=1 -j$(nproc) -l 8; \
- make DESTDIR="/build/timescaledb-root" install; \
- # We need to install a second time to run timescaledb tests
- echo "Size before stripping..."; \
- du -hs /build/timescaledb-root
-
-# Strip binaries
-RUN set -eux; \
- cd build/timescaledb-root; \
- scanelf --recursive --nobanner --osabi --etype "ET_DYN,ET_EXEC" . | awk '{print $3}' | xargs \
- strip \
- --remove-section=.comment \
- --remove-section=.note \
- -R .gnu.lto_* -R .gnu.debuglto_* \
- -N __gnu_lto_slim -N __gnu_lto_v1 \
- --strip-unneeded; \
- echo "Size after stripping..."; \
- du -hs /build/timescaledb-root
-
-# Testing
-RUN set -eux; \
- # Install TimescaleDB so we can run the installcheck tests below
- tar -c -C /build/timescaledb-root . | tar -x -C /; \
- # For testing we need to run the tests as a non-priv user
- cd build; \
- adduser -D pgsqltest; \
- chown -R pgsqltest:pgsqltest "timescaledb"; \
- cd "timescaledb"; \
- cd build; \
- # Test
- if ! sudo -u pgsqltest make VERBOSE=1 -j1 -l8 installcheck; then \
- cat test/regression.diffs; \
- false; \
- fi
-
-
FROM registry.conarx.tech/containers/postgresql/edge
# NK: Versions are reverse ordered so newer ones overwrite data from older ones
-COPY --from=tsbuilder-2.17.1 /build/timescaledb-root /
COPY --from=tsbuilder-2.17.2 /build/timescaledb-root /
--
GitLab