Refactor Dockerfile and Nginx configuration to streamline service management. Remove supervisord integration, update CMD to directly start Weaviate and Nginx, and enhance Nginx settings for improved HTTP and gRPC handling.

Dockerfile

@@ -1,72 +1,29 @@
+# Base image with Weaviate
 FROM cr.weaviate.io/semitechnologies/weaviate:1.30.0
 
-# Install Nginx and other utilities
+# Install nginx with grpc support
 RUN apt-get update && \
-    apt-get install -y nginx supervisor socat && \
-    apt-get clean && \
-    rm -rf /var/lib/apt/lists/*
+    apt-get install -y nginx && \
+    apt-get clean
 
-# Environment variables
+# Weaviate config
 ENV QUERY_DEFAULTS_LIMIT=25 \
     AUTHENTICATION_ANONYMOUS_ACCESS_ENABLED=true \
     PERSISTENCE_DATA_PATH=/var/lib/weaviate \
     ENABLE_API_BASED_MODULES=true \
-    CLUSTER_HOSTNAME=node1 \
-    GRPC_PORT=50051
+    CLUSTER_HOSTNAME=node1
 
-# Create data directory with proper permissions
-RUN mkdir -p /var/lib/weaviate && \
-    chmod 777 /var/lib/weaviate
-
-# Copy the gRPC proxy script
-COPY grpc_proxy.sh /usr/local/bin/
-RUN chmod +x /usr/local/bin/grpc_proxy.sh
-
-# Nginx configuration
-RUN echo 'events { worker_connections 1024; }' > /etc/nginx/nginx.conf && \
-    echo 'http { \
-    server { \
-        listen 7860; \
-        location / { \
-            proxy_pass http://localhost:8080; \
-            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; \
-        } \
-    } \
-}' >> /etc/nginx/nginx.conf
-
-# Configure supervisord to run all services
-RUN echo '[supervisord]\n\
-nodaemon=true\n\
-\n\
-[program:weaviate]\n\
-command=/bin/weaviate --host 0.0.0.0 --port 8080 --scheme http\n\
-stdout_logfile=/dev/stdout\n\
-stdout_logfile_maxbytes=0\n\
-stderr_logfile=/dev/stderr\n\
-stderr_logfile_maxbytes=0\n\
-\n\
-[program:nginx]\n\
-command=/usr/sbin/nginx -g "daemon off;"\n\
-stdout_logfile=/dev/stdout\n\
-stdout_logfile_maxbytes=0\n\
-stderr_logfile=/dev/stderr\n\
-stderr_logfile_maxbytes=0\n\
-\n\
-[program:grpc_proxy]\n\
-command=/usr/local/bin/grpc_proxy.sh\n\
-stdout_logfile=/dev/stdout\n\
-stdout_logfile_maxbytes=0\n\
-stderr_logfile=/dev/stderr\n\
-stderr_logfile_maxbytes=0' > /etc/supervisor/conf.d/supervisord.conf
-
-# Create volume for persistent data
+# Create data dir
+RUN mkdir -p /var/lib/weaviate && chmod 777 /var/lib/weaviate
 VOLUME ["/var/lib/weaviate"]
 
-# Expose the main port
-EXPOSE 7860 
+# Add NGINX config
+COPY nginx.conf /etc/nginx/nginx.conf
+
+# Expose only 7860 (used by nginx)
+EXPOSE 7860
 
-# Run all services using supervisord
-CMD ["/usr/bin/supervisord", "-c", "/etc/supervisor/conf.d/supervisord.conf"]
+# Start script
+CMD ["sh", "-c", "\
+    /bin/weaviate --host 127.0.0.1 --port 7860 --scheme http & \
+    nginx -g 'daemon off;'"]

nginx.conf

@@ -1,26 +1,42 @@
+worker_processes 1;
+
 events {
     worker_connections 1024;
 }
 
 http {
+    include       mime.types;
+    default_type  application/octet-stream;
+
+    sendfile        on;
+
+    upstream weaviate_http {
+        server 127.0.0.1:7860;
+    }
+
+    upstream weaviate_grpc {
+        server 127.0.0.1:50051;
+    }
+
     server {
-        listen 7860;
-        
-        # HTTP API proxy
-        location / {
-            proxy_pass http://weaviate:8080;
+        listen 7860 http2;
+
+        location /v1/ {
+            proxy_pass http://weaviate_http;
             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;
         }
-    }
-}
 
-stream {
-    # gRPC proxy
-    server {
-        listen 7861;
-        proxy_pass weaviate:50051;
+        location / {
+            grpc_pass grpc://weaviate_grpc;
+            error_page 502 = /error502grpc;
+        }
+
+        location = /error502grpc {
+            internal;
+            default_type application/grpc;
+            add_header grpc-status 14;
+            add_header grpc-message "unavailable";
+            return 204;
+        }
     }
-} 
+}