diff --git a/Makefile b/Makefile index 8d85deb..1424fac 100644 --- a/Makefile +++ b/Makefile @@ -53,7 +53,7 @@ define docker_run $(eval $@_MISC = $(3)) rm -f $@ for i in $(shell seq 1 $(RUNS)) ; do \ - timeout -s KILL $$(( $(RUNS) * 180 + 60 ))s \ + timeout -s KILL 180 \ docker run --rm -v $(CURDIR):/workspace \ jsonschema-benchmark/$($@_TOOL) $($@_INPUT) $($@_MISC) > $@.tmp ; \ STATUS=$$? ; \ diff --git a/implementations/corvus/Dockerfile b/implementations/corvus/Dockerfile index 77638ca..16f2c9d 100644 --- a/implementations/corvus/Dockerfile +++ b/implementations/corvus/Dockerfile @@ -1,9 +1,9 @@ -FROM mcr.microsoft.com/dotnet/sdk:9.0.102-alpine3.21 +FROM mcr.microsoft.com/dotnet/sdk:10.0.100-alpine3.22 # Note: coreutils is necessary so /usr/bin/date can use nanoseconds RUN apk add --no-cache --repository=https://dl-cdn.alpinelinux.org/alpine/edge/community coreutils time COPY . /app -RUN dotnet tool install --global Corvus.Json.JsonSchema.TypeGeneratorTool --version 4.2.3 +RUN dotnet tool install --global Corvus.Json.JsonSchema.TypeGeneratorTool --version 4.3.21 ENTRYPOINT ["/app/memory-wrapper.sh", "/app/generate-and-run.sh"] CMD []