Spaces:

gauthamnairy
/

GeoToolsHub

Build error

App Files Files Community

gauthamnairy commited on Mar 22, 2025

Commit

6f37e07

verified ·

1 Parent(s): bd539db

Update Dockerfile

Browse files

Files changed (1) hide show

Dockerfile +77 -20

Dockerfile CHANGED Viewed

@@ -1,6 +1,6 @@
 FROM python:3.9-slim
-WORKDIR /code
 # Install nginx
 RUN apt-get update && apt-get install -y nginx && rm -rf /var/lib/apt/lists/*
@@ -14,7 +14,10 @@ RUN mkdir -p /tmp/nginx/client_body \
              && chmod -R 777 /tmp/nginx
 # Copy the entire project first
-COPY . /code
 # Install dependencies - try both possible locations for requirements.txt
 RUN if [ -f "requirements.txt" ]; then \
@@ -29,7 +32,7 @@ RUN if [ -f "requirements.txt" ]; then \
 # Need to make sure we listen on port 7860 (Hugging Face Spaces requirement)
 ENV PORT=7860
-# Create a complete nginx configuration that doesn't require root
 RUN echo 'worker_processes auto;\n\
 pid /tmp/nginx.pid;\n\
 \n\
@@ -43,7 +46,7 @@ http {\n\
 \n\
     # Redirect logs to stdout/stderr\n\
     access_log /dev/stdout;\n\
-    error_log /dev/stderr;\n\
 \n\
     # Set up paths that do not require root access\n\
     client_body_temp_path /tmp/nginx/client_body;\n\
@@ -57,25 +60,44 @@ http {\n\
     tcp_nodelay on;\n\
     keepalive_timeout 65;\n\
     types_hash_max_size 2048;\n\
 \n\
     server {\n\
-        listen 7860;\n\
-        server_name localhost;\n\
 \n\
         location / {\n\
-            root /code/frontend;\n\
             index index.html;\n\
-            try_files $uri $uri/ =404;\n\
         }\n\
 \n\
         location /frontend/ {\n\
-            alias /code/frontend/;\n\
         }\n\
 \n\
         location /static/ {\n\
-            alias /code/frontend/static/;\n\
         }\n\
 \n\
         location /api/ {\n\
             proxy_pass http://localhost:8000/api/;\n\
             proxy_set_header Host $host;\n\
@@ -86,27 +108,62 @@ http {\n\
     }\n\
 }' > /etc/nginx/nginx.conf
 # Create a script to run both the API and Nginx
 RUN echo '#!/bin/bash\n\
-echo "Directory structure:"\n\
-find /code -type d | sort\n\
-echo "\nHTML files:"\n\
-find /code -name "*.html" | sort\n\
-echo "\nCSS files:"\n\
-find /code -name "*.css" | sort\n\
-echo "\nStarting API server..."\n\
-cd /code\n\
 if [ -f "backend/main.py" ]; then\n\
     python -m uvicorn backend.main:app --host 0.0.0.0 --port 8000 &\n\
 else\n\
     python -m uvicorn main:app --host 0.0.0.0 --port 8000 &\n\
 fi\n\
 echo "Starting Nginx..."\n\
 nginx -g "daemon off;"\n\
-' > /code/start.sh && chmod +x /code/start.sh
 # Expose port 7860 (required for Hugging Face Spaces)
 EXPOSE 7860
 # Run the combined services
-CMD ["/code/start.sh"]

 FROM python:3.9-slim
+WORKDIR /app
 # Install nginx
 RUN apt-get update && apt-get install -y nginx && rm -rf /var/lib/apt/lists/*
              && chmod -R 777 /tmp/nginx
 # Copy the entire project first
+COPY . /app
+# Ensure correct permissions for the frontend files
+RUN chmod -R 755 /app/frontend
 # Install dependencies - try both possible locations for requirements.txt
 RUN if [ -f "requirements.txt" ]; then \
 # Need to make sure we listen on port 7860 (Hugging Face Spaces requirement)
 ENV PORT=7860
+# Create a complete nginx configuration with better error handling
 RUN echo 'worker_processes auto;\n\
 pid /tmp/nginx.pid;\n\
 \n\
 \n\
     # Redirect logs to stdout/stderr\n\
     access_log /dev/stdout;\n\
+    error_log /dev/stderr info;\n\
 \n\
     # Set up paths that do not require root access\n\
     client_body_temp_path /tmp/nginx/client_body;\n\
     tcp_nodelay on;\n\
     keepalive_timeout 65;\n\
     types_hash_max_size 2048;\n\
+\n\
+    # Disable directory listings\n\
+    autoindex off;\n\
 \n\
     server {\n\
+        listen 7860 default_server;\n\
+        server_name _;\n\
+\n\
+        # Improved error handling\n\
+        error_page 403 404 /404.html;\n\
 \n\
+        # Create a custom 404 page\n\
+        location = /404.html {\n\
+            add_header Content-Type text/html;\n\
+            return 200 "<html><head><title>GeoTools Hub - Page Not Found</title></head><body style=\"font-family: Arial, sans-serif; color: #333; text-align: center; padding: 50px;\"><h1>Page Not Found</h1><p>Sorry, the page you are looking for does not exist.</p><p><a href=\"/\">Return to Home</a></p></body></html>";\n\
+        }\n\
+\n\
+        # Root location serving frontend\n\
         location / {\n\
+            root /app/frontend;\n\
             index index.html;\n\
+            try_files $uri $uri/ /index.html =404;\n\
         }\n\
 \n\
+        # Explicit frontend folder location\n\
         location /frontend/ {\n\
+            alias /app/frontend/;\n\
+            autoindex off;\n\
         }\n\
 \n\
+        # Static files location\n\
         location /static/ {\n\
+            alias /app/frontend/static/;\n\
+            autoindex off;\n\
+            add_header Cache-Control "public, max-age=3600";\n\
         }\n\
 \n\
+        # API endpoint proxying\n\
         location /api/ {\n\
             proxy_pass http://localhost:8000/api/;\n\
             proxy_set_header Host $host;\n\
     }\n\
 }' > /etc/nginx/nginx.conf
+# Create a debug index.html file to ensure we have something to serve
+RUN echo '<!DOCTYPE html>\n\
+<html lang="en">\n\
+<head>\n\
+    <meta charset="UTF-8">\n\
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">\n\
+    <title>GeoTools Hub</title>\n\
+    <style>\n\
+        body { font-family: Arial, sans-serif; margin: 0; padding: 0; background-color: #f4f6f9; }\n\
+        .container { max-width: 800px; margin: 0 auto; padding: 2rem; }\n\
+        h1 { color: #3b82f6; text-align: center; }\n\
+        p { color: #333; line-height: 1.6; }\n\
+        .card { background: white; border-radius: 8px; padding: 1.5rem; margin: 1rem 0; box-shadow: 0 2px 4px rgba(0,0,0,0.1); }\n\
+    </style>\n\
+</head>\n\
+<body>\n\
+    <div class="container">\n\
+        <h1>GeoTools Hub</h1>\n\
+        <div class="card">\n\
+            <p>This is a fallback page created by the Docker container.</p>\n\
+            <p>If you see this page, it means the nginx server is working, but your original frontend files might not be accessible.</p>\n\
+            <p>Check the container logs for more information.</p>\n\
+        </div>\n\
+    </div>\n\
+</body>\n\
+</html>' > /app/frontend/index.html.fallback
 # Create a script to run both the API and Nginx
 RUN echo '#!/bin/bash\n\
+echo "Container directory structure:"\n\
+find /app -type f -name "*.html" | sort\n\
+\n\
+# Check if frontend/index.html exists, if not use fallback\n\
+if [ ! -f "/app/frontend/index.html" ]; then\n\
+    echo "WARNING: index.html not found, using fallback page"\n\
+    cp /app/frontend/index.html.fallback /app/frontend/index.html\n\
+fi\n\
+\n\
+# Check file permissions\n\
+echo "File permissions in frontend:"\n\
+ls -la /app/frontend\n\
+\n\
+echo "Starting API server..."\n\
+cd /app\n\
 if [ -f "backend/main.py" ]; then\n\
     python -m uvicorn backend.main:app --host 0.0.0.0 --port 8000 &\n\
 else\n\
     python -m uvicorn main:app --host 0.0.0.0 --port 8000 &\n\
 fi\n\
+\n\
 echo "Starting Nginx..."\n\
 nginx -g "daemon off;"\n\
+' > /app/start.sh && chmod +x /app/start.sh
 # Expose port 7860 (required for Hugging Face Spaces)
 EXPOSE 7860
 # Run the combined services
+CMD ["/app/start.sh"]