Skip to content

Commit e58fddf

Browse files
committed
Change the jinja template for automatic deployment should work
1 parent 7a81d4a commit e58fddf

File tree

2 files changed

+68
-11
lines changed

2 files changed

+68
-11
lines changed

ansible/deploy.yml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,11 @@
1919
src: ../docker-compose.yml.j2
2020
dest: "{{ project_dir }}/docker-compose.yml"
2121

22+
- name: Copy database setup script for microservices
23+
copy:
24+
src: ../database_setup_microservices.sql
25+
dest: "{{ project_dir }}/database_setup_microservices.sql"
26+
2227
- name: Copy Traefik configuration files
2328
copy:
2429
src: ../traefik/

docker-compose.yml.j2

Lines changed: 63 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -28,24 +28,74 @@ services:
2828
- "traefik.http.routers.client.tls.certresolver=myresolver"
2929
- "traefik.http.services.client.loadbalancer.server.port=80"
3030

31-
server:
32-
image: ghcr.io/aet-devops25/team-3/server:{{ image_tag }}
31+
auth-service:
32+
image: ghcr.io/aet-devops25/team-3/auth-service:{{ image_tag }}
3333
restart: unless-stopped
3434
networks:
3535
- proxy
3636
labels:
3737
- "traefik.enable=true"
38-
- "traefik.http.routers.server.rule=Host(`studymate-tum.xyz`) && PathPrefix(`/api`)"
39-
- "traefik.http.routers.server.entrypoints=websecure"
40-
- "traefik.http.routers.server.tls.certresolver=myresolver"
41-
- "traefik.http.services.server.loadbalancer.server.port=8082"
42-
environment: # TODO: replace values with an env variables & secrets
43-
- SPRING_DATASOURCE_URL=jdbc:postgresql://postgres:5432/mydb
38+
- "traefik.http.routers.auth.rule=Host(`studymate-tum.xyz`) && PathPrefix(`/api/auth`)"
39+
- "traefik.http.routers.auth.entrypoints=websecure"
40+
- "traefik.http.routers.auth.tls.certresolver=myresolver"
41+
- "traefik.http.routers.auth.priority=100"
42+
- "traefik.http.services.auth.loadbalancer.server.port=8083"
43+
environment:
44+
- SPRING_DATASOURCE_URL=jdbc:postgresql://postgres:5432/auth_db
4445
- SPRING_DATASOURCE_USERNAME=postgres
45-
- SPRING_DATASOURCE_PASSWORD=placeholder
46+
- SPRING_DATASOURCE_PASSWORD=postgres
4647
depends_on:
4748
- postgres
48-
- weaviate
49+
50+
document-service:
51+
image: ghcr.io/aet-devops25/team-3/document-service:{{ image_tag }}
52+
restart: unless-stopped
53+
networks:
54+
- proxy
55+
labels:
56+
- "traefik.enable=true"
57+
- "traefik.http.routers.document.rule=Host(`studymate-tum.xyz`) && PathPrefix(`/api/documents`)"
58+
- "traefik.http.routers.document.entrypoints=websecure"
59+
- "traefik.http.routers.document.tls.certresolver=myresolver"
60+
- "traefik.http.routers.document.priority=100"
61+
- "traefik.http.services.document.loadbalancer.server.port=8084"
62+
environment:
63+
- SPRING_DATASOURCE_URL=jdbc:postgresql://postgres:5432/document_db
64+
- SPRING_DATASOURCE_USERNAME=postgres
65+
- SPRING_DATASOURCE_PASSWORD=postgres
66+
depends_on:
67+
- postgres
68+
69+
genai-service:
70+
image: ghcr.io/aet-devops25/team-3/genai-service:{{ image_tag }}
71+
restart: unless-stopped
72+
networks:
73+
- proxy
74+
labels:
75+
- "traefik.enable=true"
76+
- "traefik.http.routers.genai-service.rule=Host(`studymate-tum.xyz`) && PathPrefix(`/api/genai`)"
77+
- "traefik.http.routers.genai-service.entrypoints=websecure"
78+
- "traefik.http.routers.genai-service.tls.certresolver=myresolver"
79+
- "traefik.http.routers.genai-service.priority=100"
80+
- "traefik.http.services.genai-service.loadbalancer.server.port=8085"
81+
environment:
82+
- GENAI_BACKEND_URL=http://genai:8081
83+
- DOCUMENT_SERVICE_URL=http://document-service:8084
84+
depends_on:
85+
- genai
86+
87+
eureka-server:
88+
image: ghcr.io/aet-devops25/team-3/eureka-server:{{ image_tag }}
89+
restart: unless-stopped
90+
networks:
91+
- proxy
92+
labels:
93+
- "traefik.enable=true"
94+
- "traefik.http.routers.eureka.rule=Host(`studymate-tum.xyz`) && PathPrefix(`/eureka`)"
95+
- "traefik.http.routers.eureka.entrypoints=websecure"
96+
- "traefik.http.routers.eureka.tls.certresolver=myresolver"
97+
- "traefik.http.routers.eureka.priority=100"
98+
- "traefik.http.services.eureka.loadbalancer.server.port=8761"
4999

50100
genai:
51101
image: ghcr.io/aet-devops25/team-3/genai:{{ image_tag }}
@@ -77,9 +127,11 @@ services:
77127
environment: # TODO: replace values with an env variables & secrets
78128
POSTGRES_USER: postgres
79129
POSTGRES_PASSWORD: postgres
80-
POSTGRES_DB: mydb
130+
POSTGRES_DB: postgres
131+
POSTGRES_MULTIPLE_DATABASES: auth_db,document_db
81132
volumes:
82133
- pgdata:/var/lib/postgresql/data
134+
- ./database_setup_microservices.sql:/docker-entrypoint-initdb.d/database_setup_microservices.sql
83135
networks:
84136
- proxy
85137

0 commit comments

Comments
 (0)