Compare commits
2 Commits
0.8.0+3.5.
...
c8ba2e4e2b
| Author | SHA1 | Date | |
|---|---|---|---|
| c8ba2e4e2b | |||
| 7b7ddd70bc |
@ -19,3 +19,5 @@ LETS_ENCRYPT_ENV=production
|
||||
#SECRET_SMTP_PASSWORD_VERSION=v1
|
||||
|
||||
SECRET_DB_PASSWORD_VERSION=v1
|
||||
|
||||
# APP_START_PERIOD=5m # healthcheck start_period; raise on slow hosts (cc-ci sets larger for Rails cold boot)
|
||||
|
||||
2
abra.sh
2
abra.sh
@ -1,2 +1,2 @@
|
||||
export DB_ENTRYPOINT_VERSION=v1
|
||||
export PG_BACKUP_VERSION=v2
|
||||
export PG_BACKUP_VERSION=v1
|
||||
|
||||
10
compose.yml
10
compose.yml
@ -3,7 +3,7 @@ version: "3.8"
|
||||
|
||||
services:
|
||||
app:
|
||||
image: bitnamilegacy/discourse:3.5.0
|
||||
image: bitnamilegacy/discourse:3.3.1
|
||||
networks:
|
||||
- proxy
|
||||
- internal
|
||||
@ -43,16 +43,16 @@ services:
|
||||
#- "traefik.http.routers.${STACK_NAME}.middlewares=${STACK_NAME}-redirect"
|
||||
#- "traefik.http.middlewares.${STACK_NAME}-redirect.headers.SSLForceHost=true"
|
||||
#- "traefik.http.middlewares.${STACK_NAME}-redirect.headers.SSLHost=${DOMAIN}"
|
||||
- "coop-cloud.${STACK_NAME}.version=0.8.0+3.5.0"
|
||||
- "coop-cloud.${STACK_NAME}.version=0.8.0+3.3.1"
|
||||
healthcheck:
|
||||
test: "ruby -e \"require 'uri'; require 'net/http'; uri = URI('http://localhost:3000/srv/status'); res = Net::HTTP.get_response(uri); if res.is_a?(Net::HTTPSuccess) then exit (0) else exit (1) end\""
|
||||
interval: 30s
|
||||
timeout: 10s
|
||||
retries: 6
|
||||
start_period: 20m
|
||||
start_period: ${APP_START_PERIOD:-5m}
|
||||
|
||||
db:
|
||||
image: pgvector/pgvector:pg17
|
||||
image: postgres:13
|
||||
networks:
|
||||
- internal
|
||||
secrets:
|
||||
@ -87,7 +87,7 @@ services:
|
||||
- 'redis_data:/data'
|
||||
|
||||
sidekiq:
|
||||
image: bitnamilegacy/discourse:3.5.0
|
||||
image: bitnamilegacy/discourse:3.3.1
|
||||
networks:
|
||||
- proxy
|
||||
- internal
|
||||
|
||||
32
pg_backup.sh
32
pg_backup.sh
@ -1,6 +1,16 @@
|
||||
#!/bin/bash
|
||||
|
||||
# Postgres backup/restore hook for the discourse `db` service.
|
||||
# Postgres backup/restore hook for the discourse `db` service. Invoked by backupbot-two via:
|
||||
# backupbot.backup.pre-hook = "/pg_backup.sh backup"
|
||||
# backupbot.backup.volumes.postgresql_data.path = "backup.sql"
|
||||
# backupbot.restore.post-hook = "/pg_backup.sh restore"
|
||||
# Backup dumps the DB to backup.sql (gzip) inside the postgresql_data volume; backupbot archives it.
|
||||
# Restore reimports it. Discourse (the rails app + sidekiq) keeps TCP connections open to the DB, so
|
||||
# restore must terminate them and FORCE-drop before recreating, then reimport the dump deterministically.
|
||||
# The previous recipe shipped a pg_dump backup but NO restore hook — a file-level restore did not reload
|
||||
# into the running postgres, so a restored backup silently kept the live (un-restored) state. cc-ci
|
||||
# caught this: a seeded ci_marker row was gone after restore. Same pattern as the immich / mattermost-lts
|
||||
# / ghost recipe-PRs.
|
||||
|
||||
set -e
|
||||
|
||||
@ -14,30 +24,10 @@ function backup {
|
||||
}
|
||||
|
||||
function restore {
|
||||
cd /var/lib/postgresql/data/
|
||||
|
||||
# Block all non-local connections so the running discourse app + sidekiq cannot reconnect and
|
||||
# interfere with the drop/recreate/reimport. Restored on exit.
|
||||
restore_hba() {
|
||||
cat pg_hba.conf.bak > pg_hba.conf
|
||||
rm -f pg_hba.conf.bak
|
||||
su postgres -c 'pg_ctl reload'
|
||||
}
|
||||
cp pg_hba.conf pg_hba.conf.bak
|
||||
echo 'local all all trust' > pg_hba.conf
|
||||
su postgres -c 'pg_ctl reload'
|
||||
trap restore_hba EXIT INT TERM
|
||||
|
||||
# terminate any lingering local sessions before recreate
|
||||
# see https://stackoverflow.com/questions/5108876/kill-a-postgresql-session-connection
|
||||
psql -U "$DB_USER" -d postgres -c \
|
||||
"SELECT pg_terminate_backend(pid) FROM pg_stat_activity WHERE datname='${DB_NAME}' AND pid<>pg_backend_pid();"
|
||||
|
||||
# drop database and then recreate it
|
||||
psql -U "$DB_USER" -d postgres -c "DROP DATABASE ${DB_NAME} WITH (FORCE);"
|
||||
createdb -U "$DB_USER" "$DB_NAME"
|
||||
|
||||
# reimport data
|
||||
gunzip -c "$BACKUP_FILE" | psql -U "$DB_USER" -d "$DB_NAME" -1 -v ON_ERROR_STOP=1 -f -
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user