Skip to content

fix: add default startretries value to services provisioned in AIO image; bump admin-mgr to 0.20.0 #1005

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.

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

Merged
merged 3 commits into from
Jun 17, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion ansible/vars.yml
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ postgres_exporter_release_checksum:
amd64: sha256:cb89fc5bf4485fb554e0d640d9684fae143a4b2d5fa443009bd29c59f9129e84

adminapi_release: 0.64.2
adminmgr_release: 0.19.2
adminmgr_release: 0.20.0

# Postgres Extensions
postgis_release: "3.3.2"
Expand Down
2 changes: 1 addition & 1 deletion common.vars.pkr.hcl
Original file line number Diff line number Diff line change
@@ -1 +1 @@
postgres-version = "15.1.1.64"
postgres-version = "15.1.1.65"
2 changes: 1 addition & 1 deletion docker/all-in-one/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ ARG pgbouncer_release=1.18.0
ARG postgrest_release=10.1.2
ARG gotrue_release=2.130.0
ARG adminapi_release=0.64.1
ARG adminmgr_release=0.19.0
ARG adminmgr_release=0.20.0
ARG vector_release=0.22.3
ARG postgres_exporter_release=0.15.0
ARG envoy_release=1.28.0
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ command=/opt/supabase-admin-api
user=adminapi
autorestart=true
autostart=true
startretries=1000
stdout_logfile=/var/log/services/adminapi.log
redirect_stderr=true
stdout_logfile_maxbytes=10MB
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ command=/usr/local/bin/run-logrotate.sh
autostart=true
autorestart=true
user=root
startretries=1000
stdout_logfile=/var/log/services/logrotate.log
redirect_stderr=true
stdout_logfile_maxbytes=10MB
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ command=/usr/bin/admin-mgr lsn-checkpoint-push --watch
user=root
autorestart=false
autostart=false
startretries=1000
stdout_logfile=/var/log/services/lsn-push.log
redirect_stderr=true
stdout_logfile_maxbytes=10MB
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ command=/bin/bash -c "tcpdump -s 128 -Q out -nn -tt -vv -p -l 'tcp and (port 543
user=root
autorestart=true
autostart=true
startretries=1000
stdout_logfile=/var/log/services/pg_egress_collect.log
redirect_stderr=true
stdout_logfile_maxbytes=10MB
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ user=postgres
stopsignal=INT
autorestart=true
autostart=true
startretries=1000
priority=1
# Inherit env vars from https://github.com/supabase/postgres/blob/develop/Dockerfile#L800
environment=POSTGRES_PASSWORD="%(ENV_POSTGRES_PASSWORD)s",POSTGRES_HOST="%(ENV_POSTGRES_HOST)s"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ command=/usr/local/bin/supa-shutdown.sh
user=root
autorestart=true
autostart=false
startretries=1000
stdout_logfile=/var/log/services/supa-shutdown.log
redirect_stderr=true
stdout_logfile_maxbytes=10MB
Expand Down
1 change: 1 addition & 0 deletions docker/all-in-one/etc/supervisor/services/envoy.conf
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ user=envoy
autorestart=true
autostart=false
stopasgroup=true
startretries=1000
stdout_logfile=/var/log/services/envoy.log
redirect_stderr=true
stdout_logfile_maxbytes=10MB
1 change: 1 addition & 0 deletions docker/all-in-one/etc/supervisor/services/exporter.conf
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ command=/opt/postgres_exporter/postgres_exporter --disable-settings-metrics --ex
user=root
autorestart=true
autostart=true
startretries=1000
environment=DATA_SOURCE_NAME="host=localhost dbname=postgres sslmode=disable user=supabase_admin pg_stat_statements.track=none application_name=postgres_exporter"
stdout_logfile=/var/log/services/exporter.log
redirect_stderr=true
Expand Down
2 changes: 1 addition & 1 deletion docker/all-in-one/etc/supervisor/services/gotrue.conf
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
directory=/opt/gotrue
command=/opt/gotrue/gotrue --config /etc/gotrue.env
user=gotrue
startretries=30
startretries=1000
autorestart=true
autostart=true
stdout_logfile=/var/log/services/gotrue.log
Expand Down
1 change: 1 addition & 0 deletions docker/all-in-one/etc/supervisor/services/kong.conf
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ user=kong
autorestart=true
autostart=true
stopasgroup=true
startretries=1000
environment=KONG_NGINX_DAEMON="off"
stdout_logfile=/var/log/services/kong.log
redirect_stderr=true
Expand Down
1 change: 1 addition & 0 deletions docker/all-in-one/etc/supervisor/services/postgrest.conf
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ user=postgrest
autorestart=true
autostart=true
stopasgroup=true
startretries=1000
stdout_logfile=/var/log/services/postgrest.log
redirect_stderr=true
stdout_logfile_maxbytes=10MB
Loading