github/linuxkit
1
0
Fork 0
mirror of https://github.com/linuxkit/linuxkit.git synced 2026-01-04 21:21:57 +00:00
Code Issues Projects Releases Wiki Activity

Update to runc ef9a4b315558d31eae520725ff67383c2f79c3cb

Browse Source 
This is compatible with containerd 8353da59c6ae7e1933aac2228df23541ef8b163f
which was picked up by d2caae4c1a.

This required jiggering with riddler output some more to update to new OCI
config.json format for capabilities.

Signed-off-by: Ian Campbell <ian.campbell@docker.com>
This commit is contained in:
Ian Campbell
2017-04-03 16:40:10 +01:00
parent 684ea64c73
commit 709402d780
11 changed files with 12 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
base/runc/Dockerfile
View File

@@ -10,7 +10,7 @@ RUN \
linux-headers \
make \
&& true
ENV RUNC_COMMIT=31980a53ae7887b2c8f8715d13c3eb486c27b6cf
ENV RUNC_COMMIT=ef9a4b315558d31eae520725ff67383c2f79c3cb
RUN mkdir -p $GOPATH/src/github.com/opencontainers && \
cd $GOPATH/src/github.com/opencontainers && \
git clone https://github.com/opencontainers/runc.git

2
examples/gcp.yml
View File

@@ -1,7 +1,7 @@
kernel:
image: "mobylinux/kernel:4.9.x"
cmdline: "console=ttyS0 page_poison=1"
init: "mobylinux/init:83b229223adbdd5ae38f39b4754e61b951529664"
init: "mobylinux/init:00c3a5bbfd9794f4a3187fcc4a9f0c826c46d474"
system:
- name: sysctl
image: "mobylinux/sysctl:2cf2f9d5b4d314ba1bfc22b2fe931924af666d8c"

2
examples/sshd.yml
View File

@@ -1,7 +1,7 @@
kernel:
image: "mobylinux/kernel:4.9.x"
cmdline: "console=ttyS0 page_poison=1"
init: "mobylinux/init:83b229223adbdd5ae38f39b4754e61b951529664"
init: "mobylinux/init:00c3a5bbfd9794f4a3187fcc4a9f0c826c46d474"
system:
- name: sysctl
image: "mobylinux/sysctl:2cf2f9d5b4d314ba1bfc22b2fe931924af666d8c"

2
examples/vmware.yml
View File

@@ -1,7 +1,7 @@
kernel:
image: "mobylinux/kernel:4.9.x"
cmdline: "console=tty0 page_poison=1"
init: "mobylinux/init:83b229223adbdd5ae38f39b4754e61b951529664"
init: "mobylinux/init:00c3a5bbfd9794f4a3187fcc4a9f0c826c46d474"
system:
- name: sysctl
image: "mobylinux/sysctl:2cf2f9d5b4d314ba1bfc22b2fe931924af666d8c"

2
moby.yml
View File

@@ -1,7 +1,7 @@
kernel:
image: "mobylinux/kernel:4.9.x"
cmdline: "console=ttyS0 console=tty0 page_poison=1"
init: "mobylinux/init:83b229223adbdd5ae38f39b4754e61b951529664"
init: "mobylinux/init:00c3a5bbfd9794f4a3187fcc4a9f0c826c46d474"
system:
- name: sysctl
image: "mobylinux/sysctl:2cf2f9d5b4d314ba1bfc22b2fe931924af666d8c"

2
pkg/init/Makefile
View File

