Compare commits
1
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
0dd3d1d4be |
@@ -1,3 +1,4 @@
|
|||||||
|
export DB_ENTRYPOINT_VERSION=v7
|
||||||
export PG_BACKUP_VERSION=v3
|
export PG_BACKUP_VERSION=v3
|
||||||
export APP_ENTRYPOINT_VERSION=v2
|
export APP_ENTRYPOINT_VERSION=v2
|
||||||
export APP_INSTALL_SSL_VERSION=v1
|
export APP_INSTALL_SSL_VERSION=v1
|
||||||
|
|||||||
@@ -0,0 +1,20 @@
|
|||||||
|
#!/bin/bash
|
||||||
|
# Co-op Cloud entrypoint wrapper for the discourse/postgres image.
|
||||||
|
#
|
||||||
|
# The image (https://github.com/discourse/discourse-postgres) handles everything
|
||||||
|
# itself, including the in-place major-version pg_upgrade on boot. The only thing
|
||||||
|
# it can't do for us is read the docker secret: it expects the DB password in the
|
||||||
|
# DB_PASSWORD / POSTGRES_PASSWORD env vars (no *_FILE support), so inject it from
|
||||||
|
# /run/secrets here, then hand off to the image's real entrypoint.
|
||||||
|
#
|
||||||
|
# The install user and data-checksum settings the upgrade needs are passed as
|
||||||
|
# plain env vars in compose.yml (POSTGRES_USER, POSTGRES_INITDB_ARGS).
|
||||||
|
set -e
|
||||||
|
|
||||||
|
if [ -f /run/secrets/db_password ]; then
|
||||||
|
DB_PASSWORD="$(cat /run/secrets/db_password)"
|
||||||
|
export DB_PASSWORD
|
||||||
|
export POSTGRES_PASSWORD="$DB_PASSWORD"
|
||||||
|
fi
|
||||||
|
|
||||||
|
exec run-postgres.sh postgres
|
||||||
+9
-10
@@ -65,7 +65,8 @@ services:
|
|||||||
db:
|
db:
|
||||||
# discourse/postgres = pgvector + discourse's postgres management layer, which
|
# discourse/postgres = pgvector + discourse's postgres management layer, which
|
||||||
# auto-upgrades an older cluster in place on boot (pg_upgrade into the versioned
|
# auto-upgrades an older cluster in place on boot (pg_upgrade into the versioned
|
||||||
# PGDATA /var/lib/postgresql/${MAJOR}/docker); everything is driven by the env below.
|
# PGDATA /var/lib/postgresql/${MAJOR}/docker). The cc-db-entrypoint wrapper only
|
||||||
|
# injects the password secret; everything else is driven by the env below.
|
||||||
image: discourse/postgres:pg18
|
image: discourse/postgres:pg18
|
||||||
networks:
|
networks:
|
||||||
- internal
|
- internal
|
||||||
@@ -76,18 +77,13 @@ services:
|
|||||||
# an existing pg17 cluster at the volume root is found and upgraded into /18/docker
|
# an existing pg17 cluster at the volume root is found and upgraded into /18/docker
|
||||||
- 'postgresql_data:/var/lib/postgresql'
|
- 'postgresql_data:/var/lib/postgresql'
|
||||||
configs:
|
configs:
|
||||||
|
- source: db_entrypoint
|
||||||
|
target: /usr/local/bin/cc-db-entrypoint.sh
|
||||||
|
mode: 0555
|
||||||
- source: pg_backup
|
- source: pg_backup
|
||||||
target: /pg_backup.sh
|
target: /pg_backup.sh
|
||||||
mode: 0555
|
mode: 0555
|
||||||
entrypoint:
|
entrypoint: /usr/local/bin/cc-db-entrypoint.sh
|
||||||
- /bin/bash
|
|
||||||
- -c
|
|
||||||
- |
|
|
||||||
if [ -f /run/secrets/db_password ]; then
|
|
||||||
DB_PASSWORD="$$(cat /run/secrets/db_password)"
|
|
||||||
export DB_PASSWORD POSTGRES_PASSWORD="$$DB_PASSWORD"
|
|
||||||
fi
|
|
||||||
exec run-postgres.sh postgres
|
|
||||||
environment:
|
environment:
|
||||||
# internal-only overlay network; keep all-trust so the app and the
|
# internal-only overlay network; keep all-trust so the app and the
|
||||||
# backup/restore hooks connect without juggling the superuser password
|
# backup/restore hooks connect without juggling the superuser password
|
||||||
@@ -157,6 +153,9 @@ configs:
|
|||||||
app_migrate_uploads:
|
app_migrate_uploads:
|
||||||
name: ${STACK_NAME}_app_migrate_uploads_${APP_MIGRATE_UPLOADS_VERSION}
|
name: ${STACK_NAME}_app_migrate_uploads_${APP_MIGRATE_UPLOADS_VERSION}
|
||||||
file: migrate-uploads.sh
|
file: migrate-uploads.sh
|
||||||
|
db_entrypoint:
|
||||||
|
name: ${STACK_NAME}_db_entrypoint_${DB_ENTRYPOINT_VERSION}
|
||||||
|
file: cc-db-entrypoint.sh
|
||||||
pg_backup:
|
pg_backup:
|
||||||
name: ${STACK_NAME}_pg_backup_${PG_BACKUP_VERSION}
|
name: ${STACK_NAME}_pg_backup_${PG_BACKUP_VERSION}
|
||||||
file: pg_backup.sh
|
file: pg_backup.sh
|
||||||
|
|||||||
Reference in New Issue
Block a user