Refactor Docker setup: streamline Dockerfile, remove redundant files, and enhance scripts for clarity and functionality

.dockerignore

@@ -21,7 +21,7 @@ wheels/
 *.egg
 
 # Virtual environments
-.venv
+.venv/
 venv/
 ENV/
 env/
@@ -52,25 +52,23 @@ tests/
 .coverage
 htmlcov/
 
-# Documentation
-docs/
-*.md
-!README.md
-
 # Git
 .git/
 .gitignore
 
-# Docker
-Dockerfile
-docker-compose*.yml
-.dockerignore
+# Redundant Docker files (removed)
+# scripts/ removed from ignore list - they're useful for deployment
 
-# Environment files
+# Environment files (keep .env.example)
 .env
 .env.local
 .env.*.local
 
 # Temporary files
 *.tmp
-*.temp
+*.temp
+
+# Documentation (except README.md)
+docs/
+*.md
+!README.md

Dockerfile

@@ -7,8 +7,10 @@ ENV PYTHONUNBUFFERED=1 \
     POETRY_VERSION=1.7.1 \
     POETRY_HOME="/opt/poetry" \
     POETRY_VIRTUALENVS_IN_PROJECT=true \
-    POETRY_NO_INTERACTION=1 \
-    PATH="$POETRY_HOME/bin:$PATH"
+    POETRY_NO_INTERACTION=1
+
+# Add Poetry to PATH
+ENV PATH="$POETRY_HOME/bin:$PATH"
 
 # Install system dependencies
 RUN apt-get update \
@@ -23,8 +25,8 @@ RUN curl -sSL https://install.python-poetry.org | python3 -
 # Set work directory
 WORKDIR /app
 
-# Copy Poetry files with explicit file listing
-COPY ["pyproject.toml", "poetry.lock", "./"]
+# Copy project files (poetry files first for better layer caching)
+COPY pyproject.toml poetry.lock ./
 
 # Install Python dependencies
 RUN poetry install --only=main --no-dev

Dockerfile.alt

