Skip to content

Commit a8f5d71

Browse files
committed
merge: bring dev fixes into main
2 parents ed1a9fd + 2726c6d commit a8f5d71

2 files changed

Lines changed: 8 additions & 34 deletions

File tree

docker-compose.dev.yml

Lines changed: 4 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,11 @@ services:
44
build:
55
context: .
66
dockerfile: backend/Dockerfile
7-
ports:
8-
- "8888:8888"
7+
expose:
8+
- "8888"
99
environment:
1010
- DATABASE_URL=${DATABASE_URL}
1111
- ALLOWED_ORIGINS=${ALLOWED_ORIGINS}
12-
depends_on:
13-
- postgres-dev
1412
healthcheck:
1513
test: ["CMD", "python", "-c", "import urllib.request; urllib.request.urlopen('http://localhost:8888/', timeout=3)"]
1614
interval: 10s
@@ -24,8 +22,8 @@ services:
2422
dockerfile: frontend/Dockerfile.dev
2523
args:
2624
- VITE_API_BASE=${VITE_API_BASE}
27-
ports:
28-
- "3333:3333"
25+
expose:
26+
- "3333"
2927
environment:
3028
- ORIGIN=${ORIGIN}
3129
- VITE_API_BASE=${VITE_API_BASE}
@@ -40,14 +38,3 @@ services:
4038
retries: 5
4139
start_period: 20s
4240

43-
postgres-dev:
44-
image: postgres:15-alpine
45-
environment:
46-
POSTGRES_DB: m3tacron_dev
47-
POSTGRES_USER: postgres
48-
POSTGRES_PASSWORD: postgres
49-
volumes:
50-
- pgdata_dev:/var/lib/postgresql/data
51-
52-
volumes:
53-
pgdata_dev:

docker-compose.prod.yml

Lines changed: 4 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,11 @@ services:
44
build:
55
context: .
66
dockerfile: backend/Dockerfile
7-
ports:
8-
- "8888:8888"
7+
expose:
8+
- "8888"
99
environment:
1010
- DATABASE_URL=${DATABASE_URL}
1111
- ALLOWED_ORIGINS=${ALLOWED_ORIGINS}
12-
depends_on:
13-
- postgres-prod
1412
healthcheck:
1513
test: ["CMD", "python", "-c", "import urllib.request; urllib.request.urlopen('http://localhost:8888/', timeout=3)"]
1614
interval: 10s
@@ -24,8 +22,8 @@ services:
2422
dockerfile: frontend/Dockerfile
2523
args:
2624
- VITE_API_BASE=${VITE_API_BASE}
27-
ports:
28-
- "3333:3333"
25+
expose:
26+
- "3333"
2927
environment:
3028
- ORIGIN=${ORIGIN}
3129
- VITE_API_BASE=${VITE_API_BASE}
@@ -38,14 +36,3 @@ services:
3836
retries: 5
3937
start_period: 20s
4038

41-
postgres-prod:
42-
image: postgres:15-alpine
43-
environment:
44-
POSTGRES_DB: m3tacron_prod
45-
POSTGRES_USER: postgres
46-
POSTGRES_PASSWORD: postgres
47-
volumes:
48-
- pgdata_prod:/var/lib/postgresql/data
49-
50-
volumes:
51-
pgdata_prod:

0 commit comments

Comments
 (0)