- Renamed docker compose service app to api

- Added CORS config.

Author: mcqueide

compose-dev.yaml

@@ -5,11 +5,12 @@ services:
     restart: always
     user: postgres
     secrets:
+      - db-user
       - db-password
     volumes:
       - db-data:/var/lib/postgresql/data
     env_file:
-      - ./db/.env
+      - .env
     ports:
       - "5432:5432"
     healthcheck:
@@ -32,7 +33,7 @@ services:
       SPRING_PROFILES_ACTIVE: docker
       MAVEN_OPTS: -agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=*:5005
     env_file:
-      - ./app/.env
+      - .env
     ports:
       - "8080:8080"
       - "5005:5005"
@@ -50,4 +51,6 @@ volumes:
   db-data:
 secrets:
   db-password:
-    file: db/password.txt
+    file: secrets/db-password.txt
+  db-user:
+    file: ./secrets/db-user.txt

compose.yaml

@@ -188,7 +188,7 @@ services:
 
     # Dependencies
     depends_on:
-      app:
+      api:
         condition: service_started  # Changed from service_healthy because it doesn't work properly with multiple replicas
 
     # Healthcheck
@@ -227,7 +227,7 @@ services:
   # ==========================================================================
   # SPRING-BOOT APPLICATION
   # ==========================================================================
-  app:
+  api:
     build:
       context: .
       dockerfile: Dockerfile
@@ -251,6 +251,10 @@ services:
     networks:
       - backend
 
+    # Ports: DO NOT expose externally in production
+    # ports:
+    #   - "8080:8080"  # ❌ For debug only, remove in production
+
     # Ports (not externally exposed, only through nginx)
     expose:
       - "8080"
@@ -305,10 +309,10 @@ services:
 
     # Labels
     labels:
-      service: "app"
+      service: "api"
       tier: "backend"
       environment: "${ENVIRONMENT:-production}"
-      version: "${APP_VERSION:-1.0.0}"
+      version: "${API_VERSION:-1.0.0}"
 
   # ==========================================================================
   # POSTGRESQL - Database

nginx/nginx.conf

@@ -85,7 +85,7 @@ http {
         # 3 replicas of the app service
         # Docker Compose automatically creates DNS round-robin for "app"
         # but defining it explicitly gives better control
-        server app:8080 max_fails=3 fail_timeout=30s weight=1;
+        server api:8080 max_fails=3 fail_timeout=30s weight=1;
 
         # NOTE: With deploy.replicas=2, Docker resolves "app" to the 2 instances
         # via internal DNS round-robin. Each request to "app:8080"

src/main/java/com/mcqueide/dockertest/infrastructure/config/CorsConfig.java

@@ -0,0 +1,38 @@
+package com.mcqueide.dockertest.infrastructure.config;
+
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.web.cors.CorsConfiguration;
+import org.springframework.web.cors.CorsConfigurationSource;
+import org.springframework.web.cors.UrlBasedCorsConfigurationSource;
+import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
+
+import java.util.Arrays;
+import java.util.List;
+
+@Configuration
+public class CorsConfig {
+
+    @Value("${cors.allowed-origins}")
+    private String allowedOrigins;
+
+    @Value("${cors.allow-credentials}")
+    private boolean allowCredentials;
+
+    @Bean
+    public WebMvcConfigurer corsConfigurer() {
+        return new WebMvcConfigurer() {
+            @Override
+            public void addCorsMappings(org.springframework.web.servlet.config.annotation.CorsRegistry registry) {
+                registry.addMapping("/**")
+                        .allowedOrigins(allowedOrigins.split(","))
+                        .allowedMethods("GET", "POST", "PUT", "DELETE", "OPTIONS", "PATCH")
+                        .allowedHeaders("*")
+                        .allowCredentials(allowCredentials)
+                        .maxAge(3600);
+            }
+        };
+    }
+
+}

src/main/resources/application.yml

@@ -1,28 +1,54 @@
 spring:
   application:
     name: people-api
+  
   datasource:
-    url: jdbc:postgresql://localhost:5432/people
-    username: people
-    password: people
+    url: ${SPRING_DATASOURCE_URL:jdbc:postgresql://localhost:5432/people}
+    username: ${SPRING_DATASOURCE_USERNAME:people}
+    password: ${SPRING_DATASOURCE_PASSWORD:people}
+  
   jpa:
     hibernate:
       ddl-auto: validate
+    show-sql: false
     properties:
       hibernate.format_sql: true
       hibernate.jdbc.time_zone: UTC
+
   flyway:
     enabled: true
     locations: classpath:db/migration
 
+# CORS Configuration
+cors:
+  allowed-origins: ${CORS_ALLOWED_ORIGINS:http://localhost:3000,http://localhost:4200}
+  allowcredentials: ${CORS_ALLOWCREDENTIALS:true}
+
+# Server Configuration
+server:
+  port: 8080
+  error:
+    include-message: always
+    include-binding-errors: always
+
+# Actuator Configuration
 management:
   endpoints:
     web:
       exposure:
-        include: '*'
+        include: health,info,metrics
+      base-path: /actuator
+  endpoint:
+    health:
+      show-details: always
 
-server:
-  port: 8080
+# API Documentation
+springdoc:
+  api-docs:
+    path: /api-docs
+  swagger-ui:
+    path: /swagger-ui.html
+    operations-sorter: method
 
 ---