github/linuxkit
1
0
Fork 0
mirror of https://github.com/linuxkit/linuxkit.git synced 2025-12-25 06:22:40 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #3150 from djs55/revendor-virtsock

Browse Source 
Update the vendoring of virtsock
This commit is contained in:
Rolf Neugebauer
2018-08-13 17:46:00 +02:00
committed by GitHub
parent 972c41c4fa 4f389eb5a6
commit 50904b9f9d
73 changed files with 83 additions and 83 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
test/pkg/ns/Dockerfile
View File

@@ -15,7 +15,7 @@ RUN apk add --no-cache \
go \
musl-dev
ENV GOPATH=/go PATH=$PATH:/go/bin
ENV VIRTSOCK_COMMIT=0416e3d85541e7a067fd000c69f50997b5d47c93
ENV VIRTSOCK_COMMIT=f1e32d3189e0dbb81c0e752a4e214617487eb41f
RUN git clone https://github.com/linuxkit/virtsock.git /go/src/github.com/linuxkit/virtsock && \
cd /go/src/github.com/linuxkit/virtsock && \
git checkout $VIRTSOCK_COMMIT && \

18
test/pkg/virtsock/Dockerfile
View File

@@ -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"]