Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
89 changes: 0 additions & 89 deletions deployment/debug/compose.yml

This file was deleted.

16 changes: 8 additions & 8 deletions deployment/docker/compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,19 +2,19 @@
# It defines the services, their images, build context, and ports.

services:
gateway-service:
meetatmensa-gateway:
build: ../../server/gateway
container_name: meetatmensa-gateway
ports:
- "8080:80"
depends_on:
- matching-service
- user-service
- genai-service
- meetatmensa-matching
- meetatmensa-user
- meetatmensa-genai
networks:
- backend

matching-service:
meetatmensa-matching:
build: ../../server/matching
container_name: meetatmensa-matching
expose:
Expand All @@ -24,7 +24,7 @@ services:
networks:
- backend

user-service:
meetatmensa-user:
build: ../../server/user
container_name: meetatmensa-user
expose:
Expand All @@ -34,15 +34,15 @@ services:
networks:
- backend

genai-service:
meetatmensa-genai:
build: ../../server/genai
container_name: meetatmensa-genai
expose:
- "80"
networks:
- backend

client-service:
meetatmensa-client:
build:
context: ../../client
args:
Expand Down
6 changes: 3 additions & 3 deletions server/gateway/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,13 +7,13 @@ Implementation details to follow.
## Local Deployment with Docker
```
# Build and tag the Docker image
docker build -t ghcr.io/aet-devops25/team-devoops/server/gateway .
docker build -t ghcr.io/aet-devops25/team-devoops/gateway .

# Push the image to GHCR (latest tag by default, access needed)
docker push ghcr.io/aet-devops25/team-devoops/server/gateway
docker push ghcr.io/aet-devops25/team-devoops/gateway

# Run the Docker container on port 8080
docker run --name gateway-service -p 8080:80 ghcr.io/aet-devops25/team-devoops/server/gateway
docker run --name gateway-service -p 8080:80 ghcr.io/aet-devops25/team-devoops/gateway

# List running containers (if needed)
docker ps
Expand Down
13 changes: 1 addition & 12 deletions server/gateway/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -17,19 +17,8 @@ repositories {
mavenCentral()
}

// ext {
// set('springCloudVersion', "2024.0.1")
// }

// dependencyManagement {
// imports {
// mavenBom "org.springframework.cloud:spring-cloud-dependencies:${springCloudVersion}"
// }
// }

dependencies {
implementation 'org.openapitools:openapi-spring-gateway'
implementation 'org.openapitools.client:openapi-client-gateway'
implementation 'org.springframework.cloud:spring-cloud-starter-gateway:4.3.0'
testImplementation 'org.springframework.boot:spring-boot-starter-test'
testImplementation 'io.projectreactor:reactor-test'
testRuntimeOnly 'org.junit.platform:junit-platform-launcher'
Expand Down
4 changes: 2 additions & 2 deletions server/gateway/src/main/resources/application.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,12 +10,12 @@ spring:
- id: matching_route
uri: http://meetatmensa-matching:80
predicates:
- Path=/matching/**
- Path=/api/v2/matching/**

- id: user_route
uri: http://meetatmensa-user:80
predicates:
- Path=/user/**
- Path=/api/v2/user/**

- id: genai_route
uri: http://meetatmensa-genai:80
Expand Down