chore: nginx docker server created & port forwarding command updated

Author: DataRohit

.env

@@ -29,4 +29,4 @@ MINIO_STORAGE_ENDPOINT="minio:9000"
 MINIO_ACCESS_KEY="Fwdk7y1ofPFl8m9Ar8E7"
 MINIO_SECRET_KEY="nlbLuKtZPCuzMQck0Q2fdqfWe2mdimCLQNrewzL0"
 
-DOMAIN="localhost:8000"
+DOMAIN="localhost:8080"

.envs/.backend.env

@@ -29,4 +29,4 @@ MINIO_STORAGE_ENDPOINT="minio:9000"
 MINIO_ACCESS_KEY="Fwdk7y1ofPFl8m9Ar8E7"
 MINIO_SECRET_KEY="nlbLuKtZPCuzMQck0Q2fdqfWe2mdimCLQNrewzL0"
 
-DOMAIN="localhost:8000"
+DOMAIN="localhost:8080"

compose/nginx/Dockerfile

@@ -0,0 +1,3 @@
+FROM docker.io/nginx:1.27.0-alpine
+
+COPY ./compose/nginx/default.conf /etc/nginx/conf.d/default.conf

compose/nginx/default.conf

@@ -0,0 +1,62 @@
+# Define an upstream server group named 'backend' for the application backend
+upstream backend {
+    server backend:8000;  # Application backend address and port
+}
+
+# Define an upstream server group named 'minio' for the MinIO server
+upstream minio {
+    server minio:9000;  # MinIO server address and port
+}
+
+server {
+    listen 80;  # Listen on port 80 for incoming HTTP requests
+    server_name bookly;  # Add this line to match the hostname used in the SSH tunnel
+    client_max_body_size 20M;  # Set maximum allowed client request body size to 20MB
+
+    error_log /var/log/nginx/error.log error;  # Main error log file
+
+    # Set proxy headers to pass client request information to the backend servers
+    proxy_set_header Host $http_host;  # Changed from $host to $http_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;
+
+    proxy_http_version 1.1; # Use HTTP/1.1 for proxy connections
+    proxy_buffering off; # Disable proxy buffering
+
+    # WebSocket support
+    proxy_set_header Upgrade $http_upgrade;
+    proxy_set_header Connection "upgrade";
+
+    # Location block for the API
+    location /api/v1/ {
+        proxy_pass http://backend/api/v1/;  # Proxy requests to the application backend
+        access_log /var/log/nginx/backend_access.log;  # Access log file for the API
+        error_log /var/log/nginx/backend_error.log error;  # Error log file for the API
+    }
+
+    # Location block for the swagger schema
+    location /swagger/schema/ {
+        proxy_pass http://backend/api/v1/openapi.json;  # Proxy requests to the application backend
+        access_log /var/log/nginx/swagger_access.log;  # Access log file for the swagger schema
+    }
+
+    # Location block for the swagger documentation
+    location /swagger/redoc/ {
+        proxy_pass http://backend/api/v1/redoc/;  # Proxy requests to the application backend
+        access_log /var/log/nginx/swagger_access.log;  # Access log file for the swagger documentation
+    }
+
+    # Location block for the swagger documentation
+    location /swagger/docs/ {
+        proxy_pass http://backend/api/v1/docs/;  # Proxy requests to the application backend
+        access_log /var/log/nginx/swagger_access.log;  # Access log file for the swagger documentation
+    }
+
+    # Location block for MinIO storage
+    location /minio/storage/bookly/ {
+        proxy_pass http://minio/bookly/;  # Proxy requests to the MinIO server
+        access_log /var/log/nginx/minio_access.log;  # Access log file for MinIO
+        error_log /var/log/nginx/minio_error.log error;  # Error log file for MinIO
+    }
+}

docker-compose.yml

@@ -5,8 +5,6 @@ services:
       dockerfile: ./compose/backend/Dockerfile
     image: backend:latest
     container_name: backend
-    ports:
-      - "8000:8000"
     volumes:
       - .:/app:z
     env_file:
