Skip to content
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: 2 additions & 0 deletions .env.development.example
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile.dev
Original file line number Diff line number Diff line change
Expand Up @@ -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"]
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
@@ -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

Expand Down
4 changes: 2 additions & 2 deletions docker-compose.dev.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down