Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 0 additions & 8 deletions .dockerignore

This file was deleted.

1 change: 1 addition & 0 deletions .dockerignore
1 change: 1 addition & 0 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -148,6 +148,7 @@ jobs:
uses: docker/build-push-action@v6
with:
context: .
file: docker/Dockerfile
load: true
tags: zeph:local
push: false
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -171,6 +171,7 @@ jobs:
- uses: docker/build-push-action@v6
with:
context: .
file: docker/Dockerfile
platforms: linux/amd64,linux/arm64
push: true
tags: ${{ steps.meta.outputs.tags }}
Expand Down
8 changes: 8 additions & 0 deletions docker/.dockerignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
target/
data/
.local/
.git/
.env
*.swp
*.swo
.DS_Store
File renamed without changes.
File renamed without changes.
File renamed without changes.
4 changes: 2 additions & 2 deletions docker-compose.dev.yml → docker/docker-compose.dev.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@ services:

zeph:
build:
context: .
dockerfile: Dockerfile.dev
context: ..
dockerfile: docker/Dockerfile.dev
args:
CARGO_FEATURES: ${CARGO_FEATURES:-}
depends_on:
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
18 changes: 9 additions & 9 deletions docs/src/guide/docker.md
Original file line number Diff line number Diff line change
Expand Up @@ -33,24 +33,24 @@ docker compose --profile gpu run --rm ollama ollama pull mistral:7b
docker compose --profile gpu run --rm ollama ollama pull qwen3-embedding

# Start all services with GPU
docker compose --profile gpu -f docker-compose.yml -f docker-compose.gpu.yml up
docker compose --profile gpu -f docker/docker-compose.yml -f docker/docker-compose.gpu.yml up
```

## Age Vault (Encrypted Secrets)

```bash
# Mount key and vault files into container
docker compose -f docker-compose.yml -f docker-compose.vault.yml up
docker compose -f docker/docker-compose.yml -f docker/docker-compose.vault.yml up
```

Override file paths via environment variables:

```bash
ZEPH_VAULT_KEY=./my-key.txt ZEPH_VAULT_PATH=./my-secrets.age \
docker compose -f docker-compose.yml -f docker-compose.vault.yml up
docker compose -f docker/docker-compose.yml -f docker/docker-compose.vault.yml up
```

> The image must be built with `vault-age` feature enabled. For local builds, use `CARGO_FEATURES=vault-age` with `docker-compose.dev.yml`.
> The image must be built with `vault-age` feature enabled. For local builds, use `CARGO_FEATURES=vault-age` with `docker/docker-compose.dev.yml`.

## Using Specific Version

Expand Down Expand Up @@ -79,25 +79,25 @@ trivy image --severity HIGH,CRITICAL --exit-code 1 ghcr.io/bug-ops/zeph:latest

## Local Development

Full stack with debug tracing (builds from source via `Dockerfile.dev`, uses host Ollama via `host.docker.internal`):
Full stack with debug tracing (builds from source via `docker/Dockerfile.dev`, uses host Ollama via `host.docker.internal`):

```bash
# Build and start Qdrant + Zeph with debug logging
docker compose -f docker-compose.dev.yml up --build
docker compose -f docker/docker-compose.dev.yml up --build

# Build with optional features (e.g. vault-age, candle)
CARGO_FEATURES=vault-age docker compose -f docker-compose.dev.yml up --build
CARGO_FEATURES=vault-age docker compose -f docker/docker-compose.dev.yml up --build

# Build with vault-age and mount vault files
CARGO_FEATURES=vault-age \
docker compose -f docker-compose.dev.yml -f docker-compose.vault.yml up --build
docker compose -f docker/docker-compose.dev.yml -f docker/docker-compose.vault.yml up --build
```

Dependencies only (run zeph natively on host):

```bash
# Start Qdrant
docker compose -f docker-compose.deps.yml up
docker compose -f docker/docker-compose.deps.yml up

# Run zeph natively with debug tracing
RUST_LOG=zeph=debug,zeph_channels=trace cargo run
Expand Down
2 changes: 1 addition & 1 deletion docs/src/guide/tui.md
Original file line number Diff line number Diff line change
Expand Up @@ -263,5 +263,5 @@ When TUI is active, tracing output is redirected to `zeph.log` to avoid corrupti
Docker images are built without the `tui` feature by default (headless operation). To build a Docker image with TUI support:

```bash
docker build -f Dockerfile.dev --build-arg CARGO_FEATURES=tui -t zeph:tui .
docker build -f docker/Dockerfile.dev --build-arg CARGO_FEATURES=tui -t zeph:tui .
```
4 changes: 2 additions & 2 deletions docs/src/guide/vault.md
Original file line number Diff line number Diff line change
Expand Up @@ -54,12 +54,12 @@ cargo build --release --features vault-age
Mount key and vault files into the container:

```bash
docker compose -f docker-compose.yml -f docker-compose.vault.yml up
docker compose -f docker/docker-compose.yml -f docker/docker-compose.vault.yml up
```

Override paths:

```bash
ZEPH_VAULT_KEY=./my-key.txt ZEPH_VAULT_PATH=./my-secrets.age \
docker compose -f docker-compose.yml -f docker-compose.vault.yml up
docker compose -f docker/docker-compose.yml -f docker/docker-compose.vault.yml up
```
Loading