daenamnu/nextcloud
1
0
Fork 0
mirror of https://github.com/nextcloud/all-in-one.git synced 2026-06-01 08:20:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

Replace pg_upgrade with pg_dump/restore for windmill postgres major-version upgrade

Browse Source 
Agent-Logs-Url: https://github.com/nextcloud/all-in-one/sessions/58741c1d-7822-425b-a995-deab87e5901c

Co-authored-by: szaimen <42591237+szaimen@users.noreply.github.com>
This commit is contained in:
copilot-swe-agent[bot]
2026-04-27 14:54:28 +00:00
committed by GitHub
parent 1823336f89
commit c60861d79c
3 changed files with 111 additions and 73 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
Containers/windmill/Dockerfile
View File

@@ -1,10 +1,5 @@
# syntax=docker/dockerfile:latest
# Stage 1: Previous PostgreSQL major version – binaries are copied into the
# final image so that start.sh can run pg_upgrade when the data directory was
# created by an older major version.
FROM postgres:16.13-bookworm AS postgres-prev
# Stage 2: Current PostgreSQL server – version is pinned to a full patch
# Stage 1: Current PostgreSQL server – version is pinned to a full patch
# release so builds are reproducible and the exact version is auditable.
# (matches the Debian bookworm base used by windmill-labs/windmill)
FROM postgres:17.9-bookworm AS postgres-base
@@ -24,10 +19,6 @@ COPY --from=postgres-base /usr/bin/pg_dump \
/usr/bin/pg_restore \
/usr/bin/
# Copy previous PostgreSQL major version binaries for automatic pg_upgrade
COPY --from=postgres-prev /usr/lib/postgresql /usr/lib/postgresql
COPY --from=postgres-prev /usr/share/postgresql /usr/share/postgresql
# Install supervisor from standard Debian repos (remove broken external sources first)
# hadolint ignore=DL3008
RUN set -ex; \
@@ -74,10 +65,9 @@ RUN set -ex; \
ln -sf /usr/lib/postgresql/17/bin/initdb /usr/local/bin/initdb; \
ln -sf /usr/lib/postgresql/17/bin/pg_ctl /usr/local/bin/pg_ctl; \
ln -sf /usr/lib/postgresql/17/bin/pg_isready /usr/local/bin/pg_isready; \
ln -sf /usr/lib/postgresql/17/bin/pg_upgrade /usr/local/bin/pg_upgrade; \
\
# Record the current PostgreSQL major version so start.sh can detect when
# the bundled major version has changed and trigger an automatic pg_upgrade.
# the bundled major version has changed and trigger an automatic dump/restore upgrade.
echo "17" > /etc/postgres-major-version; \
\
# Write a build-time marker so start.sh can detect image updates and