Claude
d8e17207b6
The base image's /setup.sh configures routing for the runner's ns-3 sim *and* points the container's DNS resolver at the sim's nameserver. When we source it inside `make smoke` (which uses a plain Docker bridge network without the sim), DNS resolution for the bridge container names breaks: the JVM client can't resolve `amethyst-quic-interop-smoke-picoquic` and aborts before any QUIC traffic. Adds a SMOKE_MODE=1 env var; run_endpoint.sh skips /setup.sh entirely when it's set. The Makefile smoke target sets it. Inside the runner (unset, default), /setup.sh runs as before. https://claude.ai/code/session_01HcvfQq1ttPV9PkRoJb4nyT
58 lines
2.2 KiB
Makefile
58 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 SMOKE_MODE=1 \
|
|
-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
|