Modified default database port config to work for wsl (#895)

rubyforgood · Jul 22, 2024 · a1c6a86 · a1c6a86
1 parent e6f1ea0
commit a1c6a86
Showing 1 changed file with 8 additions and 1 deletion.
diff --git a/config/database.yml b/config/database.yml
@@ -20,7 +20,14 @@ default: &default
   host: localhost
   username: <%= ENV['DATABASE_USERNAME'] %>
   password: <%= ENV['DATABASE_PASSWORD'] %>
-  port: <%= ENV.fetch("DATABASE_PORT", `docker compose port postgres 5432 2> /dev/null`.split(":").last || 5432) %>
+  port: <%= ENV.fetch("DATABASE_PORT") do
+          begin
+            docker_port = `docker compose port postgres 5432 2> /dev/null`.split(":").last
+            Integer(docker_port.strip)
+          rescue
+            5432
+          end
+        end %>
   # For details on connection pooling, see Rails configuration guide
   # https://guides.rubyonrails.org/configuring.html#database-pooling
   pool: <%= ENV.fetch("RAILS_MAX_THREADS") { 5 } %>