mirror of
https://github.com/linuxkit/linuxkit.git
synced 2025-07-22 18:41:37 +00:00
test: Move virtsock use the linuxkit org
Signed-off-by: Rolf Neugebauer <rolf.neugebauer@docker.com>
This commit is contained in:
parent
60ccc23512
commit
ee641ba03c
@ -28,15 +28,15 @@ hash: Dockerfile.pkg $(DEPS)
|
|||||||
find $^ -type f | xargs cat | DOCKER_CONTENT_TRUST=1 docker run --rm -i $(SHASUM) sha1sum | sed 's/ .*//' > $@
|
find $^ -type f | xargs cat | DOCKER_CONTENT_TRUST=1 docker run --rm -i $(SHASUM) sha1sum | sed 's/ .*//' > $@
|
||||||
|
|
||||||
push: hash container
|
push: hash container
|
||||||
docker pull mobylinux/$(IMAGE):$(shell cat hash) || \
|
docker pull linuxkit/$(IMAGE):$(shell cat hash) || \
|
||||||
(docker tag $(IMAGE):build mobylinux/$(IMAGE):$(shell cat hash) && \
|
(docker tag $(IMAGE):build linuxkit/$(IMAGE):$(shell cat hash) && \
|
||||||
docker push mobylinux/$(IMAGE):$(shell cat hash))
|
docker push linuxkit/$(IMAGE):$(shell cat hash))
|
||||||
docker rmi $(IMAGE):build
|
docker rmi $(IMAGE):build
|
||||||
rm -f hash
|
rm -f hash
|
||||||
|
|
||||||
tag: hash container
|
tag: hash container
|
||||||
docker pull mobylinux/$(IMAGE):$(shell cat hash) || \
|
docker pull linuxkit/$(IMAGE):$(shell cat hash) || \
|
||||||
docker tag $(IMAGE):build mobylinux/$(IMAGE):$(shell cat hash)
|
docker tag $(IMAGE):build linuxkit/$(IMAGE):$(shell cat hash)
|
||||||
docker rmi $(IMAGE):build
|
docker rmi $(IMAGE):build
|
||||||
rm -f hash
|
rm -f hash
|
||||||
|
|
||||||
|
@ -1,18 +1,18 @@
|
|||||||
kernel:
|
kernel:
|
||||||
# Alternatively:
|
# Alternatively:
|
||||||
# image: "mobylinux/kernel:4.10.4-0"
|
# image: "linuxkit/kernel:4.10.4-0"
|
||||||
# image: "mobylinux/kernel:4.9.16-1"
|
# image: "linuxkit/kernel:4.9.16-1"
|
||||||
# image: "mobylinux/kernel:4.9.14-0"
|
# image: "linuxkit/kernel:4.9.14-0"
|
||||||
image: "mobylinux/kernel:4.9.x"
|
image: "linuxkit/kernel:4.9.x"
|
||||||
cmdline: "console=ttyS0 page_poison=1"
|
cmdline: "console=ttyS0 page_poison=1"
|
||||||
init:
|
init:
|
||||||
- linuxkit/init:63eed9ca7a09d2ce4c0c5e7238ac005fa44f564b
|
- linuxkit/init:63eed9ca7a09d2ce4c0c5e7238ac005fa44f564b
|
||||||
- mobylinux/runc:b0fb122e10dbb7e4e45115177a61a3f8d68c19a9
|
- linuxkit/runc:b0fb122e10dbb7e4e45115177a61a3f8d68c19a9
|
||||||
- mobylinux/containerd:18eaf72f3f4f9a9f29ca1951f66df701f873060b
|
- linuxkit/containerd:18eaf72f3f4f9a9f29ca1951f66df701f873060b
|
||||||
- mobylinux/ca-certificates:eabc5a6e59f05aa91529d80e9a595b85b046f935
|
- linuxkit/ca-certificates:eabc5a6e59f05aa91529d80e9a595b85b046f935
|
||||||
onboot:
|
onboot:
|
||||||
- name: sysctl
|
- name: sysctl
|
||||||
image: "mobylinux/sysctl:2cf2f9d5b4d314ba1bfc22b2fe931924af666d8c"
|
image: "linuxkit/sysctl:1f5ec5d5e6f7a7a1b3d2ff9dd9e36fd6fb14756a"
|
||||||
net: host
|
net: host
|
||||||
pid: host
|
pid: host
|
||||||
ipc: host
|
ipc: host
|
||||||
@ -21,7 +21,7 @@ onboot:
|
|||||||
readonly: true
|
readonly: true
|
||||||
services:
|
services:
|
||||||
- name: rngd
|
- name: rngd
|
||||||
image: "mobylinux/rngd:3dad6dd43270fa632ac031e99d1947f20b22eec9"
|
image: "linuxkit/rngd:f5e5be43e730ea819c3293d5c6dcbfa7f4c5c314"
|
||||||
capabilities:
|
capabilities:
|
||||||
- CAP_SYS_ADMIN
|
- CAP_SYS_ADMIN
|
||||||
oomScoreAdj: -800
|
oomScoreAdj: -800
|
||||||
@ -38,7 +38,7 @@ services:
|
|||||||
net: host
|
net: host
|
||||||
oomScoreAdj: -800
|
oomScoreAdj: -800
|
||||||
- name: virtsock-server
|
- name: virtsock-server
|
||||||
image: "mobylinux/test-virtsock:35fea96fd01f6edb67021c494ddf098fdb8bbca0"
|
image: "linuxkit/test-virtsock:cd2135acdc225f3bd0503678bb50bbd3e0b194b2"
|
||||||
readonly: true
|
readonly: true
|
||||||
outputs:
|
outputs:
|
||||||
- format: kernel+initrd
|
- format: kernel+initrd
|
||||||
|
Loading…
Reference in New Issue
Block a user