From 4d9561a33f8a68392b41b6fb919b97d41ea1d11d Mon Sep 17 00:00:00 2001 From: Sam Rose Date: Fri, 3 Oct 2025 06:36:52 -0400 Subject: [PATCH 1/2] fix: do not create links to contrib --- Dockerfile-15 | 4 ---- Dockerfile-orioledb-17 | 2 +- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/Dockerfile-15 b/Dockerfile-15 index f1b0f4558..28f5122c0 100644 --- a/Dockerfile-15 +++ b/Dockerfile-15 @@ -90,10 +90,6 @@ RUN ln -s /nix/var/nix/profiles/default/share/postgresql/* /usr/lib/postgresql/s RUN ln -s /nix/var/nix/profiles/default/share/postgresql/* /usr/share/postgresql/ RUN chown -R postgres:postgres /usr/lib/postgresql/share/postgresql/ RUN chown -R postgres:postgres /usr/share/postgresql/ -# Create symbolic links for contrib directory -RUN mkdir -p /usr/lib/postgresql/share/postgresql/contrib \ - && find /nix/var/nix/profiles/default/share/postgresql/contrib/ -mindepth 1 -type d -exec sh -c 'for dir do ln -s "$dir" "/usr/lib/postgresql/share/postgresql/contrib/$(basename "$dir")"; done' sh {} + \ - && chown -R postgres:postgres /usr/lib/postgresql/share/postgresql/contrib/ RUN chown -R postgres:postgres /usr/lib/postgresql diff --git a/Dockerfile-orioledb-17 b/Dockerfile-orioledb-17 index 0df0b9df0..29f2fa527 100644 --- a/Dockerfile-orioledb-17 +++ b/Dockerfile-orioledb-17 @@ -91,7 +91,7 @@ RUN ln -s /nix/var/nix/profiles/default/share/postgresql/* /usr/lib/postgresql/s RUN ln -s /nix/var/nix/profiles/default/share/postgresql/* /usr/share/postgresql/ RUN chown -R postgres:postgres /usr/lib/postgresql/share/postgresql/ RUN chown -R postgres:postgres /usr/share/postgresql/ -# Create symbolic links for contrib directory + RUN tree /nix > /tmp/tree.txt && cat /tmp/tree.txt && cat /tmp/tree.txt >&2 RUN chown -R postgres:postgres /usr/lib/postgresql From f23b7e3d75993c8ed1559fa3b83cc5da085592ff Mon Sep 17 00:00:00 2001 From: Sam Rose Date: Fri, 3 Oct 2025 06:47:12 -0400 Subject: [PATCH 2/2] chore: rm comment here too --- Dockerfile-17 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile-17 b/Dockerfile-17 index 7db870ad8..3ad03b37c 100644 --- a/Dockerfile-17 +++ b/Dockerfile-17 @@ -91,7 +91,7 @@ RUN ln -s /nix/var/nix/profiles/default/share/postgresql/* /usr/lib/postgresql/s RUN ln -s /nix/var/nix/profiles/default/share/postgresql/* /usr/share/postgresql/ RUN chown -R postgres:postgres /usr/lib/postgresql/share/postgresql/ RUN chown -R postgres:postgres /usr/share/postgresql/ -# Create symbolic links for contrib directory + RUN tree /nix > /tmp/tree.txt && cat /tmp/tree.txt && cat /tmp/tree.txt >&2 RUN chown -R postgres:postgres /usr/lib/postgresql