Merge branch 'more-docker-fixes' into 'develop'

docker.exs: don't call fetch_env! for DB_PASS

See merge request soapbox-pub/soapbox-be!154
This commit is contained in:
Alex Gleason 2022-08-13 18:07:15 +00:00
commit f3f269b523

View file

@ -5,7 +5,7 @@
http: [ip: {0, 0, 0, 0}, port: System.get_env("PORT", "5000")]
config :pleroma, :instance,
name: System.get_env("INSTANCE_NAME", "Pleroma"),
name: System.get_env("INSTANCE_NAME", "Soapbox"),
email: System.get_env("ADMIN_EMAIL"),
notify_email: System.get_env("NOTIFY_EMAIL"),
limit: 5000,
@ -20,7 +20,7 @@
_ ->
config :pleroma, Pleroma.Repo,
username: System.get_env("DB_USER", "postgres"),
password: System.fetch_env!("DB_PASS", "postgres"),
password: System.get_env("DB_PASS", "postgres"),
database: System.get_env("DB_NAME", "postgres"),
hostname: System.get_env("DB_HOST", "db")
end