Claude
88c2e68d47
Two coupled fixes that surface together when running the smoke target outside the runner's privileged sim environment: 1. run_endpoint.sh now tolerates /setup.sh failures. The base image's /setup.sh manipulates routes for the runner's ns-3 sim. Outside the runner (e.g., make smoke without --privileged), it fails with "netlink error: Operation not permitted" — and our set -euo pipefail bailed before launching the JVM. The setup is genuinely not needed for smoke; tolerate the failure and continue. 2. make smoke uses a private Docker bridge instead of --network host. --network host on Docker Desktop for Mac is *not* the Mac host's network — it's the LinuxKit VM's, and 127.0.0.1 isn't routed back to other Docker containers. A dedicated bridge with DNS-by-name works identically on Mac and Linux. Bonus: smoke-down target reliably tears down the env. Inside the runner these changes are no-ops: the runner provides the privileges /setup.sh needs, and uses its own compose network not --network host. https://claude.ai/code/session_01HcvfQq1ttPV9PkRoJb4nyT
57 lines
2.2 KiB
Makefile
57 lines
2.2 KiB
Makefile
# Local iteration loop for the quic-interop-runner endpoint image.
|
|
#
|
|
# make build # compile JVM dist + build Docker image
|
|
# make smoke # quick handshake test against a local picoquic
|
|
# make smoke-down # tear down the smoke environment
|
|
# make image-name # print the image tag (for use in implementations_quic.json)
|
|
#
|
|
# These targets are deliberately thin wrappers — the real harness is the
|
|
# `quic-interop-runner` repo (clone separately and register `amethyst` with
|
|
# image=amethyst-quic-interop:latest, role=client).
|
|
IMAGE ?= amethyst-quic-interop:latest
|
|
REPO_ROOT := $(shell git rev-parse --show-toplevel)
|
|
DIST_DIR := build/install/quic-interop
|
|
SMOKE_NET := amethyst-quic-interop-smoke-net
|
|
SMOKE_PICOQUIC := amethyst-quic-interop-smoke-picoquic
|
|
SMOKE_CLIENT := amethyst-quic-interop-smoke-client
|
|
|
|
.PHONY: build dist docker smoke smoke-down image-name clean
|
|
|
|
build: docker
|
|
|
|
dist:
|
|
cd $(REPO_ROOT) && ./gradlew :quic-interop:installDist
|
|
|
|
docker: dist
|
|
cd $(REPO_ROOT) && docker build -t $(IMAGE) -f quic/interop/Dockerfile .
|
|
|
|
# Stand up picoquic + our endpoint on a private Docker bridge network. This
|
|
# avoids `--network host`, which on Docker Desktop for Mac is misleadingly
|
|
# *not* the Mac host's network — it's the LinuxKit VM's, and port forwarding
|
|
# trickery makes 127.0.0.1 unreliable. A dedicated bridge with name-based
|
|
# DNS works the same on Mac and Linux.
|
|
smoke: docker smoke-down
|
|
docker network create $(SMOKE_NET) >/dev/null 2>&1 || true
|
|
docker run -d --name $(SMOKE_PICOQUIC) \
|
|
--network $(SMOKE_NET) \
|
|
privateoctopus/picoquic:latest picoquicdemo -p 4433 >/dev/null
|
|
@echo "picoquic up on $(SMOKE_PICOQUIC):4433 (in $(SMOKE_NET))"
|
|
docker run --rm --name $(SMOKE_CLIENT) \
|
|
--network $(SMOKE_NET) \
|
|
-e ROLE=client \
|
|
-e TESTCASE=handshake \
|
|
-e REQUESTS="https://$(SMOKE_PICOQUIC):4433/" \
|
|
$(IMAGE)
|
|
@$(MAKE) smoke-down
|
|
|
|
smoke-down:
|
|
@docker rm -f $(SMOKE_PICOQUIC) $(SMOKE_CLIENT) >/dev/null 2>&1 || true
|
|
@docker network rm $(SMOKE_NET) >/dev/null 2>&1 || true
|
|
|
|
image-name:
|
|
@echo $(IMAGE)
|
|
|
|
clean:
|
|
cd $(REPO_ROOT) && ./gradlew :quic-interop:clean
|
|
docker image rm -f $(IMAGE) 2>/dev/null || true
|