From c9572726a4e63801dbea2437b571d35b98fa7c3e Mon Sep 17 00:00:00 2001 From: Bernhard Radermacher Date: Wed, 18 Feb 2026 11:37:10 +0100 Subject: [PATCH] move repmgr to find problem, exclude dev --- Dockerfile | 29 ++++++++++++++++++++++------- 1 file changed, 22 insertions(+), 7 deletions(-) diff --git a/Dockerfile b/Dockerfile index 16b961a..3e2e96e 100644 --- a/Dockerfile +++ b/Dockerfile @@ -80,7 +80,7 @@ RUN set -ex; \ tempDir="$(mktemp -d)"; \ cd "$tempDir"; \ apt-get update; \ - apt-get install -y --no-install-recommends dpkg-dev ca-certificates curl libjson-c-dev libcurlpp-dev; \ + apt-get install -y --no-install-recommends dpkg-dev; \ echo "deb [ trusted=yes ] file://$tempDir ./" > /etc/apt/sources.list.d/temp.list; \ _update_repo() { \ dpkg-scanpackages . > Packages; \ @@ -103,12 +103,8 @@ RUN set -ex; \ sed -ri 's/#(create_main_cluster) .*$/\1 = false/' /etc/postgresql-common/createcluster.conf \ apt-get install -y --no-install-recommends \ "postgresql-$PG_MAJOR=$PG_VERSION" \ - "postgresql-server-dev-$PG_MAJOR=$PG_VERSION" \ +# "postgresql-server-dev-$PG_MAJOR=$PG_VERSION" \ ; \ -# cp /usr/include/postgresql/15/server/pg_config.h /usr/include/postgresql/; \ -# curl https://github.com/EnterpriseDB/repmgr/releases/download/v5.5.0/repmgr-5.5.0.tar.gz | tar -xzC "$tempDir"; \ -# cd repmgr; \ -# ./configure && make -j "$nproc" install; \ cd /; \ rm -rf /var/lib/apt/lists/*; \ apt-get purge -y --auto-remove; \ @@ -116,6 +112,25 @@ RUN set -ex; \ find /usr -name '*.pyc' -type f -exec bash -c 'for pyc; do dpkg -S "$pyc" &> /dev/null || rm -vf "$pyc"; done' -- '{}' +; \ postgres --version +RUN set -eux; \ + savedAptMark="$(apt-mark showmanual)"; \ + apt-get update; \ + apt-get install -y --no-install-recommends dpkg-dev ca-certificates wget libjson-c-dev libcurlpp-dev; \ + apt-get build-dep -y "postgresql-$PG_MAJOR=$PG_VERSION"; \ + rm -rf /var/lib/apt/lists/*; \ + tempDir="$(mktemp -d)"; \ + nproc="$(nproc)"; \ + cp /usr/include/postgresql/15/server/pg_config.h /usr/include/postgresql/; \ + cd "$tempDir"; \ + wget https://github.com/EnterpriseDB/repmgr/releases/download/v5.5.0/repmgr-5.5.0.tar.gz; \ + echo "c5633c351f3a0627a53ac1828ac7581ee74c7e0c repmgr-5.5.0.tar.gz" | sha1sum --check; \ + tar -xvzf repmgr-5.5.0.tar.gz; \ + cd repmgr; \ + ./configure && make -j "$nproc" install; \ + apt-mark auto '.*' > /dev/null; \ + [ -z "$savedAptMark" ] || apt-mark manual $savedAptMark > /dev/null; \ + apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false + RUN set -eux; \ dpkg-divert --add --rename --divert "/usr/share/postgresql/postgresql.conf.sample.dpkg" "/usr/share/postgresql/$PG_MAJOR/postgresql.conf.sample"; \ cp -v /usr/share/postgresql/postgresql.conf.sample.dpkg /usr/share/postgresql/postgresql.conf.sample; \ @@ -125,7 +140,7 @@ RUN set -eux; \ RUN install --verbose --directory --owner postgres --group postgres --mode 3777 /var/run/postgresql -ENV PGDATA /var/lib/postgresql/data +ENV PGDATA=/var/lib/postgresql/data RUN install --verbose --directory --owner postgres --group postgres --mode 1777 "$PGDATA" VOLUME /var/lib/postgresql/data