Add public comparison benchmarks and SSH import
This commit is contained in:
@@ -18,7 +18,8 @@ cp target/release/dosh-auth "$workdir/dosh-auth"
|
||||
cp "$workdir/id_ed25519.pub" "$workdir/bench_authorized_keys"
|
||||
|
||||
docker build -q -t dosh-ssh-bench -f packaging/docker/ssh-bench.Dockerfile "$workdir" >/dev/null
|
||||
container_id="$(docker run -d -p 127.0.0.1:0:22/tcp -p 127.0.0.1:0:50000/udp dosh-ssh-bench)"
|
||||
mosh_port="${DOSH_BENCH_MOSH_PORT:-60000}"
|
||||
container_id="$(docker run -d -p 127.0.0.1:0:22/tcp -p 127.0.0.1:0:50000/udp -p 127.0.0.1:${mosh_port}:60000/udp dosh-ssh-bench)"
|
||||
ssh_port="$(docker port "$container_id" 22/tcp | sed 's/.*://')"
|
||||
dosh_port="$(docker port "$container_id" 50000/udp | sed 's/.*://')"
|
||||
|
||||
@@ -30,6 +31,7 @@ for _ in 1 2 3 4 5; do
|
||||
done
|
||||
|
||||
ssh-keyscan -p "$ssh_port" 127.0.0.1 > "$workdir/known_hosts"
|
||||
mkdir -p "$workdir/home" "$workdir/home-controlmaster" "$workdir/home-mosh"
|
||||
|
||||
if ! HOME="$workdir/home" target/release/dosh-bench \
|
||||
--server bench@127.0.0.1 \
|
||||
@@ -61,3 +63,22 @@ if ! HOME="$workdir/home-controlmaster" target/release/dosh-bench \
|
||||
docker exec "$container_id" sh -lc 'cat /tmp/dosh-server.log 2>/dev/null || true' || true
|
||||
exit 1
|
||||
fi
|
||||
|
||||
if [ "${DOSH_BENCH_INCLUDE_MOSH:-0}" = "1" ]; then
|
||||
if ! HOME="$workdir/home-mosh" target/release/dosh-bench \
|
||||
--server bench@127.0.0.1 \
|
||||
--ssh-port "$ssh_port" \
|
||||
--dosh-port "$dosh_port" \
|
||||
--ssh-key "$workdir/id_ed25519" \
|
||||
--ssh-known-hosts "$workdir/known_hosts" \
|
||||
--ssh-auth-command /usr/local/bin/dosh-auth \
|
||||
--iterations 3 \
|
||||
--no-cache \
|
||||
--include-mosh \
|
||||
--mosh-server-command /usr/bin/mosh-server \
|
||||
--mosh-port "$mosh_port"; then
|
||||
docker logs "$container_id" || true
|
||||
docker exec "$container_id" sh -lc 'cat /tmp/dosh-server.log 2>/dev/null || true' || true
|
||||
exit 1
|
||||
fi
|
||||
fi
|
||||
|
||||
Reference in New Issue
Block a user