diff --git a/clusters/base/apps/joplin/helmrelease-joplin.yaml b/clusters/base/apps/joplin/helmrelease-joplin.yaml index 70c2fe4..c9bb309 100644 --- a/clusters/base/apps/joplin/helmrelease-joplin.yaml +++ b/clusters/base/apps/joplin/helmrelease-joplin.yaml @@ -15,9 +15,6 @@ spec: values: controllers: app: - # temporarily disabled - see joplin-postgres HelmRelease; the app - # must not connect until the migrated database data is in place. - replicas: 0 containers: app: image: diff --git a/clusters/base/apps/joplin/helmrelease-postgres.yaml b/clusters/base/apps/joplin/helmrelease-postgres.yaml index 3174baf..58c9208 100644 --- a/clusters/base/apps/joplin/helmrelease-postgres.yaml +++ b/clusters/base/apps/joplin/helmrelease-postgres.yaml @@ -17,17 +17,14 @@ spec: app: image: repository: postgres - # not alpine: the original docker instance ran the glibc-based - # postgres:16 image (Debian). Its on-disk cluster was initdb'd - # under glibc collation; reading it back with the musl-based - # alpine image risks silent index corruption from differing - # text collation order between the two libcs. - # TODO: pin exact minor version once running (check via - # `SELECT version();` or the resolved imageID) - original - # compose.yaml only pinned the major version "16". - tag: "16" + # not alpine: joplin server needs a glibc-collation postgres, + # matching the official (Debian-based) image used everywhere + # else this pattern is followed in this repo. + tag: "16.15" env: TZ: Europe/Moscow + POSTGRES_USER: joplin + POSTGRES_DB: joplin POSTGRES_PASSWORD: valueFrom: secretKeyRef: