ci+deploy: target git.jpaul.io registry, PRODUCT_NAME=hvm
Phase 4/5 — adapt the template workflows to Justin's self-hosted Gitea
+ act_runner setup (see reference_gitea_server memory):
* PUSH via LAN endpoint 192.168.0.2:1234 (bypasses Cloudflare's 100 MB
request-body cap on the Free plan); PULL via git.jpaul.io.
* buildx with config-inline insecure-registry for the LAN endpoint —
docker/login-action can't be used there (host daemon rejects HTTP).
Auth is written into ~/.docker/config.json so buildx reads it
directly.
* docker/metadata-action labels org.opencontainers.image.source with
the PUBLIC URL so Gitea auto-links the package; explicit POST to
/api/v1/packages/.../-/link/{repo} as belt-and-suspenders (201 newly
linked, 400 already linked, both treated as success).
* deploy/docker-compose.yml: substitute <product> placeholders, point
image at git.jpaul.io/justin/hvm-docs:latest, set HYBRID_SEARCH=false
to match the eval winner (bm25+rerank), keep the llama.cpp + jina
GGUF reranker sidecar as the production target.
Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
This commit is contained in:
@@ -14,21 +14,14 @@ on:
|
||||
workflow_dispatch:
|
||||
|
||||
env:
|
||||
REGISTRY_PUSH: <lan-host>:<port>
|
||||
REGISTRY_PULL: <public-registry-hostname>
|
||||
# Image name derives from the actual repo at runtime, so a clone
|
||||
# doesn't need to find/replace anything. e.g. justin/my-product-docs.
|
||||
# github.* context is Gitea Actions' inherited GitHub-Actions namespace
|
||||
# — values come from the Gitea server, not github.com.
|
||||
# PUSH goes to the LAN endpoint (HTTP) to bypass Cloudflare's 100 MB
|
||||
# body cap. PULL uses the public hostname (HTTPS). Same Gitea registry.
|
||||
REGISTRY_PUSH: 192.168.0.2:1234
|
||||
REGISTRY_PULL: git.jpaul.io
|
||||
IMAGE: ${{ github.repository_owner }}/${{ github.event.repository.name }}
|
||||
OLLAMA_URL: http://<gpu-host>:11434
|
||||
OLLAMA_URL: http://192.168.0.126:11434
|
||||
EMBED_MODEL: nomic-embed-text
|
||||
# PRODUCT_NAME defaults to the repo name so a clone works without
|
||||
# editing. Override here if you want a different identifier (e.g.
|
||||
# repo "my-product-docs" → PRODUCT_NAME "myproduct"). Used as the
|
||||
# Chroma collection name, BM25 db filename, and MCP server name —
|
||||
# see docs_mcp/server.py.
|
||||
PRODUCT_NAME: ${{ github.event.repository.name }}
|
||||
PRODUCT_NAME: hvm
|
||||
|
||||
jobs:
|
||||
build:
|
||||
@@ -39,8 +32,7 @@ jobs:
|
||||
- name: Checkout
|
||||
uses: actions/checkout@v4
|
||||
with:
|
||||
# Full history (not shallow) so the digest-history step can
|
||||
# walk git log up to --history-days back.
|
||||
# Full history so digest-history can walk git log.
|
||||
fetch-depth: 0
|
||||
|
||||
- name: Set up Python
|
||||
@@ -54,9 +46,8 @@ jobs:
|
||||
python -m pip install -q -r requirements.txt
|
||||
|
||||
- name: Refresh digest history
|
||||
# Cheap (a few seconds); doesn't touch corpus content.
|
||||
# Without this step, a code-only deploy would ship an
|
||||
# increasingly-stale digest history relative to git.
|
||||
# Cheap (few seconds). Without this step, a code-only deploy
|
||||
# would ship an increasingly-stale digest history.
|
||||
run: |
|
||||
mkdir -p corpus/.digest
|
||||
python -m scrape.changelog \
|
||||
@@ -71,42 +62,69 @@ jobs:
|
||||
- name: Rebuild indexes from existing corpus
|
||||
run: python -m rag.index --rebuild
|
||||
|
||||
- name: Log in to registry (LAN endpoint)
|
||||
run: echo "${{ secrets.REGISTRY_TOKEN }}" | docker login "${REGISTRY_PUSH}" -u "${{ github.repository_owner }}" --password-stdin
|
||||
- name: Set up Docker Buildx
|
||||
uses: docker/setup-buildx-action@v3
|
||||
with:
|
||||
# LAN registry is HTTP only.
|
||||
config-inline: |
|
||||
[registry."192.168.0.2:1234"]
|
||||
http = true
|
||||
insecure = true
|
||||
|
||||
- name: Build & push image
|
||||
- name: Configure registry credentials for buildx
|
||||
env:
|
||||
REGISTRY_TOKEN: ${{ secrets.REGISTRY_TOKEN }}
|
||||
REGISTRY_USER: ${{ github.actor }}
|
||||
run: |
|
||||
SHA_TAG=$(echo "$GITHUB_SHA" | cut -c1-12)
|
||||
DATE_TAG=$(date -u +%Y.%m.%d)
|
||||
docker build \
|
||||
-t "${REGISTRY_PUSH}/${IMAGE}:latest" \
|
||||
-t "${REGISTRY_PUSH}/${IMAGE}:${SHA_TAG}" \
|
||||
-t "${REGISTRY_PUSH}/${IMAGE}:${DATE_TAG}" \
|
||||
.
|
||||
docker push "${REGISTRY_PUSH}/${IMAGE}:latest"
|
||||
docker push "${REGISTRY_PUSH}/${IMAGE}:${SHA_TAG}"
|
||||
docker push "${REGISTRY_PUSH}/${IMAGE}:${DATE_TAG}"
|
||||
mkdir -p ~/.docker
|
||||
AUTH=$(printf '%s:%s' "$REGISTRY_USER" "$REGISTRY_TOKEN" | base64 -w0)
|
||||
cat > ~/.docker/config.json <<EOF
|
||||
{
|
||||
"auths": {
|
||||
"192.168.0.2:1234": {
|
||||
"auth": "$AUTH"
|
||||
}
|
||||
}
|
||||
}
|
||||
EOF
|
||||
|
||||
- name: Compute tags
|
||||
id: meta
|
||||
uses: docker/metadata-action@v5
|
||||
with:
|
||||
images: 192.168.0.2:1234/${{ github.repository_owner }}/${{ github.event.repository.name }}
|
||||
tags: |
|
||||
type=raw,value=latest
|
||||
type=sha,prefix=,format=short
|
||||
type=raw,value={{date 'YYYY.MM.DD'}}
|
||||
labels: |
|
||||
org.opencontainers.image.source=https://git.jpaul.io/${{ github.repository_owner }}/${{ github.event.repository.name }}
|
||||
org.opencontainers.image.url=https://git.jpaul.io/${{ github.repository_owner }}/${{ github.event.repository.name }}
|
||||
|
||||
- name: Build & push (amd64)
|
||||
uses: docker/build-push-action@v6
|
||||
with:
|
||||
context: .
|
||||
platforms: linux/amd64
|
||||
push: true
|
||||
tags: ${{ steps.meta.outputs.tags }}
|
||||
labels: ${{ steps.meta.outputs.labels }}
|
||||
|
||||
- name: Link container package to this repo
|
||||
# Gitea container packages are owned by a USER, not a repo —
|
||||
# they don't auto-appear under the repo's Packages tab.
|
||||
# This API call creates the association. One-time-effective:
|
||||
# re-running returns 400 once linked, which we swallow.
|
||||
# Endpoint requires Gitea 1.21+.
|
||||
env:
|
||||
GITEA_TOKEN: ${{ secrets.REGISTRY_TOKEN }}
|
||||
run: |
|
||||
OWNER="${{ github.repository_owner }}"
|
||||
PKG="${{ github.event.repository.name }}"
|
||||
BODY=$(mktemp)
|
||||
CODE=$(curl -sS -o "$BODY" -w "%{http_code}" -X POST \
|
||||
code=$(curl -s -o /tmp/link.out -w "%{http_code}" -X POST \
|
||||
-H "Authorization: token ${GITEA_TOKEN}" \
|
||||
"https://${REGISTRY_PULL}/api/v1/packages/${OWNER}/container/${PKG}/-/link/${PKG}")
|
||||
echo "link http=$CODE body=$(cat "$BODY")"
|
||||
case "$CODE" in
|
||||
201) echo "linked package to ${OWNER}/${PKG}" ;;
|
||||
400) echo "already linked (re-link returns 400) — ok" ;;
|
||||
*) echo "unexpected status $CODE"; exit 1 ;;
|
||||
"https://git.jpaul.io/api/v1/packages/${OWNER}/container/${PKG}/-/link/${PKG}")
|
||||
echo "link ${OWNER}/container/${PKG} -> ${PKG}: HTTP ${code}"
|
||||
body=$(cat /tmp/link.out)
|
||||
case "$code" in
|
||||
201) echo "OK — newly linked" ;;
|
||||
400|409) echo "OK — already linked: ${body}" ;;
|
||||
*) echo "unexpected: ${body}"; exit 1 ;;
|
||||
esac
|
||||
|
||||
- name: Prune old container versions
|
||||
|
||||
@@ -19,27 +19,23 @@ on:
|
||||
default: false
|
||||
|
||||
env:
|
||||
# If your registry sits behind Cloudflare with its 100 MB body cap,
|
||||
# use a LAN endpoint for pushes (bypasses CF) and the public hostname
|
||||
# for pulls (response bodies aren't capped).
|
||||
REGISTRY_PUSH: <lan-host>:<port>
|
||||
REGISTRY_PULL: <public-registry-hostname>
|
||||
# Image name derives from the actual repo at runtime, so a clone
|
||||
# doesn't need to find/replace anything. e.g. justin/my-product-docs.
|
||||
# github.* context is Gitea Actions' inherited GitHub-Actions namespace
|
||||
# — values come from the Gitea server, not github.com.
|
||||
# PUSH goes to the LAN endpoint (HTTP) to bypass Cloudflare Tunnel's
|
||||
# 100 MB body cap. PULL uses the public hostname (HTTPS). Same Gitea
|
||||
# registry either way — package lands under the same owner/repo.
|
||||
REGISTRY_PUSH: 192.168.0.2:1234
|
||||
REGISTRY_PULL: git.jpaul.io
|
||||
|
||||
# Image name derives from the repo at runtime — clones don't need to
|
||||
# edit this. github.* is the Gitea-Actions inherited namespace.
|
||||
IMAGE: ${{ github.repository_owner }}/${{ github.event.repository.name }}
|
||||
|
||||
# Embedder. One URL per GPU; the indexer round-robins.
|
||||
OLLAMA_URL: http://<gpu-host>:11434
|
||||
# Embedder. One URL per GPU; the indexer round-robins if you pass a
|
||||
# comma-separated list. Adjust to wherever Ollama is reachable from
|
||||
# the runner (gitea_default network can reach the host's bridge IP).
|
||||
OLLAMA_URL: http://192.168.0.126:11434
|
||||
EMBED_MODEL: nomic-embed-text
|
||||
|
||||
# PRODUCT_NAME defaults to the repo name so a clone works without
|
||||
# editing. Override here if you want a different identifier (e.g.
|
||||
# repo "my-product-docs" → PRODUCT_NAME "myproduct"). Used as the
|
||||
# Chroma collection name, BM25 db filename, and MCP server name —
|
||||
# see docs_mcp/server.py.
|
||||
PRODUCT_NAME: ${{ github.event.repository.name }}
|
||||
PRODUCT_NAME: hvm
|
||||
|
||||
jobs:
|
||||
refresh:
|
||||
@@ -50,10 +46,12 @@ jobs:
|
||||
- name: Checkout
|
||||
uses: actions/checkout@v4
|
||||
with:
|
||||
# Full history — required for the digest-history step to
|
||||
# walk git log. Default fetch-depth: 1 silently produces a
|
||||
# 0-byte history file.
|
||||
# Full history — required for digest-history. Default depth 1
|
||||
# silently produces a 0-byte history file.
|
||||
fetch-depth: 0
|
||||
# Set the credentials Gitea injects so we can push corpus
|
||||
# commits back. Persist them across the run.
|
||||
token: ${{ secrets.GITEA_TOKEN }}
|
||||
|
||||
- name: Set up Python
|
||||
uses: actions/setup-python@v5
|
||||
@@ -89,8 +87,8 @@ jobs:
|
||||
- name: Commit corpus changes (if any)
|
||||
id: commit
|
||||
run: |
|
||||
git config user.name "<product>-docs-refresh"
|
||||
git config user.email "actions@<your-domain>"
|
||||
git config user.name "hvm-docs-refresh"
|
||||
git config user.email "actions@jpaul.io"
|
||||
git add bundles.json corpus
|
||||
if git diff --cached --quiet; then
|
||||
echo "no corpus changes — skipping reindex and image build"
|
||||
@@ -132,49 +130,89 @@ jobs:
|
||||
if: steps.commit.outputs.changed == 'true' || inputs.force_build == true
|
||||
run: python -m rag.index --rebuild
|
||||
|
||||
# ---- Build & push image ------------------------------------
|
||||
- name: Log in to registry (LAN endpoint)
|
||||
# ---- Build & push image (LAN endpoint, buildx) -------------
|
||||
- name: Set up Docker Buildx
|
||||
if: steps.commit.outputs.changed == 'true' || inputs.force_build == true
|
||||
run: echo "${{ secrets.REGISTRY_TOKEN }}" | docker login "${REGISTRY_PUSH}" -u "${{ github.repository_owner }}" --password-stdin
|
||||
uses: docker/setup-buildx-action@v3
|
||||
with:
|
||||
# LAN registry is HTTP only. Buildkit needs an explicit
|
||||
# insecure-registry config or it tries to upgrade to HTTPS.
|
||||
config-inline: |
|
||||
[registry."192.168.0.2:1234"]
|
||||
http = true
|
||||
insecure = true
|
||||
|
||||
- name: Build & push image
|
||||
- name: Configure registry credentials for buildx
|
||||
# Can't use docker/login-action against the LAN endpoint —
|
||||
# the host docker daemon errors on HTTP-vs-HTTPS. Buildx reads
|
||||
# ~/.docker/config.json directly, so write the auth ourselves.
|
||||
if: steps.commit.outputs.changed == 'true' || inputs.force_build == true
|
||||
# Runner shell is /bin/sh — use cut instead of ${VAR::N}.
|
||||
# Three tags: :latest (Watchtower target), :<sha12>
|
||||
# (rollback pin), :<YYYY.MM.DD> (human-readable).
|
||||
env:
|
||||
REGISTRY_TOKEN: ${{ secrets.REGISTRY_TOKEN }}
|
||||
REGISTRY_USER: ${{ github.actor }}
|
||||
run: |
|
||||
SHA_TAG=$(echo "$GITHUB_SHA" | cut -c1-12)
|
||||
DATE_TAG=$(date -u +%Y.%m.%d)
|
||||
docker build \
|
||||
-t "${REGISTRY_PUSH}/${IMAGE}:latest" \
|
||||
-t "${REGISTRY_PUSH}/${IMAGE}:${SHA_TAG}" \
|
||||
-t "${REGISTRY_PUSH}/${IMAGE}:${DATE_TAG}" \
|
||||
.
|
||||
docker push "${REGISTRY_PUSH}/${IMAGE}:latest"
|
||||
docker push "${REGISTRY_PUSH}/${IMAGE}:${SHA_TAG}"
|
||||
docker push "${REGISTRY_PUSH}/${IMAGE}:${DATE_TAG}"
|
||||
mkdir -p ~/.docker
|
||||
AUTH=$(printf '%s:%s' "$REGISTRY_USER" "$REGISTRY_TOKEN" | base64 -w0)
|
||||
cat > ~/.docker/config.json <<EOF
|
||||
{
|
||||
"auths": {
|
||||
"192.168.0.2:1234": {
|
||||
"auth": "$AUTH"
|
||||
}
|
||||
}
|
||||
}
|
||||
EOF
|
||||
|
||||
- name: Compute tags
|
||||
id: meta
|
||||
if: steps.commit.outputs.changed == 'true' || inputs.force_build == true
|
||||
uses: docker/metadata-action@v5
|
||||
with:
|
||||
# Tag with the LAN hostname so the push goes over LAN.
|
||||
# docker-compose on the deploy host pulls via git.jpaul.io.
|
||||
images: 192.168.0.2:1234/${{ github.repository_owner }}/${{ github.event.repository.name }}
|
||||
tags: |
|
||||
type=raw,value=latest
|
||||
type=sha,prefix=,format=short
|
||||
type=schedule,pattern={{date 'YYYY.MM.DD'}}
|
||||
type=raw,value={{date 'YYYY.MM.DD'}}
|
||||
# Override auto-derived labels with the PUBLIC URL so Gitea
|
||||
# can auto-link the package back to this repo.
|
||||
labels: |
|
||||
org.opencontainers.image.source=https://git.jpaul.io/${{ github.repository_owner }}/${{ github.event.repository.name }}
|
||||
org.opencontainers.image.url=https://git.jpaul.io/${{ github.repository_owner }}/${{ github.event.repository.name }}
|
||||
|
||||
- name: Build & push (amd64)
|
||||
if: steps.commit.outputs.changed == 'true' || inputs.force_build == true
|
||||
uses: docker/build-push-action@v6
|
||||
with:
|
||||
context: .
|
||||
platforms: linux/amd64
|
||||
push: true
|
||||
tags: ${{ steps.meta.outputs.tags }}
|
||||
labels: ${{ steps.meta.outputs.labels }}
|
||||
|
||||
- name: Link container package to this repo
|
||||
# Gitea container packages are owned by a USER, not a repo —
|
||||
# they don't auto-appear under the repo's Packages tab.
|
||||
# This API call creates the association. One-time-effective:
|
||||
# re-running returns 400 once linked, which we swallow.
|
||||
# Endpoint requires Gitea 1.21+.
|
||||
# Idempotent linkage so the package shows under the repo's
|
||||
# Packages tab. Gitea's auto-link from the source label is
|
||||
# unreliable in this setup (the runner reports an internal
|
||||
# server URL), so we link explicitly. 201 = newly linked,
|
||||
# 400 = already linked (treated as success).
|
||||
if: steps.commit.outputs.changed == 'true' || inputs.force_build == true
|
||||
env:
|
||||
GITEA_TOKEN: ${{ secrets.REGISTRY_TOKEN }}
|
||||
run: |
|
||||
OWNER="${{ github.repository_owner }}"
|
||||
PKG="${{ github.event.repository.name }}"
|
||||
BODY=$(mktemp)
|
||||
CODE=$(curl -sS -o "$BODY" -w "%{http_code}" -X POST \
|
||||
code=$(curl -s -o /tmp/link.out -w "%{http_code}" -X POST \
|
||||
-H "Authorization: token ${GITEA_TOKEN}" \
|
||||
"https://${REGISTRY_PULL}/api/v1/packages/${OWNER}/container/${PKG}/-/link/${PKG}")
|
||||
echo "link http=$CODE body=$(cat "$BODY")"
|
||||
case "$CODE" in
|
||||
201) echo "linked package to ${OWNER}/${PKG}" ;;
|
||||
400) echo "already linked (re-link returns 400) — ok" ;;
|
||||
*) echo "unexpected status $CODE"; exit 1 ;;
|
||||
"https://git.jpaul.io/api/v1/packages/${OWNER}/container/${PKG}/-/link/${PKG}")
|
||||
echo "link ${OWNER}/container/${PKG} -> ${PKG}: HTTP ${code}"
|
||||
body=$(cat /tmp/link.out)
|
||||
case "$code" in
|
||||
201) echo "OK — newly linked" ;;
|
||||
400|409) echo "OK — already linked: ${body}" ;;
|
||||
*) echo "unexpected: ${body}"; exit 1 ;;
|
||||
esac
|
||||
|
||||
# ---- Registry GC -------------------------------------------
|
||||
|
||||
Reference in New Issue
Block a user