From 8724897cb921540a6ec4253e4d8eb3e9b06e1bd3 Mon Sep 17 00:00:00 2001
From: moozzi <bieniek.milosz0@gmail.com>
Date: Wed, 18 Feb 2026 13:51:10 +0100
Subject: [PATCH] Use PORT env variable instead of hardcoded value

---
 .env.development.example | 2 ++
 Dockerfile.dev           | 2 +-
 Makefile                 | 2 +-
 docker-compose.dev.yml   | 4 ++--
 4 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/.env.development.example b/.env.development.example
index a115855..6615aab 100644
--- a/.env.development.example
+++ b/.env.development.example
@@ -10,6 +10,8 @@ PGPORT=5432
 PGDATABASE=${POSTGRES_DB}
 SECRET_KEY_BASE=dev-secret-change-me
 
+PORT=3000
+
 # Optional IMAP (used when running the imap_worker profile)
 IMAP_USERNAME=your-imap-username
 IMAP_PASSWORD=your-imap-password
diff --git a/Dockerfile.dev b/Dockerfile.dev
index bd9bf35..0472c41 100644
--- a/Dockerfile.dev
+++ b/Dockerfile.dev
@@ -22,4 +22,4 @@ RUN npm install
 EXPOSE 3000
 
 ENTRYPOINT ["./bin/docker-entrypoint"]
-CMD ["./bin/rails", "server", "-b", "0.0.0.0", "-p", "3000"]
+CMD ["./bin/rails", "server", "-b", "0.0.0.0"]
diff --git a/Makefile b/Makefile
index 1c83de7..b3c8d54 100644
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,4 @@
-COMPOSE ?= docker compose -f docker-compose.dev.yml
+COMPOSE ?= docker compose --env-file .env.development -f docker-compose.dev.yml
 
 .PHONY: dev dev-detach down shell console test imap logs db-migrate db-reset db-import stats psql sim-email-once sim-email-stream
 
diff --git a/docker-compose.dev.yml b/docker-compose.dev.yml
index 281e602..dc7dec4 100644
--- a/docker-compose.dev.yml
+++ b/docker-compose.dev.yml
@@ -31,7 +31,7 @@ services:
       RAILS_ENV: ${RAILS_ENV:-development}
       NODE_ENV: ${NODE_ENV:-development}
       HOST: 0.0.0.0
-      PORT: 3000
+      PORT: ${PORT:-3000}
       DATABASE_URL: ${DATABASE_URL:-postgresql://${POSTGRES_USER:-hackorum}:${POSTGRES_PASSWORD:-hackorum}@db:5432/${POSTGRES_DB:-hackorum_development}}
       PGHOST: db
       PGPORT: 5432
@@ -45,7 +45,7 @@ services:
       - bundle:/usr/local/bundle
       - node_modules:/app/node_modules
     ports:
-      - "3000:3000"
+      - "${PORT:-3000}:${PORT:-3000}"
     depends_on:
       db:
         condition: service_healthy