@@ -1,7 +1,7 @@
CONTAINERD_IMAGE=mobylinux/containerd:a688df6aee1e3700eb8d54dbc81070361df397a2@sha256:59ee3da05fe4dad4fbecff582c86fc30ce75e19a225eeeb07e203c9cc36fe34f
CONTAINERD_BINARIES=usr/bin/containerd usr/bin/containerd-shim usr/bin/ctr usr/bin/dist
RUNC_IMAGE=mobylinux/runc:94c54debf9a3ebb6d31311bdddb881ea07486dcd@sha256:13cabc1017c6448498e74bae9892ebc9dbad9e5d68f7df6b3855a15522e3a86b
RUNC_IMAGE=mobylinux/runc:45884ad2bfad045cbf35f2b78b4c82f75fb19854@sha256:d7c4576405f2318d329f538f847927018d4e8497d7968bd3323ff047e2ffe257
RUNC_BINARY=usr/bin/runc
C_COMPILE=mobylinux/c-compile:81a6bd8ff45d769b60a2ee1acdaccda11ab835c8@sha256:eac250997a3b9784d3285a03c0c8311d4ca6fb63dc75164c987411ba93006487

2
src/cmd/moby/config.go
View File

@@ -51,7 +51,7 @@ type MobyImage struct {
ReadOnly bool `yaml:"read_only"`
}
const riddler = "mobylinux/riddler:2b4051422b155f659019f9e3fef8cca04e153f5c@sha256:f4bb0c39f1e5c636ed52ebd3ed8ec447ca6c0dc554ffb5784cbeff423ac70d34"
const riddler = "mobylinux/riddler:decf6c9e24b579175a038a76f9721e7aca507abd@sha256:9d24a7c48204b94b5d76cc3d6cf70f779d87d08d8a893169292c98d0e19ab579"
// NewConfig parses a config file
func NewConfig(config []byte) (*Moby, error) {

2
test/ltp/test-ltp.yml
View File

@@ -1,7 +1,7 @@
kernel:
image: "mobylinux/kernel:4.9.x"
cmdline: "console=ttyS0"
init: "mobylinux/init:83b229223adbdd5ae38f39b4754e61b951529664"
init: "mobylinux/init:00c3a5bbfd9794f4a3187fcc4a9f0c826c46d474"
system:
- name: ltp
image: "mobylinux/test-ltp-20170116:fdca2d1bb019b1d51e722e6032c82c7933d4b870"

2
test/test.yml
View File

@@ -1,7 +1,7 @@
kernel:
image: "mobylinux/kernel:4.9.x"
cmdline: "console=ttyS0"
init: "mobylinux/init:83b229223adbdd5ae38f39b4754e61b951529664"
init: "mobylinux/init:00c3a5bbfd9794f4a3187fcc4a9f0c826c46d474"
system:
- name: binfmt
image: "mobylinux/binfmt:bdb754f25a5d851b4f5f8d185a43dfcbb3c22d01"

2
test/virtsock/test-virtsock-server.yml
View File

@@ -5,7 +5,7 @@ kernel:
# image: "mobylinux/kernel:4.9.14-0"
image: "mobylinux/kernel:4.9.x"
cmdline: "console=ttyS0 page_poison=1"
init: "mobylinux/init:83b229223adbdd5ae38f39b4754e61b951529664"
init: "mobylinux/init:00c3a5bbfd9794f4a3187fcc4a9f0c826c46d474"
system:
- name: sysctl
image: "mobylinux/sysctl:2cf2f9d5b4d314ba1bfc22b2fe931924af666d8c"

3
tools/riddler/riddler.sh
View File

@@ -42,7 +42,8 @@ cat config.json.orig | \
jq 'del (.linux.resources.memory.swappiness)' | \
jq 'del(.linux.uidMappings) | del(.linux.gidMappings) | .linux.namespaces = (.linux.namespaces|map(select(.type!="user")))' | \
jq 'if .root.readonly==true then .mounts = (.mounts|map(if .destination=="/dev" then .options |= .+ ["ro"] else . end)) else . end' | \
jq '.mounts = if .process.capabilities | length != 38 then (.mounts|map(if .destination=="/sys" then .options |= .+ ["ro"] else . end)) else . end' \
jq '.mounts = if .process.capabilities | length != 38 then (.mounts|map(if .destination=="/sys" then .options |= .+ ["ro"] else . end)) else . end' | \
jq '.process.capabilities = { bounding: .process.capabilities, effective: .process.capabilities, ambient: .process.capabilities, inheritable: .process.capabilities, permitted: .process.capabilities }' \
> config.json
cat config.json