Merge pull request #1798 from rneugeba/virtsock

Update virtsock test
This commit is contained in:
Rolf Neugebauer 2017-05-10 13:45:14 +01:00 committed by GitHub
commit 3efdc694c5
2 changed files with 5 additions and 6 deletions

View File

@ -1,9 +1,9 @@
kernel: kernel:
# Alternatively: # Alternatively:
# image: "linuxkit/kernel:4.10.4-0" #image: "linuxkit/kernel:4.11.x"
# image: "linuxkit/kernel:4.9.16-1" # image: "linuxkit/kernel:4.10.x"
# image: "linuxkit/kernel:4.9.14-0"
image: "linuxkit/kernel:4.9.x" image: "linuxkit/kernel:4.9.x"
# image: "linuxkit/kernel:4.4.x"
cmdline: "console=ttyS0 page_poison=1" cmdline: "console=ttyS0 page_poison=1"
init: init:
- linuxkit/init:63eed9ca7a09d2ce4c0c5e7238ac005fa44f564b - linuxkit/init:63eed9ca7a09d2ce4c0c5e7238ac005fa44f564b
@ -38,7 +38,7 @@ services:
net: host net: host
oomScoreAdj: -800 oomScoreAdj: -800
- name: virtsock-server - name: virtsock-server
image: "linuxkit/test-virtsock:bac78d3bffa55b9ab00eb023c32512e260d7fed0" image: "linuxkit/test-virtsock:a7dc8e477d99ea82f56eacd94579ca65985eb0b3"
readonly: true readonly: true
trust: trust:
image: image:
@ -46,5 +46,4 @@ trust:
- linuxkit/rngd - linuxkit/rngd
outputs: outputs:
- format: kernel+initrd - format: kernel+initrd
- format: iso-bios
- format: iso-efi - format: iso-efi

View File

@ -1,6 +1,6 @@
FROM linuxkit/go-compile:4513068d9a7e919e4ec42e2d7ee879ff5b95b7f5@sha256:bdfadbe3e4ec699ca45b67453662321ec270f2d1a1dbdbf09625776d3ebd68c5 AS virtsock-build FROM linuxkit/go-compile:4513068d9a7e919e4ec42e2d7ee879ff5b95b7f5@sha256:bdfadbe3e4ec699ca45b67453662321ec270f2d1a1dbdbf09625776d3ebd68c5 AS virtsock-build
ENV VIRTSOCK_COMMIT=6b4dec728264e07c41e108caebd6bc2b72559a5f ENV VIRTSOCK_COMMIT=3bfdf22e3b63a7d130ae5db41c2d76eaffa444d4
RUN mkdir -p $GOPATH/src/github.com/rneugeba && \ RUN mkdir -p $GOPATH/src/github.com/rneugeba && \
cd $GOPATH/src/github.com/rneugeba && \ cd $GOPATH/src/github.com/rneugeba && \
git clone https://github.com/rneugeba/virtsock.git git clone https://github.com/rneugeba/virtsock.git