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
4 changes: 2 additions & 2 deletions docs/proposals/TUNNEL.md
Original file line number Diff line number Diff line change
Expand Up @@ -284,7 +284,7 @@ docker run \

```bash
# From SandD repo
docker build -f hack/docker/Dockerfile.server-tunnel -t inftyai/sandd-server:latest-tunnel .
docker build -f hack/docker/Dockerfile.server-tunnel -t inftyai/sandd-server-tunnel:latest .
```

### 2. Run Headscale
Expand Down Expand Up @@ -335,7 +335,7 @@ docker run \
--cap-add NET_ADMIN \
--device /dev/net/tun \
-v $(pwd)/controller.py:/app/controller.py \
inftyai/sandd-server:latest-tunnel \
inftyai/sandd-server-tunnel:latest \
python /app/controller.py
```

Expand Down
4 changes: 2 additions & 2 deletions examples/tunnel-simple/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ You can either:

```bash
# Option B: Build manually from repo root
docker build -f hack/docker/Dockerfile.server-tunnel -t inftyai/sandd-server:latest-tunnel .
docker build -f hack/docker/Dockerfile.server-tunnel -t inftyai/sandd-server-tunnel:latest .
docker build -f hack/docker/Dockerfile.debian -t inftyai/sandd-daemon:debian .
```

Expand Down Expand Up @@ -191,7 +191,7 @@ sandd --server-url ws://100.64.0.1:8765/ws \
### Dockerfile

```dockerfile
FROM inftyai/sandd-server:latest-tunnel
FROM inftyai/sandd-server-tunnel:latest

COPY my_controller.py .
CMD ["python", "my_controller.py"]
Expand Down
4 changes: 2 additions & 2 deletions hack/docker/Dockerfile.daemon-tunnel-release
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@
#
# Build: docker build -f hack/docker/Dockerfile.daemon-tunnel-release \
# --build-arg SANDD_VERSION=v0.1.0 \
# -t inftyai/sandd-daemon:v0.1.0-tunnel .
# Run: docker run --cap-add NET_ADMIN --device /dev/net/tun inftyai/sandd-daemon:v0.1.0-tunnel
# -t inftyai/sandd-tunnel:v0.1.0 .
# Run: docker run --cap-add NET_ADMIN --device /dev/net/tun inftyai/sandd-tunnel:v0.1.0

FROM debian:bookworm-slim

Expand Down
4 changes: 2 additions & 2 deletions hack/docker/Dockerfile.server-tunnel
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@
# ↑
# └─ Tailscale client (installed in this image)
#
# Build: docker build -f Dockerfile.server-tunnel -t inftyai/sandd-server:latest-tunnel .
# Run: docker run --cap-add NET_ADMIN --device /dev/net/tun inftyai/sandd-server:latest-tunnel
# Build: docker build -f hack/docker/Dockerfile.server-tunnel -t inftyai/sandd-server-tunnel:latest .
# Run: docker run --cap-add NET_ADMIN --device /dev/net/tun inftyai/sandd-server-tunnel:latest

FROM python:3.11-slim-bookworm

Expand Down
6 changes: 4 additions & 2 deletions hack/docker/Dockerfile.server-tunnel-release
Original file line number Diff line number Diff line change
@@ -1,8 +1,10 @@
# SandD Server with Tunnel Support (Release Version)
# Uses published PyPI package instead of building from source
#
# Build: docker build -f hack/docker/Dockerfile.server-tunnel-release -t inftyai/sandd-server:v0.1.0-tunnel .
# Run: docker run --cap-add NET_ADMIN --device /dev/net/tun inftyai/sandd-server:v0.1.0-tunnel
# Build: docker build -f hack/docker/Dockerfile.server-tunnel-release \
# --build-arg SANDD_VERSION=0.1.0 \
# -t inftyai/sandd-server-tunnel:v0.1.0 .
# Run: docker run --cap-add NET_ADMIN --device /dev/net/tun inftyai/sandd-server-tunnel:v0.1.0

FROM python:3.11-slim-bookworm

Expand Down
10 changes: 5 additions & 5 deletions hack/docker/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,22 +10,22 @@ This directory contains Docker-related files for building and testing SandD.

- **`Dockerfile.server-tunnel`** - Server with Tailscale (build from source)
- Use: Development and testing
- Build: `docker build -f hack/docker/Dockerfile.server-tunnel -t inftyai/sandd-server:latest-tunnel .`
- Build: `docker build -f hack/docker/Dockerfile.server-tunnel -t inftyai/sandd-server-tunnel:latest .`
- See: [docs/proposals/TUNNEL.md](../../docs/proposals/TUNNEL.md)

- **`Dockerfile.server-tunnel-release`** - Server with Tailscale (uses PyPI release)
- Use: Production deployments
- Build: `docker build -f hack/docker/Dockerfile.server-tunnel-release --build-arg SANDD_VERSION=0.1.0 -t inftyai/sandd-server:v0.1.0-tunnel .`
- Build: `docker build -f hack/docker/Dockerfile.server-tunnel-release --build-arg SANDD_VERSION=0.1.0 -t inftyai/sandd-server-tunnel:v0.1.0 .`

#### Daemon (Worker) Images

- **`Dockerfile.daemon-tunnel`** - Daemon with Tailscale (build from source)
- Use: Development and testing
- Build: `docker build -f hack/docker/Dockerfile.daemon-tunnel -t inftyai/sandd-daemon:latest-tunnel .`
- Build: `docker build -f hack/docker/Dockerfile.daemon-tunnel -t inftyai/sandd-tunnel:latest .`

- **`Dockerfile.daemon-tunnel-release`** - Daemon with Tailscale (uses GitHub release)
- Use: Production deployments
- Build: `docker build -f hack/docker/Dockerfile.daemon-tunnel-release --build-arg SANDD_VERSION=v0.1.0 -t inftyai/sandd-daemon:v0.1.0-tunnel .`
- Build: `docker build -f hack/docker/Dockerfile.daemon-tunnel-release --build-arg SANDD_VERSION=v0.1.0 -t inftyai/sandd-tunnel:v0.1.0 .`

#### Test Images (Direct Mode)

Expand All @@ -46,7 +46,7 @@ This directory contains Docker-related files for building and testing SandD.

```bash
# From repo root
docker build -f hack/docker/Dockerfile.server-tunnel -t inftyai/sandd-server:latest-tunnel .
docker build -f hack/docker/Dockerfile.server-tunnel -t inftyai/sandd-server-tunnel:latest .
```

### Build test images
Expand Down
Loading