diff --git a/.dockerignore b/.dockerignore index 76f3d7a..c0af9be 100644 --- a/.dockerignore +++ b/.dockerignore @@ -14,7 +14,6 @@ !requirements.txt !docker-entrypoint.sh !healthcheck.py -!monitor.py # VERIFICATION: Required files that MUST exist: # - src/simpleguardhome/__init__.py @@ -24,7 +23,6 @@ # - src/simpleguardhome/templates/index.html # - src/simpleguardhome/favicon.ico # - healthcheck.py -# - monitor.py # SAFETY: Never include these files even if allowed above **/__pycache__/ diff --git a/Dockerfile b/Dockerfile index 26b62bc..8ac89c2 100644 --- a/Dockerfile +++ b/Dockerfile @@ -14,7 +14,7 @@ COPY requirements.txt . RUN pip install --no-cache-dir -r requirements.txt # Copy source code -COPY src/simpleguardhome /app/src/simpleguardhome/ +COPY src/simpleguardhome /app/simpleguardhome/ # Set up health check COPY healthcheck.py /usr/local/bin/ @@ -24,8 +24,7 @@ HEALTHCHECK --interval=30s --timeout=10s --start-period=5s --retries=3 \ CMD python3 /usr/local/bin/healthcheck.py # Environment setup -ENV PYTHONPATH=/app/src \ - ADGUARD_HOST="http://localhost" \ +ENV ADGUARD_HOST="http://localhost" \ ADGUARD_PORT=3000 # Expose application port diff --git a/docker-entrypoint.sh b/docker-entrypoint.sh index ede9560..ec61f48 100644 --- a/docker-entrypoint.sh +++ b/docker-entrypoint.sh @@ -3,11 +3,5 @@ set -e echo "[$(date '+%Y-%m-%d %H:%M:%S')] Starting SimpleGuardHome..." -# Verify the package is importable -if ! python3 -c "from simpleguardhome.main import app"; then - echo "Error: Failed to import SimpleGuardHome package" - exit 1 -fi - # Start the application exec python3 -m uvicorn simpleguardhome.main:app --host 0.0.0.0 --port 8000 \ No newline at end of file