@@ -51,8 +49,6 @@ services:
   redis:
     image: redis:6
     container_name: redis
-    ports:
-      - "6379:6379"
     volumes:
       - redis_data:/data
     networks:
@@ -94,7 +90,6 @@ services:
     container_name: minio
     ports:
       - "9090:9090"
-      - "9000:9000"
     volumes:
       - minio_data:/data
     env_file:
@@ -103,6 +98,22 @@ services:
     networks:
       - backend_network
 
+  nginx:
+    build:
+      context: .
+      dockerfile: ./compose/nginx/Dockerfile
+    image: nginx:latest
+    container_name: nginx
+    ports:
+      - "8080:80"
+    depends_on:
+      - backend
+      - minio
+    volumes:
+      - nginx_data:/var/log/nginx
+    networks:
+      - backend_network
+
 networks:
   backend_network:
     driver: bridge
@@ -112,3 +123,4 @@ volumes:
   mailpit_data:
   redis_data:
   minio_data:
+  nginx_data:

makefile

@@ -54,7 +54,7 @@ list-deps: $(VENV_DIR)
 
 # Port forwarding command
 port-forward:
-	ssh -R bookly:80:localhost:8000 serveo.net
+	ssh -R bookly:80:localhost:8080 serveo.net
 
 # Group Alembic related commands
 alembic-commands: upgrade-db downgrade-db create-migration

pkg/middleware.py

@@ -32,16 +32,12 @@ async def custom_logging(request: Request, call_next):
 
     app.add_middleware(
         TrustedHostMiddleware,
-        allowed_hosts=[
-            "localhost",
-            "127.0.0.1",
-            "0.0.0.0",
-        ],
+        allowed_hosts=["bookly.serveo.net", "localhost"],
     )
 
     app.add_middleware(
         CORSMiddleware,
-        allow_origins=["*"],
+        allow_origins=["bookly.serveo.net", "localhost"],
         allow_methods=["*"],
         allow_headers=["Content-Type", "Authorization"],
         allow_credentials=True,

readme.md

@@ -24,13 +24,20 @@ Bookly is an innovative online platform designed for book lovers to connect and
 - **Token Blacklisting:** Ensures that tokens are invalidated after logout or expiration.
 - **Celery Integration for Background Tasks:** For sending emails and clearing expired tokens and logs.
 
+### Profile
+
+- **Auto User Profile Creation**: User profile is created on user verification.
+- **User Profile Update**: Users can update their profile information.
+- **Avatar Image Upload**: Users can upload and image through form data to be used as avatar image.
+
 ## Technologies Used
 
 - **Backend Framework:** FastAPI
 - **Database:** PostgreSQL
 - **Asynchronous ORM:** SQLModel
 - **Task Queue:** Celery
 - **Broker:** Redis
+- **Storage:** MinIO
 - **Other Libraries:** Pydantic, Alembic, etc.
 
 ## Installation
@@ -77,6 +84,11 @@ This command will build the necessary services and start the application, includ
 - **Reset Password:** `POST /auth/reset-password/{password_reset_token}`
 - **Get Logged-in User:** `GET /auth/me`
 
+### Profile Endpoints
+
+- **Update Profile:** `PATCH /profile/update-profile`
+- **Update Avatar Image**: `PATCH /profile/update-avatar`
+
 ## API Documentation
 
 You can find the full API documentation at `http://localhost:8000/api/v1/docs`, generated using Swagger UI.

src/profile/routes.py

@@ -73,7 +73,7 @@ async def update_user_avatar(
         avatar_image.content_type,
     )
 
-    file_url = f"http://{Config.MINIO_STORAGE_ENDPOINT}/{Config.MINIO_STORAGE_BUCKET}/{avatar_image_file_name}"
+    file_url = f"http://{Config.DOMAIN}/minio/storage/{Config.MINIO_STORAGE_BUCKET}/{avatar_image_file_name}"
     await user_profile_service.update_user_profile_avatar(
         user_profile, file_url, session
     )