niginx adjustments

Author: hsandmann

docs/hands-on/7/docker/index.md

@@ -7,7 +7,7 @@ Two changes are needed in `compose.yaml`: add the `nginx` service as the new ent
     image: nginx:alpine
     hostname: nginx
     ports:
-      - 80:80
+      - 8080:80
     volumes:
       - $SETUP/nginx/nginx.conf:/etc/nginx/nginx.conf:ro
     depends_on:
@@ -24,7 +24,7 @@ SETUP=./setup
 
 Remove the `ports` mapping from the `gateway` service and add a `deploy` block to set the replica count:
 
-``` { .yaml .copy .select title="compose.yaml" hl_lines="5 6 7" }
+``` { .yaml .copy .select title="compose.yaml" hl_lines="5" }
   gateway:
     build:
       context: ./gateway-service
@@ -40,79 +40,3 @@ Remove the `ports` mapping from the `gateway` service and add a `deploy` block t
 !!! warning "Remove the `hostname` field from gateway"
 
     If the `gateway` service had a `hostname: gateway` entry, remove it. Docker Compose cannot assign the same hostname to multiple containers — the field is silently ignored when `replicas > 1`. The DNS service name `gateway` continues to work correctly for internal communication.
-
-## Full `compose.yaml`
-
-The complete file after all changes:
-
-``` { .yaml .copy .select linenums="1" title="compose.yaml" }
-name: store
-
-services:
-
-  db:
-    image: postgres:17
-    hostname: db
-    ports:
-      - 5432:5432
-    volumes:
-      - ${VOLUME_DB}:/var/lib/postgresql/data
-    environment:
-      POSTGRES_USER: ${DB_USER:-store}
-      POSTGRES_PASSWORD: ${DB_PASSWORD:-devpass}
-      POSTGRES_DB: ${DB_NAME:-store}
-
-  account:
-    build:
-      context: ./account-service
-      dockerfile: Dockerfile
-    hostname: account
-    environment:
-      DATABASE_HOST: db
-      DATABASE_PORT: 5432
-      DATABASE_DB: ${DB_NAME:-store}
-      DATABASE_USERNAME: ${DB_USER:-store}
-      DATABASE_PASSWORD: ${DB_PASSWORD:-devpass}
-    deploy:
-      replicas: 2
-    depends_on:
-      - db
-
-  auth:
-    build:
-      context: ./auth-service
-      dockerfile: Dockerfile
-    hostname: auth
-    environment:
-      DATABASE_HOST: db
-      DATABASE_PORT: 5432
-      DATABASE_DB: ${DB_NAME:-store}
-      DATABASE_USERNAME: ${DB_USER:-store}
-      DATABASE_PASSWORD: ${DB_PASSWORD:-devpass}
-    depends_on:
-      - db
-
-  gateway:
-    build:
-      context: ./gateway-service
-      dockerfile: Dockerfile
-    deploy:
-      replicas: 3
-    depends_on:
-      - account
-      - auth
-
-  nginx:
-    image: nginx:alpine
-    hostname: nginx
-    ports:
-      - 80:80
-    volumes:
-      - $SETUP/nginx/nginx.conf:/etc/nginx/nginx.conf:ro
-    depends_on:
-      - gateway
-```
-
-!!! info "Port mapping change"
-
-    The platform now listens on **port 80** instead of 8080. All API calls, Prometheus scrape targets, and test scripts must be updated accordingly: `http://localhost/gateway/...` instead of `http://localhost:8080/gateway/...`.

docs/hands-on/7/nginx/index.md

@@ -3,34 +3,14 @@ Nginx is configured as an [HTTP reverse proxy](https://nginx.org/en/docs/http/ng
 Create the file `setup/nginx/nginx.conf`:
 
 ``` { .nginx .copy .select linenums="1" title="nginx.conf" }
-events {}
-
-http {
-
-    upstream gateway_cluster {
-        least_conn;
-        server gateway:8080;
-    }
-
-    server {
-        listen 80;
-
-        location / {
-            proxy_pass         http://gateway_cluster;
-            proxy_set_header   Host              $host;
-            proxy_set_header   X-Real-IP         $remote_addr;
-            proxy_set_header   X-Forwarded-For   $proxy_add_x_forwarded_for;
-            proxy_set_header   X-Forwarded-Proto $scheme;
-        }
-    }
-}
+--8<-- "docs/hands-on/7/nginx/nginx.conf"
 ```
 
 Key directives:
 
 | Directive | Purpose |
 |---|---|
-| `upstream gateway_cluster` | Names a pool of backend servers. Docker DNS expands `gateway:8080` to all replica IPs at startup. |
+| `upstream gateways` | Names a pool of backend servers. Docker DNS expands `gateway:8080` to all replica IPs at startup. |
 | `least_conn` | Load balancing algorithm: each new request goes to the replica with the fewest active connections. |
 | `proxy_pass` | Forwards the matched request to the upstream pool. |
 | `X-Real-IP` | Passes the original client IP address to the backend service. |

docs/hands-on/7/nginx/nginx.conf

@@ -0,0 +1,18 @@
+http {
+
+    upstream gateways {
+        server gateway:8080;
+    }
+
+    server {
+        listen 80;
+
+        location / {
+            proxy_pass         http://gateways;
+            proxy_set_header   Host              $host;
+            proxy_set_header   X-Real-IP         $remote_addr;
+            proxy_set_header   X-Forwarded-For   $proxy_add_x_forwarded_for;
+            proxy_set_header   X-Forwarded-Proto $scheme;
+        }
+    }
+}