Spaces:
Paused
Paused
Use simpler Dockerfile without venv
Browse files- Dockerfile +46 -69
Dockerfile
CHANGED
|
@@ -1,92 +1,69 @@
|
|
| 1 |
-
FROM
|
| 2 |
|
| 3 |
-
# Install
|
| 4 |
RUN apt-get update && apt-get install -y \
|
| 5 |
-
|
| 6 |
-
|
| 7 |
-
python3.11-venv \
|
| 8 |
git \
|
| 9 |
build-essential \
|
| 10 |
curl \
|
| 11 |
&& rm -rf /var/lib/apt/lists/*
|
| 12 |
|
| 13 |
-
#
|
|
|
|
|
|
|
|
|
|
| 14 |
RUN useradd -m -u 1000 user
|
| 15 |
USER user
|
| 16 |
ENV HOME=/home/user \
|
| 17 |
PATH=/home/user/.local/bin:$PATH
|
| 18 |
|
| 19 |
-
# Set working directory
|
| 20 |
WORKDIR $HOME/app
|
| 21 |
|
| 22 |
-
# Copy
|
| 23 |
-
COPY --chown=user embedding_api.py
|
| 24 |
-
COPY --chown=user requirements_embedding.txt
|
| 25 |
-
COPY --chown=user hono-proxy
|
| 26 |
-
|
| 27 |
-
# Create Python virtual environment
|
| 28 |
-
RUN python3.11 -m venv $HOME/venv
|
| 29 |
-
ENV PATH="$HOME/venv/bin:$PATH"
|
| 30 |
|
| 31 |
-
# Install Python dependencies
|
| 32 |
-
RUN pip install --
|
| 33 |
-
pip install -r requirements_embedding.txt || \
|
| 34 |
-
(echo "Failed to install Python dependencies" && exit 1)
|
| 35 |
|
| 36 |
-
# Install
|
| 37 |
-
RUN npm install -g pnpm
|
| 38 |
WORKDIR $HOME/app/hono-proxy
|
| 39 |
-
RUN pnpm install
|
| 40 |
|
| 41 |
-
#
|
| 42 |
-
RUN mkdir -p $HOME/.vespa/il-infra.colpali-server.default
|
| 43 |
-
|
| 44 |
|
| 45 |
-
# Create
|
| 46 |
WORKDIR $HOME/app
|
| 47 |
-
RUN echo '#!/bin/bash' > start
|
| 48 |
-
echo '
|
| 49 |
-
echo '' >> start
|
| 50 |
-
echo 'echo "
|
| 51 |
-
echo '
|
| 52 |
-
echo '
|
| 53 |
-
echo '' >> start
|
| 54 |
-
echo '
|
| 55 |
-
echo 'echo "
|
| 56 |
-
echo '
|
| 57 |
-
echo '
|
| 58 |
-
echo '' >> start
|
| 59 |
-
echo '
|
| 60 |
-
echo '
|
| 61 |
-
echo 'if
|
| 62 |
-
echo ' echo "
|
| 63 |
-
echo '
|
| 64 |
-
echo '
|
| 65 |
-
echo 'fi' >> start
|
| 66 |
-
echo '' >> start
|
| 67 |
-
echo '#
|
| 68 |
-
echo '
|
| 69 |
-
echo '' >> start
|
| 70 |
-
|
| 71 |
-
echo 'echo "Starting Hono proxy on port 7860..."' >> start-backend.sh && \
|
| 72 |
-
echo 'cd hono-proxy' >> start-backend.sh && \
|
| 73 |
-
echo 'export PORT=7860' >> start-backend.sh && \
|
| 74 |
-
echo 'export CORS_ORIGIN="*"' >> start-backend.sh && \
|
| 75 |
-
echo 'export EMBEDDING_API_URL="http://localhost:8001"' >> start-backend.sh && \
|
| 76 |
-
echo 'export VESPA_ENDPOINT="${VESPA_ENDPOINT:-https://f5acf536.ed2ceb09.z.vespa-app.cloud}"' >> start-backend.sh && \
|
| 77 |
-
echo 'npx tsx src/index.ts 2>&1 | tee ../hono.log' >> start-backend.sh && \
|
| 78 |
-
echo '' >> start-backend.sh && \
|
| 79 |
-
echo '# If we get here, Hono exited' >> start-backend.sh && \
|
| 80 |
-
echo 'echo "Hono proxy exited, killing embedding service..."' >> start-backend.sh && \
|
| 81 |
-
echo 'kill $EMBED_PID 2>/dev/null || true' >> start-backend.sh && \
|
| 82 |
-
chmod +x start-backend.sh
|
| 83 |
-
|
| 84 |
-
# Add health check
|
| 85 |
-
HEALTHCHECK --interval=30s --timeout=30s --start-period=5s --retries=3 \
|
| 86 |
-
CMD curl -f http://localhost:7860/api/health || exit 1
|
| 87 |
|
| 88 |
-
# Expose HF Spaces port
|
| 89 |
EXPOSE 7860
|
| 90 |
|
| 91 |
-
|
| 92 |
-
CMD ["bash", "-c", "./start-backend.sh || (echo 'Startup failed, showing logs:' && cat *.log 2>/dev/null && exit 1)"]
|
|
|
|
| 1 |
+
FROM python:3.11-slim
|
| 2 |
|
| 3 |
+
# Install system dependencies
|
| 4 |
RUN apt-get update && apt-get install -y \
|
| 5 |
+
nodejs \
|
| 6 |
+
npm \
|
|
|
|
| 7 |
git \
|
| 8 |
build-essential \
|
| 9 |
curl \
|
| 10 |
&& rm -rf /var/lib/apt/lists/*
|
| 11 |
|
| 12 |
+
# Install pnpm globally
|
| 13 |
+
RUN npm install -g pnpm
|
| 14 |
+
|
| 15 |
+
# Create user for HF Spaces
|
| 16 |
RUN useradd -m -u 1000 user
|
| 17 |
USER user
|
| 18 |
ENV HOME=/home/user \
|
| 19 |
PATH=/home/user/.local/bin:$PATH
|
| 20 |
|
|
|
|
| 21 |
WORKDIR $HOME/app
|
| 22 |
|
| 23 |
+
# Copy files
|
| 24 |
+
COPY --chown=user embedding_api.py .
|
| 25 |
+
COPY --chown=user requirements_embedding.txt .
|
| 26 |
+
COPY --chown=user hono-proxy ./hono-proxy
|
| 27 |
+
COPY --chown=user vespa-certs ./vespa-certs
|
|
|
|
|
|
|
|
|
|
| 28 |
|
| 29 |
+
# Install Python dependencies
|
| 30 |
+
RUN pip install --user --no-cache-dir -r requirements_embedding.txt
|
|
|
|
|
|
|
| 31 |
|
| 32 |
+
# Install Node dependencies
|
|
|
|
| 33 |
WORKDIR $HOME/app/hono-proxy
|
| 34 |
+
RUN pnpm install
|
| 35 |
|
| 36 |
+
# Setup Vespa certificates
|
| 37 |
+
RUN mkdir -p $HOME/.vespa/il-infra.colpali-server.default && \
|
| 38 |
+
cp ../vespa-certs/* $HOME/.vespa/il-infra.colpali-server.default/
|
| 39 |
|
| 40 |
+
# Create startup script
|
| 41 |
WORKDIR $HOME/app
|
| 42 |
+
RUN echo '#!/bin/bash' > start.sh && \
|
| 43 |
+
echo 'echo "Starting services..."' >> start.sh && \
|
| 44 |
+
echo 'echo "Python version: $(python --version)"' >> start.sh && \
|
| 45 |
+
echo 'echo "Node version: $(node --version)"' >> start.sh && \
|
| 46 |
+
echo '' >> start.sh && \
|
| 47 |
+
echo '# Start embedding API' >> start.sh && \
|
| 48 |
+
echo 'python embedding_api.py &' >> start.sh && \
|
| 49 |
+
echo 'EMBED_PID=$!' >> start.sh && \
|
| 50 |
+
echo 'echo "Started embedding API with PID: $EMBED_PID"' >> start.sh && \
|
| 51 |
+
echo '' >> start.sh && \
|
| 52 |
+
echo '# Wait for embedding API' >> start.sh && \
|
| 53 |
+
echo 'sleep 5' >> start.sh && \
|
| 54 |
+
echo '' >> start.sh && \
|
| 55 |
+
echo '# Check if embedding API is running' >> start.sh && \
|
| 56 |
+
echo 'if curl -f http://localhost:8001/health; then' >> start.sh && \
|
| 57 |
+
echo ' echo "Embedding API is healthy"' >> start.sh && \
|
| 58 |
+
echo 'else' >> start.sh && \
|
| 59 |
+
echo ' echo "Embedding API health check failed"' >> start.sh && \
|
| 60 |
+
echo 'fi' >> start.sh && \
|
| 61 |
+
echo '' >> start.sh && \
|
| 62 |
+
echo '# Start Hono proxy' >> start.sh && \
|
| 63 |
+
echo 'cd hono-proxy' >> start.sh && \
|
| 64 |
+
echo 'PORT=7860 CORS_ORIGIN="*" EMBEDDING_API_URL="http://localhost:8001" VESPA_ENDPOINT="https://f5acf536.ed2ceb09.z.vespa-app.cloud" npx tsx src/index.ts' >> start.sh && \
|
| 65 |
+
chmod +x start.sh
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 66 |
|
|
|
|
| 67 |
EXPOSE 7860
|
| 68 |
|
| 69 |
+
CMD ["./start.sh"]
|
|
|