Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Prevent start_for_complement.sh from setting START_POSTGRES to false when it's already set #16985

Merged
merged 3 commits into from
Mar 21, 2024
Merged

Prevent start_for_complement.sh from setting START_POSTGRES to false when it's already set #16985

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ff0c0ec
Prevent start_for_complement.sh from setting START_POSTGRES to false …
anoadragon453 Mar 7, 2024
d687073
changelog
anoadragon453 Mar 7, 2024
44e898f
Use succint bashism and update comment
anoadragon453 Mar 21, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions changelog.d/16985.misc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Allow containers building on top of Synapse's Complement container is use the included PostgreSQL cluster.
2 changes: 1 addition & 1 deletion docker/complement/conf/postgres.supervisord.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
[program:postgres]
command=/usr/local/bin/prefix-log gosu postgres postgres

# Only start if START_POSTGRES=1
# Only start if START_POSTGRES=true
autostart=%(ENV_START_POSTGRES)s

# Lower priority number = starts first
Expand Down
5 changes: 3 additions & 2 deletions docker/complement/conf/start_for_complement.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,9 @@ case "$SYNAPSE_COMPLEMENT_DATABASE" in
;;

sqlite|"")
# Configure supervisord not to start Postgres, as we don't need it
export START_POSTGRES=false
anoadragon453 marked this conversation as resolved.
Show resolved Hide resolved
# Set START_POSTGRES to false unless it has already been set
# (i.e. by another container image inheriting our own).
export START_POSTGRES=${START_POSTGRES:-false}
;;

*)
Expand Down
Loading