@@ -1,45 +0,0 @@
-# Alternative Dockerfile - copy all files first
-FROM python:3.11-slim
-
-# Set environment variables
-ENV PYTHONUNBUFFERED=1 \
-    PYTHONDONTWRITEBYTECODE=1 \
-    POETRY_VERSION=1.7.1 \
-    POETRY_HOME="/opt/poetry" \
-    POETRY_VIRTUALENVS_IN_PROJECT=true \
-    POETRY_NO_INTERACTION=1 \
-    PATH="$POETRY_HOME/bin:$PATH"
-
-# Install system dependencies
-RUN apt-get update \
-    && apt-get install -y --no-install-recommends \
-        curl \
-        build-essential \
-    && rm -rf /var/lib/apt/lists/*
-
-# Install Poetry
-RUN curl -sSL https://install.python-poetry.org | python3 -
-
-# Set work directory
-WORKDIR /app
-
-# Copy all project files
-COPY . .
-
-# Install Python dependencies
-RUN poetry install --only=main --no-dev
-
-# Create non-root user
-RUN useradd --create-home --shell /bin/bash app \
-    && chown -R app:app /app
-USER app
-
-# Expose port
-EXPOSE 8000
-
-# Health check
-HEALTHCHECK --interval=30s --timeout=30s --start-period=5s --retries=3 \
-    CMD curl -f http://localhost:8000/health || exit 1
-
-# Run the application
-CMD ["poetry", "run", "uvicorn", "app.main:app", "--host", "0.0.0.0", "--port", "8000"]

Dockerfile.dev

@@ -1,41 +0,0 @@
-# Development Dockerfile with hot reloading
-FROM python:3.11-slim
-
-# Set environment variables
-ENV PYTHONUNBUFFERED=1 \
-    PYTHONDONTWRITEBYTECODE=1 \
-    POETRY_VERSION=1.7.1 \
-    POETRY_HOME="/opt/poetry" \
-    POETRY_VIRTUALENVS_IN_PROJECT=true \
-    POETRY_NO_INTERACTION=1 \
-    PATH="$POETRY_HOME/bin:$PATH"
-
-# Install system dependencies
-RUN apt-get update \
-    && apt-get install -y --no-install-recommends \
-        curl \
-        build-essential \
-    && rm -rf /var/lib/apt/lists/*
-
-# Install Poetry
-RUN curl -sSL https://install.python-poetry.org | python3 -
-
-# Set work directory
-WORKDIR /app
-
-# Copy Poetry files with explicit file listing
-COPY ["pyproject.toml", "poetry.lock", "./"]
-
-# Install all dependencies (including dev)
-RUN poetry install
-
-# Create non-root user
-RUN useradd --create-home --shell /bin/bash app \
-    && chown -R app:app /app
-USER app
-
-# Expose port
-EXPOSE 8000
-
-# Run the application with reload
-CMD ["poetry", "run", "uvicorn", "app.main:app", "--host", "0.0.0.0", "--port", "8000", "--reload"]

docker-compose.dev.yml

@@ -1,24 +0,0 @@
-version: '3.8'
-
-services:
-  multiutility-server:
-    build:
-      context: .
-      dockerfile: Dockerfile.dev
-    ports:
-      - "8000:8000"
-    environment:
-      - LOG_LEVEL=DEBUG
-      - RELOAD=true
-    env_file:
-      - .env
-    volumes:
-      - .:/app
-      - ./logs:/app/logs
-    restart: unless-stopped
-    healthcheck:
-      test: ["CMD", "curl", "-f", "http://localhost:8000/health"]
-      interval: 30s
-      timeout: 10s
-      retries: 3
-      start_period: 40s

docker-compose.prod.yml

@@ -1,32 +0,0 @@
-version: '3.8'
-
-services:
-  multiutility-server:
-    build:
-      context: .
-      dockerfile: Dockerfile
-    ports:
-      - "8000:8000"
-    environment:
-      - LOG_LEVEL=INFO
-      - RELOAD=false
-    env_file:
-      - .env
-    volumes:
-      - ./logs:/app/logs
-    restart: unless-stopped
-    healthcheck:
-      test: ["CMD", "curl", "-f", "http://localhost:8000/health"]
-      interval: 30s
-      timeout: 10s
-      retries: 3
-      start_period: 40s
-    # Production optimizations
-    deploy:
-      resources:
-        limits:
-          cpus: '1.0'
-          memory: 1G
-        reservations:
-          cpus: '0.5'
-          memory: 512M

docker-compose.yml

@@ -18,4 +18,13 @@ services:
       interval: 30s
       timeout: 10s
       retries: 3
-      start_period: 40s
+      start_period: 40s
+    # Production optimizations
+    deploy:
+      resources:
+        limits:
+          cpus: '1.0'
+          memory: 1G
+        reservations:
+          cpus: '0.5'
+          memory: 512M

scripts/run_docker.bat

@@ -2,6 +2,9 @@
 echo Building and running Multi-Utility Server with Docker...
 echo.
 
+REM Change to project root directory
+cd /d "%~dp0\.."
+
 REM Check if .env file exists
 if not exist .env (
     echo Warning: .env file not found. Copying from .env.example...

scripts/run_docker.sh

@@ -3,6 +3,9 @@
 echo "Building and running Multi-Utility Server with Docker..."
 echo
 
+# Change to project root directory
+cd "$(dirname "$0")/.."
+
 # Check if .env file exists
 if [ ! -f .env ]; then
     echo "Warning: .env file not found. Copying from .env.example..."

troubleshoot_docker.bat

@@ -1,39 +0,0 @@
-@echo off
-echo Docker Build Troubleshooting Script
-echo ===================================
-echo.
-
-echo Checking for required files...
-echo.
-
-if exist "pyproject.toml" (
-    echo ✓ pyproject.toml found
-) else (
-    echo ✗ pyproject.toml not found
-)
-
-if exist "poetry.lock" (
-    echo ✓ poetry.lock found
-) else (
-    echo ✗ poetry.lock not found
-)
-
-if exist "Dockerfile" (
-    echo ✓ Dockerfile found
-) else (
-    echo ✗ Dockerfile not found
-)
-
-echo.
-echo File sizes:
-for %%f in (pyproject.toml poetry.lock Dockerfile) do if exist "%%f" echo %%f: %%~zf bytes
-
-echo.
-echo Attempting Docker build...
-echo.
-
-docker build -t multiutility-server .
-
-echo.
-echo Build completed. Check output above for any errors.
-pause

troubleshoot_docker.sh

@@ -1,44 +0,0 @@
-#!/bin/bash
-
-echo "Docker Build Troubleshooting Script"
-echo "==================================="
-echo
-
-echo "Checking for required files..."
-echo
-
-if [ -f "pyproject.toml" ]; then
-    echo "✓ pyproject.toml found"
-else
-    echo "✗ pyproject.toml not found"
-fi
-
-if [ -f "poetry.lock" ]; then
-    echo "✓ poetry.lock found"
-else
-    echo "✗ poetry.lock not found"
-fi
-
-if [ -f "Dockerfile" ]; then
-    echo "✓ Dockerfile found"
-else
-    echo "✗ Dockerfile not found"
-fi
-
-echo
-echo "File sizes:"
-for file in pyproject.toml poetry.lock Dockerfile; do
-    if [ -f "$file" ]; then
-        size=$(stat -f%z "$file" 2>/dev/null || stat -c%s "$file" 2>/dev/null || echo "unknown")
-        echo "$file: $size bytes"
-    fi
-done
-
-echo
-echo "Attempting Docker build..."
-echo
-
-docker build -t multiutility-server .
-
-echo
-echo "Build completed. Check output above for any errors."