Skip to content

Commit e83f78b

Browse files
committed
Merge branch 'main' into PEER-204-Endpoint-For-Registration
syncing changes
2 parents f49005a + 26c2f35 commit e83f78b

27 files changed

+917
-7
lines changed

.eslintignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,4 @@
11
node_modules
22
**/node_modules
3+
4+
**/dist

.gitignore

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,5 +10,5 @@ dist
1010
**/dist
1111

1212
# Secrets
13-
.env*
14-
**/.env*
13+
.env
14+
**/.env

docker-compose.yaml

Lines changed: 51 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,51 @@
1+
services:
2+
user-db:
3+
hostname: userdb
4+
image: postgres:16.4
5+
container_name: user_db
6+
build:
7+
context: ./backend/user/src/lib/db
8+
environment:
9+
POSTGRES_DB: user
10+
POSTGRES_USER: express
11+
POSTGRES_PASSWORD: user
12+
PGDATA: "/data/user-db"
13+
volumes:
14+
- user-db-docker:/data/user-db
15+
ports:
16+
- 5431:5432
17+
collab-db:
18+
hostname: collabdb
19+
image: postgres:16.4
20+
container_name: collab_db
21+
build:
22+
context: ./backend/collaboration/src/lib/db
23+
environment:
24+
POSTGRES_DB: collab
25+
POSTGRES_USER: express
26+
POSTGRES_PASSWORD: collab
27+
PGDATA: "/data/collab-db"
28+
volumes:
29+
- collab-db-docker:/data/collab-db
30+
ports:
31+
- 5433:5432
32+
question-db:
33+
hostname: questiondb
34+
image: postgres:16.4
35+
container_name: question_db
36+
build:
37+
context: ./backend/question/src/lib/db
38+
environment:
39+
POSTGRES_DB: question
40+
POSTGRES_USER: express
41+
POSTGRES_PASSWORD: question
42+
PGDATA: "/data/question-db"
43+
volumes:
44+
- question-db-docker:/data/question-db
45+
ports:
46+
- 5434:5432
47+
48+
volumes:
49+
user-db-docker:
50+
collab-db-docker:
51+
question-db-docker:

k8s/collab-db-deployment.yaml

Lines changed: 44 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,44 @@
1+
apiVersion: apps/v1
2+
kind: Deployment
3+
metadata:
4+
labels:
5+
io.kompose.service: collab-db
6+
name: collab-db
7+
spec:
8+
replicas: 1
9+
selector:
10+
matchLabels:
11+
io.kompose.service: collab-db
12+
strategy:
13+
type: Recreate
14+
template:
15+
metadata:
16+
labels:
17+
io.kompose.network/code-default: "true"
18+
io.kompose.service: collab-db
19+
spec:
20+
containers:
21+
- env:
22+
- name: PGDATA
23+
value: /data/collab-db
24+
- name: POSTGRES_DB
25+
value: collab
26+
- name: POSTGRES_PASSWORD
27+
value: collab
28+
- name: POSTGRES_USER
29+
value: express
30+
image: postgres:16.4
31+
name: collab-db
32+
ports:
33+
- containerPort: 5432
34+
hostPort: 5433
35+
protocol: TCP
36+
volumeMounts:
37+
- mountPath: /data/collab-db
38+
name: collab-db-docker
39+
hostname: collabdb
40+
restartPolicy: Always
41+
volumes:
42+
- name: collab-db-docker
43+
persistentVolumeClaim:
44+
claimName: collab-db-docker
Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
apiVersion: v1
2+
kind: PersistentVolumeClaim
3+
metadata:
4+
labels:
5+
io.kompose.service: collab-db-docker
6+
name: collab-db-docker
7+
spec:
8+
accessModes:
9+
- ReadWriteOnce
10+
resources:
11+
requests:
12+
storage: 100Mi

k8s/collab-db-service.yaml

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
apiVersion: v1
2+
kind: Service
3+
metadata:
4+
labels:
5+
io.kompose.service: collab-db
6+
name: collab-db
7+
spec:
8+
ports:
9+
- name: "5433"
10+
port: 5433
11+
targetPort: 5432
12+
selector:
13+
io.kompose.service: collab-db

k8s/question-db-deployment.yaml

Lines changed: 44 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,44 @@
1+
apiVersion: apps/v1
2+
kind: Deployment
3+
metadata:
4+
labels:
5+
io.kompose.service: question-db
6+
name: question-db
7+
spec:
8+
replicas: 1
9+
selector:
10+
matchLabels:
11+
io.kompose.service: question-db
12+
strategy:
13+
type: Recreate
14+
template:
15+
metadata:
16+
labels:
17+
io.kompose.network/code-default: "true"
18+
io.kompose.service: question-db
19+
spec:
20+
containers:
21+
- env:
22+
- name: PGDATA
23+
value: /data/question-db
24+
- name: POSTGRES_DB
25+
value: question
26+
- name: POSTGRES_PASSWORD
27+
value: question
28+
- name: POSTGRES_USER
29+
value: express
30+
image: postgres:16.4
31+
name: question-db
32+
ports:
33+
- containerPort: 5432
34+
hostPort: 5434
35+
protocol: TCP
36+
volumeMounts:
37+
- mountPath: /data/question-db
38+
name: question-db-docker
39+
hostname: questiondb
40+
restartPolicy: Always
41+
volumes:
42+
- name: question-db-docker
43+
persistentVolumeClaim:
44+
claimName: question-db-docker
Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
apiVersion: v1
2+
kind: PersistentVolumeClaim
3+
metadata:
4+
labels:
5+
io.kompose.service: question-db-docker
6+
name: question-db-docker
7+
spec:
8+
accessModes:
9+
- ReadWriteOnce
10+
resources:
11+
requests:
12+
storage: 100Mi

k8s/question-db-service.yaml

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
apiVersion: v1
2+
kind: Service
3+
metadata:
4+
labels:
5+
io.kompose.service: question-db
6+
name: question-db
7+
spec:
8+
ports:
9+
- name: "5434"
10+
port: 5434
11+
targetPort: 5432
12+
selector:
13+
io.kompose.service: question-db

k8s/user-db-deployment.yaml

Lines changed: 44 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,44 @@
1+
apiVersion: apps/v1
2+
kind: Deployment
3+
metadata:
4+
labels:
5+
io.kompose.service: user-db
6+
name: user-db
7+
spec:
8+
replicas: 1
9+
selector:
10+
matchLabels:
11+
io.kompose.service: user-db
12+
strategy:
13+
type: Recreate
14+
template:
15+
metadata:
16+
labels:
17+
io.kompose.network/code-default: "true"
18+
io.kompose.service: user-db
19+
spec:
20+
containers:
21+
- env:
22+
- name: PGDATA
23+
value: /data/user-db
24+
- name: POSTGRES_DB
25+
value: user
26+
- name: POSTGRES_PASSWORD
27+
value: user
28+
- name: POSTGRES_USER
29+
value: express
30+
image: postgres:16.4
31+
name: user-db
32+
ports:
33+
- containerPort: 5432
34+
hostPort: 5431
35+
protocol: TCP
36+
volumeMounts:
37+
- mountPath: /data/user-db
38+
name: user-db-docker
39+
hostname: userdb
40+
restartPolicy: Always
41+
volumes:
42+
- name: user-db-docker
43+
persistentVolumeClaim:
44+
claimName: user-db-docker

0 commit comments

Comments
 (0)