From 1aae3e309ba322cb8f976b7aa0223eb9675ef134 Mon Sep 17 00:00:00 2001 From: David Scott Date: Thu, 2 Aug 2018 16:08:59 +0100 Subject: [PATCH] pkg/virtsock: update vendording of linuxkit/virtsock Signed-off-by: David Scott --- test/pkg/virtsock/Dockerfile | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/test/pkg/virtsock/Dockerfile b/test/pkg/virtsock/Dockerfile index 46a75a5d7..31cfcd45f 100644 --- a/test/pkg/virtsock/Dockerfile +++ b/test/pkg/virtsock/Dockerfile @@ -9,17 +9,17 @@ FROM linuxkit/alpine:3683c9a66cd4da40bd7d6c7da599b2dcd738b559 AS build RUN apk add --no-cache go musl-dev git make ENV GOPATH=/go PATH=$PATH:/go/bin -ENV VIRTSOCK_COMMIT=3bfdf22e3b63a7d130ae5db41c2d76eaffa444d4 -RUN mkdir -p $GOPATH/src/github.com/rneugeba && \ - cd $GOPATH/src/github.com/rneugeba && \ - git clone https://github.com/rneugeba/virtsock.git -WORKDIR $GOPATH/src/github.com/rneugeba/virtsock +ENV VIRTSOCK_COMMIT=f1e32d3189e0dbb81c0e752a4e214617487eb41f +RUN mkdir -p $GOPATH/src/github.com/linuxkit && \ + cd $GOPATH/src/github.com/linuxkit && \ + git clone https://github.com/linuxkit/virtsock.git +WORKDIR $GOPATH/src/github.com/linuxkit/virtsock RUN git checkout $VIRTSOCK_COMMIT # Don't use go-compile.sh quite yet as the virtsock package is not yet lint free -RUN make build/virtsock_stress.linux && \ - cp -a build/virtsock_stress.linux /virtsock_stress +RUN make bin/sock_stress.linux && \ + cp -a bin/sock_stress.linux /sock_stress FROM scratch COPY --from=mirror /out/ / -COPY --from=build virtsock_stress usr/bin/virtsock_stress -CMD ["/sbin/tini", "/usr/bin/virtsock_stress", "-s", "-v", "1"] +COPY --from=build sock_stress usr/bin/sock_stress +CMD ["/sbin/tini", "/usr/bin/sock_stress", "-s", "-v", "1"]