refactor: fusionne Honcho + OpenConcho dans un seul container nginx/FastAPI
- Honcho (FastAPI) et OpenConcho (React SPA) dans un seul Dockerfile multi-stage - nginx proxy /v3/ /v2/ /health /openapi.json vers Honcho sur localhost:8000 - Supprime le service openconcho séparé et le dossier orphelin - Routeur Traefik unique à honcho.lazyworkhorse.net (port 80 — nginx) - Plus besoin d'exposer Honcho séparément (API accessible via nginx proxy)
This commit is contained in:
@@ -1,6 +1,5 @@
|
||||
# build stage — fetches and builds Honcho from source
|
||||
# Using buildkit cache mounts for speed across rebuilds
|
||||
FROM python:3.13-slim-bookworm AS builder
|
||||
FROM python:3.13-slim-bookworm AS honcho-builder
|
||||
|
||||
RUN apt-get update && \
|
||||
apt-get install -y --no-install-recommends git && \
|
||||
@@ -8,7 +7,6 @@ RUN apt-get update && \
|
||||
|
||||
COPY --from=ghcr.io/astral-sh/uv:0.9.24 /uv /bin/uv
|
||||
|
||||
# Clone Honcho at a pinned commit for reproducibility
|
||||
ARG HONCHO_REPO=https://github.com/plastic-labs/honcho
|
||||
ARG HONCHO_REF=main
|
||||
RUN git clone --depth 1 --branch ${HONCHO_REF} ${HONCHO_REPO} /app
|
||||
@@ -21,21 +19,51 @@ ENV UV_PYTHON=/usr/local/bin/python3.13
|
||||
|
||||
RUN uv sync --frozen
|
||||
|
||||
# --- runtime stage ---
|
||||
# build stage — builds OpenConcho SPA
|
||||
FROM node:22-bookworm AS openconcho-builder
|
||||
|
||||
ENV PNPM_HOME=/pnpm
|
||||
ENV PATH=$PNPM_HOME:$PATH
|
||||
RUN corepack enable && corepack prepare pnpm@latest --activate
|
||||
|
||||
WORKDIR /app
|
||||
RUN apt-get update && apt-get install -y git && rm -rf /var/lib/apt/lists/*
|
||||
|
||||
ARG OPENCONCHO_SHA=e490d911fcb27ee193558fd9a28856cde2057665
|
||||
RUN git clone --depth 1 https://github.com/offendingcommit/openconcho.git /app && \
|
||||
git -C /app fetch --depth 1 origin ${OPENCONCHO_SHA} && \
|
||||
git -C /app checkout ${OPENCONCHO_SHA}
|
||||
|
||||
RUN pnpm install --frozen-lockfile
|
||||
RUN pnpm --filter @openconcho/web build
|
||||
|
||||
# runtime stage — nginx + Honcho FastAPI
|
||||
FROM python:3.13-slim-bookworm
|
||||
|
||||
RUN groupadd --system app && \
|
||||
useradd --system --gid app --create-home app
|
||||
|
||||
COPY --from=builder /app /app
|
||||
RUN apt-get update && apt-get install -y --no-install-recommends nginx && \
|
||||
rm -rf /var/log/nginx/* && \
|
||||
rm -rf /var/lib/apt/lists/*
|
||||
|
||||
# Honcho
|
||||
COPY --from=honcho-builder /app /app
|
||||
WORKDIR /app
|
||||
ENV PATH="/app/.venv/bin:$PATH"
|
||||
ENV HOME=/app
|
||||
COPY config.toml /app/config.toml
|
||||
|
||||
COPY --chown=app:app config.toml /app/config.toml
|
||||
# OpenConcho SPA
|
||||
COPY --from=openconcho-builder /app/packages/web/dist /usr/share/nginx/html
|
||||
|
||||
# nginx config (proxies /v3/, /v2/ to Honcho on localhost:8000)
|
||||
COPY honcho-nginx.conf /etc/nginx/conf.d/default.conf
|
||||
RUN rm -f /etc/nginx/sites-enabled/default
|
||||
|
||||
RUN groupadd --system app && \
|
||||
useradd --system --gid app --create-home app && \
|
||||
chown -R app:app /app /usr/share/nginx/html
|
||||
|
||||
USER app
|
||||
EXPOSE 8000
|
||||
|
||||
CMD ["fastapi", "run", "--host", "0.0.0.0", "src/main.py"]
|
||||
EXPOSE 80
|
||||
|
||||
CMD ["sh", "-c", "nginx && exec fastapi run --host 127.0.0.1 --port 8000 src/main.py"]
|
||||
|
||||
52
ai/honcho/honcho-nginx.conf
Normal file
52
ai/honcho/honcho-nginx.conf
Normal file
@@ -0,0 +1,52 @@
|
||||
server {
|
||||
listen 80 default_server;
|
||||
listen [::]:80 default_server;
|
||||
server_name _;
|
||||
|
||||
root /usr/share/nginx/html;
|
||||
index index.html;
|
||||
|
||||
# Honcho API proxy
|
||||
location /v3/ {
|
||||
proxy_pass http://127.0.0.1:8000;
|
||||
proxy_http_version 1.1;
|
||||
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;
|
||||
}
|
||||
|
||||
location /v2/ {
|
||||
proxy_pass http://127.0.0.1:8000;
|
||||
proxy_http_version 1.1;
|
||||
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;
|
||||
}
|
||||
|
||||
# Honcho health
|
||||
location /health {
|
||||
proxy_pass http://127.0.0.1:8000;
|
||||
proxy_http_version 1.1;
|
||||
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;
|
||||
}
|
||||
|
||||
# OpenAPI docs
|
||||
location /openapi.json {
|
||||
proxy_pass http://127.0.0.1:8000;
|
||||
proxy_http_version 1.1;
|
||||
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;
|
||||
}
|
||||
|
||||
# SPA: fallback to index.html for client-side routing
|
||||
location / {
|
||||
try_files $uri $uri/ /index.html;
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user