Skip to content

Upgrade postgres client version - #2316

Closed
alxndrsn wants to merge 17 commits into
getodk:masterfrom
alxndrsn:upgrade-postgres-client-version
Closed

alxndrsn wants to merge 17 commits into
getodk:masterfrom
alxndrsn:upgrade-postgres-client-version

Conversation

@alxndrsn

@alxndrsn alxndrsn commented Nov 9, 2026

Copy link
Copy Markdown
Contributor

Warning

Branch off and target next, not master. The master is stable and used in production (exception: documentation/infrastructure-only changes).

Closes #

What has been done to verify that this works as intended?

Why is this the best possible solution? Were any other approaches considered?

How does this change impact users? Describe intentional behavior changes from code updates. What are the regression risks?

Is this change user-facing or otherwise noteworthy to users? If so, please add an entry for it in CHANGELOG.md.

Does this change require updates to documentation? If so, please file an issue here and include the link below.

alxndrsn and others added 17 commits September 17, 2026 11:20
…etodk#2248)

This seems to prevent a race condition related to volume creation order:

	Container central-postgres14-1  Error response from daemon: failed to mkdir /var/lib/docker/volumes/central_postgres14/_data/data: mkdir /var/lib/docker/volumes/central_postgres14/_data/data: file exists

This error was seen ~3% of the time when running:

* `postgres` container based on `tianon/postgres-upgrade:9.6-to-14`
* `postgres14` container based on `pgautoupgrade/pgautoupgrade:17.11-trixie`

Given the vague nature of both the error itself, and reproduction circumstances, it seems prudent to introduce this dependency.

The dependency itself seems logical, as the `postgres14` container should be waiting for the `postgres` container to create a flag file before PostgreSQL itself starts up.

See:

* moby/moby#47021
* https://forums.docker.com/t/error-while-creating-mount-source-path-after-docker-desktop-update-to-v4-35/144676
In the original implementation (getodk#343), old postgres data was cleaned up automatically if a specific flag file was present.

This behaviour was changed (prior to release?) in a follow-up PR (getodk#395) to link to documentation instead.

Over time, it's become less clear which part of the linked documentation is relevant.  This PR aims to link more directly to the relevant documentation.
For legacy reasons, some `npm` commands were being invoked in `./test/nginx` instead of `./test`.  This works because `npm` looks for the nearest `package.json` file and uses its directory as PWD.  But also quite confusing, especially in the case of `npm run test:service`, which has nothing to do with the code in `test/nginx`.
Previously, these tests were conflating linebreaks and variable separators.  This commit resolves that by changing diff comparison from raw strings to the hex content of those strings.

Example failure with this change (note linebreak `\x0a` vs NUL char `\x00`):

	$ ./test/test-with-pgenvblock.sh
	[test-with-pgenvblock] Testing...
	[test-with-pgenvblock]   Testing: specific postgres-related variables...
	1,2c1,2
	< 00000000: 5047 5353 4c4d 4f44 453d 320a 5047 4441  PGSSLMODE=2.PGDA
	< 00000010: 5441 4241 5345 3d34 0a                   TABASE=4.
	---
	> 00000000: 5047 5353 4c4d 4f44 453d 3200 5047 4441  PGSSLMODE=2.PGDA
	> 00000010: 5441 4241 5345 3d34 00                   TABASE=4.
	[test-with-pgenvblock] !!!
	[test-with-pgenvblock] !!! Test failed; see above for differences between '< actual' and '> expected'
	[test-with-pgenvblock] !!!

Ref getodk#2203
Tests for additional edge cases lay the groundwork for fixing getodk#2203.
The `service` container has no need to access the enketo secrets contained in the `secrets` container.
Lock ubuntu version to major release, as using a non-specific target (`ubuntu-latest`) causes build breakages when OS-level dependency naming, availability & versions change.
…odk#2302)"

This reverts commit dd78c4d.

While the `secrets` service is indeed the Enketo secrets, the `service` container requires access to the enketo API key, which is stored there.

Co-authored-by: alxndrsn <alxndrsn>
All `memtot` values are fetched in bytes, but the final comparison was previously expecting kilo/kibibytes.

Closes getodk#2169
1. rename dockerfile from `secrets.dockerfile` to `enketo-secrets.dockerfile`
2. move container-specific files to their own directory

Reduce ambiguity around the purpose of the `secrets` service.

The service itself and the associated shared volume are not renamed, as these changes would introduce complications to existing environments.
* maintain legacy ugprader from pg 9.6 to 14
* replace postgres 14 image with pgautoupgrade
* set up future upgrade paths from 19 onwards, via bump of pgautoupgrade version number
* leave various housekeeping tasks for either a "pg-diagnostics" script, or documentation

Closes getodk#1385
Upgrades `postgresql-client` dependency version from 14 to 18.  This version number dictates the version of `pg_dump` and `pg_restore` which `central-backend` will use when backing up and restoring database contents.  The version of `pg_dump` must be less than or equal to the version of PostgreSQL where the backup will be restored to.

Related:

* getodk#2285
* getodk#2315
@alxndrsn alxndrsn closed this Nov 9, 2026
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants