Add nginx container

Author: MagnusSletten

docker-compose.yml

@@ -33,4 +33,14 @@ services:
       REDIS_PORT: "6379"
       RABBITMQ_HOST: rabbitmq
       RABBITMQ_PORT: "5672"
+
+  nginx:
+    depends_on:
+     - pollservice
+    build: 
+      context: .
+      dockerfile: docker/nginx.dockerfile
+    ports:
+      - "8081:80"
+    container_name: polling-nginx
 

docker/nginx.dockerfile

@@ -0,0 +1,11 @@
+FROM nginx:alpine
+
+WORKDIR /app
+
+COPY src/frontend/my-app/dist /var/www/polling/
+
+COPY nginx/config.conf /etc/nginx/conf.d/default.conf
+
+EXPOSE 80
+
+

documentation/component-architecture.puml

@@ -2,7 +2,7 @@
 
 node "External\nClients" as mu
 node "PollService" {
-node "Nginx" as nginx
+component "Nginx" as nginx
 component "Web UI\n(React)" as ui
 interface HTTP
 component "REST API\n(Spring Web MVC)" as api

nginx/config.conf

@@ -0,0 +1,25 @@
+server { 
+ listen 80;
+ server_name frontend;
+ location = /polling  {return 302 /polling/;
+ }
+
+
+location ^~ /polling/ {
+    root /var/www;                        
+    index index.html;
+    try_files $uri $uri/ /polling/index.html;  
+  }
+ 
+location ^~ /polling/backend/ {
+    proxy_pass http://pollservice:8080; 
+    proxy_set_header Host $host;
+    proxy_set_header X-Real-IP $remote_addr;
+    proxy_set_header X-Forwarded-Proto $scheme;
+    proxy_set_header X-Forwarded-Host $host;
+    proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+}
+
+}
+
+

src/main/java/com/example/backend/Security/SecurityConfig.java

@@ -89,7 +89,7 @@ SecurityFilterChain filterChain(HttpSecurity http) throws Exception {
 @Bean
 CorsConfigurationSource corsConfigurationSource() {
   var cfg = new CorsConfiguration();
-  cfg.setAllowedOrigins(List.of("http://localhost:5173", "https://magnus-demo-project.com"));
+  cfg.setAllowedOrigins(List.of("http://localhost:5173", "https://magnus-demo-project.com","http://localhost","http://localhost:8081" ));
   cfg.setAllowedMethods(List.of("GET","POST","PUT","PATCH","DELETE","OPTIONS"));
   cfg.setAllowedHeaders(List.of("Content-Type","X-XSRF-TOKEN","Authorization","X-Requested-With"));
   cfg.setAllowCredentials(true);