Refactor Dockerfile to integrate supervisord for managing Weaviate and Nginx services, replace start.sh with supervisord configuration, and enhance Nginx settings for improved proxy handling. Remove obsolete start.sh script.

Dockerfile

@@ -1,51 +1,72 @@
 FROM cr.weaviate.io/semitechnologies/weaviate:1.30.0
 
+# Install Nginx and other utilities
+RUN apt-get update && \
+    apt-get install -y nginx supervisor socat && \
+    apt-get clean && \
+    rm -rf /var/lib/apt/lists/*
+
+# Environment variables
 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 \
-    HTTP_PORT=8080
-
-# Install Nginx and required tools
-RUN apt-get update && \
-    apt-get install -y nginx gettext-base && \
-    apt-get clean && \
-    rm -rf /var/lib/apt/lists/*
-
-# Create Nginx configuration
-RUN echo 'server {\n\
-    listen 7860 http2;\n\
-    server_name localhost;\n\
-\n\
-    # HTTP API traffic\n\
-    location / {\n\
-        proxy_pass http://localhost:8080;\n\
-        proxy_set_header Host $host;\n\
-        proxy_set_header X-Real-IP $remote_addr;\n\
-    }\n\
-\n\
-    # gRPC traffic\n\
-    location /weaviate.Weaviate/ {\n\
-        grpc_pass grpc://localhost:50051;\n\
-    }\n\
-}' > /etc/nginx/conf.d/weaviate.conf
-
-# Remove default Nginx site
-RUN rm /etc/nginx/sites-enabled/default
-
-EXPOSE 7860
+    GRPC_PORT=50051
 
 # 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
 VOLUME ["/var/lib/weaviate"]
 
-# Start script to run both services
-COPY start.sh /start.sh
-RUN chmod +x /start.sh
+# Expose the main port
+EXPOSE 7860 
 
-CMD ["/start.sh"]
+# Run all services using supervisord
+CMD ["/usr/bin/supervisord", "-c", "/etc/supervisor/conf.d/supervisord.conf"]

README.md

@@ -9,3 +9,28 @@ app_port: 7860
 ---
 
 Check out the configuration reference at https://huggingface.co/docs/hub/spaces-config-reference
+
+# Weaviate with Nginx Proxy
+
+This Dockerfile sets up a container with both Weaviate and Nginx. Weaviate runs internally on ports 8080 (HTTP) and 50051 (gRPC), while Nginx forwards external requests from port 7860 to these internal ports.
+
+## Build the Image
+
+```bash
+docker build -t weaviate-nginx .
+```
+
+## Run the Container
+
+```bash
+docker run -d -p 7860:7860 -v weaviate_data:/var/lib/weaviate --name weaviate-container weaviate-nginx
+```
+
+## Accessing Weaviate
+
+- Access the Weaviate HTTP API at: http://localhost:7860
+- The gRPC port is also accessible at port 7860
+
+## Persistent Data
+
+The container uses a Docker volume named `weaviate_data` to persist the Weaviate database.

grpc_proxy.sh

@@ -0,0 +1,3 @@
+#!/bin/bash
+# Simple TCP forwarding for gRPC from port 7860 to 50051
+socat TCP-LISTEN:7860,fork,reuseaddr TCP:localhost:50051 

nginx.conf

@@ -0,0 +1,26 @@
+events {
+    worker_connections 1024;
+}
+
+http {
+    server {
+        listen 7860;
+        
+        # HTTP API proxy
+        location / {
+            proxy_pass http://weaviate: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;
+        }
+    }
+}
+
+stream {
+    # gRPC proxy
+    server {
+        listen 7861;
+        proxy_pass weaviate:50051;
+    }
+} 

start.sh

@@ -1,10 +0,0 @@
-#!/bin/bash
-
-# Start Weaviate in the background
-/bin/weaviate --host 0.0.0.0 --port $HTTP_PORT --scheme http &
-
-# Give Weaviate a moment to start
-sleep 5
-
-# Start Nginx in the foreground
-nginx -g 'daemon off;'