Skip to content

Commit

Permalink
fix: alter ports to prevent conflicts
Browse files Browse the repository at this point in the history
  • Loading branch information
cecilia-sanare committed Jan 23, 2024
1 parent 3c88b3e commit 2978d74
Show file tree
Hide file tree
Showing 6 changed files with 20 additions and 5 deletions.
6 changes: 5 additions & 1 deletion .editorconfig
Original file line number Diff line number Diff line change
Expand Up @@ -10,4 +10,8 @@ insert_final_newline = true
trim_trailing_whitespace = true

[*.md]
trim_trailing_whitespace = false
trim_trailing_whitespace = false

[Makefile]
indent_style = tab
indent_size = 1
2 changes: 1 addition & 1 deletion .env.local
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# ---
# Anything in this block is here intentionally and is not an actual secret
DATABASE_URL="postgresql://admin:admin@localhost:7777/charcoal?schema=public"
DATABASE_URL="postgresql://admin:admin@localhost:10010/charcoal?schema=public"
AUTH_SECRET="1f291eb7bb1b590a5bf980dadefb891e"
NEXTAUTH_URL="http://localhost:3000"
# ---
8 changes: 8 additions & 0 deletions Makefile
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
setup:
docker compose up -d

setup-alpha:
docker compose -f docker-compose.alpha.yml up -d

setup-live:
docker compose -f docker-compose.live.yml up -d
3 changes: 2 additions & 1 deletion docker-compose.alpha.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
# docker-compose.yml

version: '3.8'
name: charcoal-alpha
services:
charcoal_db_alpha:
image: postgres:13.5
Expand All @@ -13,7 +14,7 @@ services:
volumes:
- charcoal_db_alpha:/var/lib/postgresql/data
ports:
- 5433:5432
- 10005:5432
volumes:
charcoal_db_alpha:
driver: local
3 changes: 2 additions & 1 deletion docker-compose.live.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
# docker-compose.yml

version: '3.8'
name: charcoal-live
services:
charcoal_db:
image: postgres:13.5
Expand All @@ -13,7 +14,7 @@ services:
volumes:
- charcoal_db:/var/lib/postgresql/data
ports:
- 5432:5432
- 10000:5432
volumes:
charcoal_db:
driver: local
3 changes: 2 additions & 1 deletion docker-compose.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
# docker-compose.yml

version: '3.8'
name: charcoal-local
services:
charcoal_db_local:
image: postgres:13.5
Expand All @@ -13,7 +14,7 @@ services:
volumes:
- charcoal_db_local:/var/lib/postgresql/data
ports:
- '7777:5432'
- 10010:5432
volumes:
charcoal_db_local:
driver: local

0 comments on commit 2978d74

Please sign in to comment.