Skip to content

Commit 10fc465

Browse files
committed
various bug fixes
1 parent d926efe commit 10fc465

File tree

4 files changed

+16
-10
lines changed

4 files changed

+16
-10
lines changed

backend/Rocket.toml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
[production]
2+
address = "localhost"

backend/src/main.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ fn main() {
6363
// PROJECT_END
6464
// VOTE_END
6565

66-
let database_url = env::var("DATABASE_URL").expect("DATABASE_URL must be set in .env");
66+
let database_url = env::var("DATABASE_URL").expect("DATABASE_URL must be set in env");
6767
rocket_factory(&database_url)
6868
.launch();
6969
}

data/Dockerfile

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
# syntax=docker/dockerfile:1
2+
FROM postgres:13-alpine
3+
WORKDIR /data
4+
VOLUME /var/lib/postgresql/data:/data/db
5+
ENV POSTGRES_DB postgres
6+
ENV POSTGRES_USER postgres
7+
ENV POSTGRES_PASSWORD postgres

docker-compose.yml

Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,21 @@
11
version: "3.9"
22
services:
3-
backend:
3+
subcomp-backend:
44
build: ./backend
55
ports:
66
- "8000:8000"
77
- 8000
88
depends_on:
9-
- db
10-
frontend:
9+
- subcomp-data
10+
subcomp-frontend:
1111
build: ./frontend
1212
ports:
1313
- "5000:5000"
1414
- 5000
15-
db:
16-
image: postgres:latest
15+
subcomp-data:
16+
build: ./data
1717
ports:
1818
- "5432:5432"
1919
expose:
2020
- 5432
21-
environment:
22-
- POSTGRES_DB=backend
23-
- POSTGRES_USER=postgres
24-
- POSTGRES_PASSWORD=postgres
21+

0 commit comments

Comments
 (0)