Fix Dockerfiles for Microservices

Author: Walid Baroudi

.env.dev

@@ -27,3 +27,6 @@ LANGSMITH_PROJECT=studymate
 # Grafana
 GF_SECURITY_ADMIN_USER=admin
 GF_SECURITY_ADMIN_PASSWORD=admin
+
+# Client
+VITE_API_BASE_URL=http://localhost:8083

client/src/lib/api.ts

@@ -1,6 +1,5 @@
 // API service for communicating with the microservices backend
-const API_BASE_URL = (import.meta as any).env?.VITE_API_BASE_URL || 
-  (typeof window !== 'undefined' ? window.location.origin : 'http://localhost');
+const API_BASE_URL = (import.meta as any).env?.VITE_API_BASE_URL || 'http://localhost:8099';
 
 // Common status type used throughout the application  
 // Aligned with backend DocumentStatus enum - backend uses PROCESSED as final ready state

docker-compose.dev.yml

@@ -5,6 +5,7 @@ services:
       dockerfile: Dockerfile
     ports:
       - "3000:80"
+    env_file: .env.dev
     depends_on:
       - auth-service
     networks:
@@ -18,6 +19,10 @@ services:
       - "8083:8083"
     restart: unless-stopped
     env_file: .env.dev
+    depends_on:
+      - postgres
+    networks:
+      - dev-network
 
   document-service:
     build:
@@ -27,6 +32,10 @@ services:
       - "8084:8084"
     restart: unless-stopped
     env_file: .env.dev
+    depends_on:
+      - postgres
+    networks:
+      - dev-network
 
   genai-service:
     build:
@@ -38,6 +47,8 @@ services:
     env_file: .env.dev
     depends_on:
       - genai
+    networks:
+      - dev-network
 
   genai:
     build:
@@ -49,6 +60,8 @@ services:
     env_file: .env.dev
     depends_on:
       - weaviate
+    networks:
+      - dev-network
 
   postgres:
     image: postgres:15

docker-compose.yml.j2

@@ -21,6 +21,8 @@ services:
     restart: unless-stopped
     networks:
       - proxy
+    environment:
+      - VITE_API_BASE_URL=https://studymate-tum.xyz
     labels:
       - "traefik.enable=true"
       - "traefik.http.routers.client.rule=Host(`studymate-tum.xyz`)"
@@ -42,7 +44,7 @@ services:
       - "traefik.http.services.auth.loadbalancer.server.port=8083"
     environment:
       - SPRING_DATASOURCE_URL=jdbc:postgresql://postgres:5432/auth_db
-      - SPRING_DATASOURCE_USERNAME=postgres
+      - SPRING_DATASOURCE_USERNAME=postgres # TODO: replace with env variable
       - SPRING_DATASOURCE_PASSWORD=postgres
     depends_on:
       - postgres

server/auth-service/Dockerfile

@@ -7,12 +7,15 @@ WORKDIR /app
 COPY gradlew .
 COPY gradle gradle/
 COPY build.gradle.kts .
+COPY settings.gradle.kts .
 
 # Copy source code
 COPY src src/
 
-# Make gradlew executable and build the application
-RUN chmod +x gradlew && ./gradlew build -x test --no-daemon
+# Fix line endings, make executable, and build
+RUN sed -i 's/\r$//' gradlew && \
+    chmod +x gradlew && \
+    ./gradlew build -x test --no-daemon
 
 # Runtime stage
 FROM eclipse-temurin:21-jre

server/auth-service/settings.gradle.kts

@@ -0,0 +1 @@
+rootProject.name = "auth-service"

server/auth-service/src/main/kotlin/de/tum/cit/aet/auth/config/SecurityConfig.kt

@@ -16,17 +16,14 @@ import org.springframework.security.core.userdetails.UsernameNotFoundException
 import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder
 import org.springframework.security.crypto.password.PasswordEncoder
 import org.springframework.security.web.SecurityFilterChain
-import org.springframework.security.web.authentication.UsernamePasswordAuthenticationFilter
 import org.springframework.web.cors.CorsConfiguration
 import org.springframework.web.cors.CorsConfigurationSource
 import org.springframework.web.cors.UrlBasedCorsConfigurationSource
 
 @Configuration
 @EnableWebSecurity
 @EnableMethodSecurity
-class SecurityConfig(
-    private val jwtAuthenticationFilter: JwtAuthenticationFilter
-) {
+class SecurityConfig {
 
     @Bean
     fun securityFilterChain(http: HttpSecurity, authenticationProvider: AuthenticationProvider): SecurityFilterChain {
@@ -42,7 +39,6 @@ class SecurityConfig(
                 session.sessionCreationPolicy(SessionCreationPolicy.STATELESS)
             }
             .authenticationProvider(authenticationProvider)
-            .addFilterBefore(jwtAuthenticationFilter, UsernamePasswordAuthenticationFilter::class.java)
 
         return http.build()
     }

server/auth-service/src/main/resources/application.properties

@@ -2,9 +2,9 @@
 server.port=8083
 
 # Database configuration
-spring.datasource.url=jdbc:postgresql://postgres:5432/auth_db
-spring.datasource.username=postgres
-spring.datasource.password=postgres
+spring.datasource.url=${SPRING_DATASOURCE_URL_AUTH:jdbc:postgresql://localhost:5432/auth_db}
+spring.datasource.username=${SPRING_DATASOURCE_USERNAME:postgres}
+spring.datasource.password=${SPRING_DATASOURCE_PASSWORD:postgres}
 spring.datasource.driver-class-name=org.postgresql.Driver
 
 # JPA configuration

server/document-service/Dockerfile

@@ -7,12 +7,15 @@ WORKDIR /app
 COPY gradlew .
 COPY gradle gradle/
 COPY build.gradle.kts .
+COPY settings.gradle.kts .
 
 # Copy source code
 COPY src src/
 
-# Make gradlew executable and build the application
-RUN chmod +x gradlew && ./gradlew build -x test --no-daemon
+# Fix line endings, make executable, and build
+RUN sed -i 's/\r$//' gradlew && \
+    chmod +x gradlew && \
+    ./gradlew build -x test --no-daemon
 
 # Runtime stage
 FROM eclipse-temurin:21-jre

server/document-service/settings.gradle.kts

@@ -0,0 +1 @@
+rootProject.name = "document-service"