From b72ebe315a0926de39060c2f2ad8e2b4f5865944 Mon Sep 17 00:00:00 2001 From: Cameron Bytheway Date: Fri, 12 Jan 2024 17:35:44 -0700 Subject: [PATCH] fix cargo-chef usage --- quic/s2n-quic-qns/etc/Dockerfile | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/quic/s2n-quic-qns/etc/Dockerfile b/quic/s2n-quic-qns/etc/Dockerfile index 20af3f2b3f..d86a20c5f4 100644 --- a/quic/s2n-quic-qns/etc/Dockerfile +++ b/quic/s2n-quic-qns/etc/Dockerfile @@ -66,6 +66,10 @@ RUN set -eux; \ cargo chef cook --recipe-path recipe.json; \ fi; +# restore the correct sources - cargo-chef replaces them with empty files +COPY --from=sources /app/common /app/common +COPY --from=sources /app/quic /app/quic + # build runner RUN set -eux; \ source /root/.cargo/env; \ @@ -124,7 +128,8 @@ RUN set -eux; \ ldd /usr/bin/s2n-quic-qns; \ # ensure the binary works \ s2n-quic-qns --help; \ - s2n-quic-qns-release --help; \ + s2n-quic-qns --help | grep interop; \ + s2n-quic-qns-release --help | grep interop; \ echo done ############### @@ -157,5 +162,6 @@ RUN set -eux; \ ldd /usr/bin/s2n-quic-qns; \ # ensure the binary works \ s2n-quic-qns --help; \ + s2n-quic-qns --help | grep interop; \ echo done