github/linuxkit
1
0
Fork 0
mirror of https://github.com/linuxkit/linuxkit.git synced 2025-07-20 17:49:10 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #2258 from ijc/containerd-v1.0.0-alpha1

Browse Source 
Containerd v1.0.0 alpha1
This commit is contained in:
Justin Cormack 2017-07-20 15:07:24 +01:00 committed by GitHub
commit 5545f3085a
45 changed files with 84 additions and 79 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile
View File

@ -20,7 +20,7 @@ endif
PREFIX?=/usr/local/
MOBY_COMMIT=a261a33812ec2ba6650dc0b16353f537ade66355
MOBY_COMMIT=8e720bff08cb9f20488d1ae6f114a5b1e4edf9cd
MOBY_VERSION=0.0
bin/moby: tmp_moby_bin.tar | bin
tar xf $<

4
blueprints/docker-for-mac/base.yml
View File

@ -6,7 +6,7 @@ init:
- linuxkit/vpnkit-expose-port:e2b49a6c56fbf876ea24f0a5ce4ccae5f940d1be # install vpnkit-expose-port and vpnkit-iptables-wrapper on host
- linuxkit/init:d049e7b2074da5cd699a27defb47eb101142455d
- linuxkit/runc:d5cbeb95bdafedb82ad2cf11cff1a5da7fcae630
- linuxkit/containerd:b6ffbb669248e3369081a6c4427026aa968a2385
- linuxkit/containerd:e33e0534d6fca88e1eb86897a1ea410b4a5d722e
onboot:
# support metadata for optional config in /var/config
- name: metadata
@ -53,7 +53,7 @@ services:
image: linuxkit/acpid:1966310cb75e28ffc668863a6577ee991327f918
# Enable getty for easier debugging
- name: getty
image: linuxkit/getty:0a2955f3d7a10a0e71972791c3ba6400118f327e
image: linuxkit/getty:9c32352b2a7b2f233de8741396afeb26b58f9a05
env:
- INSECURE=true
# Run ntpd to keep time synchronised in the VM

4
examples/aws.yml
View File

@ -4,7 +4,7 @@ kernel:
init:
- linuxkit/init:d049e7b2074da5cd699a27defb47eb101142455d
- linuxkit/runc:d5cbeb95bdafedb82ad2cf11cff1a5da7fcae630
- linuxkit/containerd:b6ffbb669248e3369081a6c4427026aa968a2385
- linuxkit/containerd:e33e0534d6fca88e1eb86897a1ea410b4a5d722e
- linuxkit/ca-certificates:67acf038c44bb191ebb704ec7bb39a1524052cdf
onboot:
- name: sysctl
@ -18,7 +18,7 @@ services:
- name: rngd
image: linuxkit/rngd:1516d5d70683a5d925fe475eb1b6164a2f67ac3b
- name: sshd
image: linuxkit/sshd:89b2e91d7d1bf2f40220be0e3ed586e74746cceb
image: linuxkit/sshd:a00846032891f77f4f78b8a197e94e13a476a3ee
binds:
- /var/config/ssh/authorized_keys:/root/.ssh/authorized_keys
- name: nginx

4
examples/azure.yml
View File

@ -4,7 +4,7 @@ kernel:
init:
- linuxkit/init:d049e7b2074da5cd699a27defb47eb101142455d
- linuxkit/runc:d5cbeb95bdafedb82ad2cf11cff1a5da7fcae630
- linuxkit/containerd:b6ffbb669248e3369081a6c4427026aa968a2385
- linuxkit/containerd:e33e0534d6fca88e1eb86897a1ea410b4a5d722e
- linuxkit/ca-certificates:67acf038c44bb191ebb704ec7bb39a1524052cdf
onboot:
- name: sysctl
@ -15,7 +15,7 @@ services:
- name: dhcpcd
image: linuxkit/dhcpcd:4b7b8bb024cebb1bbb9c8026d44d7cbc8e202c41
- name: sshd
image: linuxkit/sshd:89b2e91d7d1bf2f40220be0e3ed586e74746cceb
image: linuxkit/sshd:a00846032891f77f4f78b8a197e94e13a476a3ee
files:
- path: root/.ssh/authorized_keys
source: ~/.ssh/id_rsa.pub

4
examples/docker.yml
View File

@ -4,7 +4,7 @@ kernel:
init:
- linuxkit/init:d049e7b2074da5cd699a27defb47eb101142455d
- linuxkit/runc:d5cbeb95bdafedb82ad2cf11cff1a5da7fcae630
- linuxkit/containerd:b6ffbb669248e3369081a6c4427026aa968a2385
- linuxkit/containerd:e33e0534d6fca88e1eb86897a1ea410b4a5d722e
- linuxkit/ca-certificates:67acf038c44bb191ebb704ec7bb39a1524052cdf
onboot:
- name: sysctl
@ -20,7 +20,7 @@ onboot:
command: ["/mount.sh", "/var/lib/docker"]
services:
- name: getty
image: linuxkit/getty:0a2955f3d7a10a0e71972791c3ba6400118f327e
image: linuxkit/getty:9c32352b2a7b2f233de8741396afeb26b58f9a05
env:
- INSECURE=true
- name: rngd

6
examples/gcp.yml
View File

@ -4,7 +4,7 @@ kernel:
init:
- linuxkit/init:d049e7b2074da5cd699a27defb47eb101142455d
- linuxkit/runc:d5cbeb95bdafedb82ad2cf11cff1a5da7fcae630
- linuxkit/containerd:b6ffbb669248e3369081a6c4427026aa968a2385
- linuxkit/containerd:e33e0534d6fca88e1eb86897a1ea410b4a5d722e
- linuxkit/ca-certificates:67acf038c44bb191ebb704ec7bb39a1524052cdf
onboot:
- name: sysctl
@ -16,13 +16,13 @@ onboot:
image: linuxkit/metadata:428093dd1c4178e8ba1952af44b46c0fd16f8e79
services:
- name: getty
image: linuxkit/getty:0a2955f3d7a10a0e71972791c3ba6400118f327e
image: linuxkit/getty:9c32352b2a7b2f233de8741396afeb26b58f9a05
env:
- INSECURE=true
- name: rngd
image: linuxkit/rngd:1516d5d70683a5d925fe475eb1b6164a2f67ac3b
- name: sshd
image: linuxkit/sshd:89b2e91d7d1bf2f40220be0e3ed586e74746cceb
image: linuxkit/sshd:a00846032891f77f4f78b8a197e94e13a476a3ee
binds:
- /var/config/ssh/authorized_keys:/root/.ssh/authorized_keys
- name: nginx

4
examples/getty.yml
View File

@ -4,7 +4,7 @@ kernel:
init:
- linuxkit/init:d049e7b2074da5cd699a27defb47eb101142455d
- linuxkit/runc:d5cbeb95bdafedb82ad2cf11cff1a5da7fcae630
- linuxkit/containerd:b6ffbb669248e3369081a6c4427026aa968a2385
- linuxkit/containerd:e33e0534d6fca88e1eb86897a1ea410b4a5d722e
- linuxkit/ca-certificates:67acf038c44bb191ebb704ec7bb39a1524052cdf
onboot:
- name: sysctl
@ -14,7 +14,7 @@ onboot:
command: ["/sbin/dhcpcd", "--nobackground", "-f", "/dhcpcd.conf", "-1"]
services:
- name: getty
image: linuxkit/getty:0a2955f3d7a10a0e71972791c3ba6400118f327e
image: linuxkit/getty:9c32352b2a7b2f233de8741396afeb26b58f9a05
# to make insecure with passwordless root login, uncomment following lines
#env:
# - INSECURE=true

4
examples/minimal.yml
View File

@ -4,14 +4,14 @@ kernel:
init:
- linuxkit/init:d049e7b2074da5cd699a27defb47eb101142455d
- linuxkit/runc:d5cbeb95bdafedb82ad2cf11cff1a5da7fcae630
- linuxkit/containerd:b6ffbb669248e3369081a6c4427026aa968a2385
- linuxkit/containerd:e33e0534d6fca88e1eb86897a1ea410b4a5d722e
onboot:
- name: dhcpcd
image: linuxkit/dhcpcd:4b7b8bb024cebb1bbb9c8026d44d7cbc8e202c41
command: ["/sbin/dhcpcd", "--nobackground", "-f", "/dhcpcd.conf", "-1"]
services:
- name: getty
image: linuxkit/getty:0a2955f3d7a10a0e71972791c3ba6400118f327e
image: linuxkit/getty:9c32352b2a7b2f233de8741396afeb26b58f9a05
env:
- INSECURE=true
trust:

4
examples/node_exporter.yml
View File

@ -4,10 +4,10 @@ kernel:
init:
- linuxkit/init:d049e7b2074da5cd699a27defb47eb101142455d
- linuxkit/runc:d5cbeb95bdafedb82ad2cf11cff1a5da7fcae630
- linuxkit/containerd:b6ffbb669248e3369081a6c4427026aa968a2385
- linuxkit/containerd:e33e0534d6fca88e1eb86897a1ea410b4a5d722e
services:
- name: getty
image: linuxkit/getty:0a2955f3d7a10a0e71972791c3ba6400118f327e
image: linuxkit/getty:9c32352b2a7b2f233de8741396afeb26b58f9a05
env:
- INSECURE=true
- name: rngd

4
examples/packet.yml
View File

@ -4,7 +4,7 @@ kernel:
init:
- linuxkit/init:d049e7b2074da5cd699a27defb47eb101142455d
- linuxkit/runc:d5cbeb95bdafedb82ad2cf11cff1a5da7fcae630
- linuxkit/containerd:b6ffbb669248e3369081a6c4427026aa968a2385
- linuxkit/containerd:e33e0534d6fca88e1eb86897a1ea410b4a5d722e
- linuxkit/ca-certificates:67acf038c44bb191ebb704ec7bb39a1524052cdf
onboot:
- name: sysctl
@ -15,7 +15,7 @@ services:
- name: dhcpcd
image: linuxkit/dhcpcd:4b7b8bb024cebb1bbb9c8026d44d7cbc8e202c41
- name: sshd
image: linuxkit/sshd:89b2e91d7d1bf2f40220be0e3ed586e74746cceb
image: linuxkit/sshd:a00846032891f77f4f78b8a197e94e13a476a3ee
files:
- path: root/.ssh/authorized_keys
source: ~/.ssh/id_rsa.pub

4
examples/redis-os.yml
View File

@ -6,14 +6,14 @@ kernel:
init:
- linuxkit/init:d049e7b2074da5cd699a27defb47eb101142455d
- linuxkit/runc:d5cbeb95bdafedb82ad2cf11cff1a5da7fcae630
- linuxkit/containerd:b6ffbb669248e3369081a6c4427026aa968a2385
- linuxkit/containerd:e33e0534d6fca88e1eb86897a1ea410b4a5d722e
onboot:
- name: dhcpcd
image: linuxkit/dhcpcd:4b7b8bb024cebb1bbb9c8026d44d7cbc8e202c41
command: ["/sbin/dhcpcd", "--nobackground", "-f", "/dhcpcd.conf", "-1"]
services:
- name: getty
image: linuxkit/getty:0a2955f3d7a10a0e71972791c3ba6400118f327e
image: linuxkit/getty:9c32352b2a7b2f233de8741396afeb26b58f9a05
env:
- INSECURE=true
- name: redis

6
examples/sshd.yml
View File

@ -4,14 +4,14 @@ kernel:
init:
- linuxkit/init:d049e7b2074da5cd699a27defb47eb101142455d
- linuxkit/runc:d5cbeb95bdafedb82ad2cf11cff1a5da7fcae630
- linuxkit/containerd:b6ffbb669248e3369081a6c4427026aa968a2385
- linuxkit/containerd:e33e0534d6fca88e1eb86897a1ea410b4a5d722e
- linuxkit/ca-certificates:67acf038c44bb191ebb704ec7bb39a1524052cdf
onboot:
- name: sysctl
image: linuxkit/sysctl:d1a43c7c91e92374766f962dc8534cf9508756b0
services:
- name: getty
image: linuxkit/getty:0a2955f3d7a10a0e71972791c3ba6400118f327e
image: linuxkit/getty:9c32352b2a7b2f233de8741396afeb26b58f9a05
env:
- INSECURE=true
- name: rngd
@ -19,7 +19,7 @@ services:
- name: dhcpcd
image: linuxkit/dhcpcd:4b7b8bb024cebb1bbb9c8026d44d7cbc8e202c41
- name: sshd
image: linuxkit/sshd:89b2e91d7d1bf2f40220be0e3ed586e74746cceb
image: linuxkit/sshd:a00846032891f77f4f78b8a197e94e13a476a3ee
files:
- path: root/.ssh/authorized_keys
source: ~/.ssh/id_rsa.pub

4
examples/swap.yml
View File

@ -4,7 +4,7 @@ kernel:
init:
- linuxkit/init:d049e7b2074da5cd699a27defb47eb101142455d
- linuxkit/runc:d5cbeb95bdafedb82ad2cf11cff1a5da7fcae630
- linuxkit/containerd:b6ffbb669248e3369081a6c4427026aa968a2385
- linuxkit/containerd:e33e0534d6fca88e1eb86897a1ea410b4a5d722e
- linuxkit/ca-certificates:eabc5a6e59f05aa91529d80e9a595b85b046f935
onboot:
- name: sysctl
@ -24,7 +24,7 @@ onboot:
command: ["/swap.sh", "--path", "/var/external/swap", "--size", "1G", "--encrypt"]
services:
- name: getty
image: linuxkit/getty:0a2955f3d7a10a0e71972791c3ba6400118f327e
image: linuxkit/getty:9c32352b2a7b2f233de8741396afeb26b58f9a05
env:
- INSECURE=true
- name: rngd

4
examples/vmware.yml
View File

@ -4,14 +4,14 @@ kernel:
init:
- linuxkit/init:d049e7b2074da5cd699a27defb47eb101142455d
- linuxkit/runc:d5cbeb95bdafedb82ad2cf11cff1a5da7fcae630
- linuxkit/containerd:b6ffbb669248e3369081a6c4427026aa968a2385
- linuxkit/containerd:e33e0534d6fca88e1eb86897a1ea410b4a5d722e
- linuxkit/ca-certificates:67acf038c44bb191ebb704ec7bb39a1524052cdf
onboot:
- name: sysctl
image: linuxkit/sysctl:d1a43c7c91e92374766f962dc8534cf9508756b0
services:
- name: getty
image: linuxkit/getty:0a2955f3d7a10a0e71972791c3ba6400118f327e
image: linuxkit/getty:9c32352b2a7b2f233de8741396afeb26b58f9a05
env:
- INSECURE=true
- name: rngd

4
examples/vpnkit-forwarder.yml
View File

@ -4,7 +4,7 @@ kernel:
init:
- linuxkit/init:d049e7b2074da5cd699a27defb47eb101142455d
- linuxkit/runc:d5cbeb95bdafedb82ad2cf11cff1a5da7fcae630
- linuxkit/containerd:b6ffbb669248e3369081a6c4427026aa968a2385
- linuxkit/containerd:e33e0534d6fca88e1eb86897a1ea410b4a5d722e
onboot:
- name: dhcpcd
image: linuxkit/dhcpcd:4b7b8bb024cebb1bbb9c8026d44d7cbc8e202c41
@ -19,7 +19,7 @@ onboot:
command: ["sh", "-c", "mkdir /host_var/vpnkit && mount -v -t 9p -o trans=virtio,dfltuid=1001,dfltgid=50,version=9p2000 port /host_var/vpnkit"]
services:
- name: sshd
image: linuxkit/sshd:89b2e91d7d1bf2f40220be0e3ed586e74746cceb
image: linuxkit/sshd:a00846032891f77f4f78b8a197e94e13a476a3ee
- name: vpnkit-forwarder
image: linuxkit/vpnkit-forwarder:9c1545e7b093d1210118de7661d7346393ec195b
binds:

2
examples/vsudd.yml
View File

@ -4,7 +4,7 @@ kernel:
init:
- linuxkit/init:d049e7b2074da5cd699a27defb47eb101142455d
- linuxkit/runc:d5cbeb95bdafedb82ad2cf11cff1a5da7fcae630
- linuxkit/containerd:b6ffbb669248e3369081a6c4427026aa968a2385
- linuxkit/containerd:e33e0534d6fca88e1eb86897a1ea410b4a5d722e
onboot:
- name: dhcpcd
image: linuxkit/dhcpcd:4b7b8bb024cebb1bbb9c8026d44d7cbc8e202c41

6
examples/vultr.yml
View File

@ -4,7 +4,7 @@ kernel:
init:
- linuxkit/init:d049e7b2074da5cd699a27defb47eb101142455d
- linuxkit/runc:d5cbeb95bdafedb82ad2cf11cff1a5da7fcae630
- linuxkit/containerd:b6ffbb669248e3369081a6c4427026aa968a2385
- linuxkit/containerd:e33e0534d6fca88e1eb86897a1ea410b4a5d722e
- linuxkit/ca-certificates:67acf038c44bb191ebb704ec7bb39a1524052cdf
onboot:
- name: sysctl
@ -16,13 +16,13 @@ onboot:
image: linuxkit/metadata:428093dd1c4178e8ba1952af44b46c0fd16f8e79
services:
- name: getty
image: linuxkit/getty:0a2955f3d7a10a0e71972791c3ba6400118f327e
image: linuxkit/getty:9c32352b2a7b2f233de8741396afeb26b58f9a05
env:
- INSECURE=true
- name: rngd
image: linuxkit/rngd:1516d5d70683a5d925fe475eb1b6164a2f67ac3b
- name: sshd
image: linuxkit/sshd:89b2e91d7d1bf2f40220be0e3ed586e74746cceb
image: linuxkit/sshd:a00846032891f77f4f78b8a197e94e13a476a3ee
binds:
- /var/config/ssh/authorized_keys:/root/.ssh/authorized_keys
- name: nginx

4
linuxkit.yml
View File

@ -4,7 +4,7 @@ kernel:
init:
- linuxkit/init:d049e7b2074da5cd699a27defb47eb101142455d
- linuxkit/runc:d5cbeb95bdafedb82ad2cf11cff1a5da7fcae630
- linuxkit/containerd:b6ffbb669248e3369081a6c4427026aa968a2385
- linuxkit/containerd:e33e0534d6fca88e1eb86897a1ea410b4a5d722e
- linuxkit/ca-certificates:67acf038c44bb191ebb704ec7bb39a1524052cdf
onboot:
- name: sysctl
@ -20,7 +20,7 @@ onshutdown:
command: ["/bin/echo", "so long and thanks for all the fish"]
services:
- name: getty
image: linuxkit/getty:0a2955f3d7a10a0e71972791c3ba6400118f327e
image: linuxkit/getty:9c32352b2a7b2f233de8741396afeb26b58f9a05
env:
- INSECURE=true
- name: rngd

6
pkg/containerd/Dockerfile
View File

@ -1,4 +1,4 @@
FROM linuxkit/alpine:6832775a7e861ee2d7842e157688ece52d007142 as alpine
FROM linuxkit/alpine:a39a433162a873519910a07beeb3e8db22529956 as alpine
RUN \
apk add \
btrfs-progs-dev \
@ -18,7 +18,7 @@ RUN mkdir -p $GOPATH/src/github.com/containerd && \
WORKDIR $GOPATH/src/github.com/containerd/containerd
RUN git checkout $CONTAINERD_COMMIT
RUN make binaries EXTRA_FLAGS="-buildmode pie" EXTRA_LDFLAGS="-extldflags \\\"-fno-PIC -static\\\""
RUN cp bin/containerd bin/ctr bin/containerd-shim bin/dist /usr/bin/
RUN cp bin/containerd bin/ctr bin/containerd-shim /usr/bin/
ADD cmd /go/src/cmd
RUN cd /go/src/cmd/service && ./skanky-vendor.sh $GOPATH/src/github.com/containerd/containerd
@ -30,7 +30,7 @@ COPY . .
FROM scratch
ENTRYPOINT []
WORKDIR /
COPY --from=alpine /usr/bin/containerd /usr/bin/ctr /usr/bin/dist /usr/bin/containerd-shim /go/bin/service /usr/bin/
COPY --from=alpine /usr/bin/containerd /usr/bin/ctr /usr/bin/containerd-shim /go/bin/service /usr/bin/
COPY --from=alpine /etc/containerd/config.toml /etc/containerd/
COPY --from=alpine /usr/share/zoneinfo/UTC /etc/localtime
COPY etc etc/

5
pkg/containerd/cmd/service/system_init.go
View File

@ -10,6 +10,7 @@ import (
log "github.com/Sirupsen/logrus"
"github.com/containerd/containerd"
"github.com/containerd/containerd/errdefs"
"github.com/containerd/containerd/namespaces"
"github.com/pkg/errors"
)
@ -17,7 +18,7 @@ import (
func cleanupTask(ctx context.Context, ctr containerd.Container) error {
task, err := ctr.Task(ctx, nil)
if err != nil {
if err == containerd.ErrNoRunningTask {
if errdefs.IsNotFound(err) {
return nil
}
return errors.Wrap(err, "getting task")
@ -36,7 +37,7 @@ func cleanupTask(ctx context.Context, ctr containerd.Container) error {
}(deleteCtx, deleteErr)
sig := syscall.SIGKILL
if err := task.Kill(ctx, sig); err != nil && err != containerd.ErrProcessExited {
if err := task.Kill(ctx, sig); err != nil && !errdefs.IsNotFound(err) {
return errors.Wrapf(err, "killing task with %q", sig)
}

2
pkg/getty/Dockerfile
View File

@ -29,4 +29,4 @@ COPY --from=mirror /out/ /
COPY usr/ /usr/
COPY etc/ /etc/
CMD ["/usr/bin/rungetty.sh"]
LABEL org.mobyproject.config='{"pid": "host", "net":"host", "binds": ["/run:/run", "/tmp:/tmp", "/etc:/hostroot/etc", "/usr/bin/ctr:/usr/bin/ctr", "/usr/bin/runc:/usr/bin/runc", "/usr/bin/dist:/usr/bin/dist", "/var:/var","/containers:/containers","/dev:/dev","/sys:/sys"], "capabilities": ["all"]}'
LABEL org.mobyproject.config='{"pid": "host", "net":"host", "binds": ["/run:/run", "/tmp:/tmp", "/etc:/hostroot/etc", "/usr/bin/ctr:/usr/bin/ctr", "/usr/bin/runc:/usr/bin/runc", "/var:/var","/containers:/containers","/dev:/dev","/sys:/sys"], "capabilities": ["all"]}'

2
pkg/sshd/Dockerfile
View File

@ -20,4 +20,4 @@ COPY etc/ /etc/
COPY usr/ /usr/
RUN mkdir -p /etc/ssh /root/.ssh && chmod 0700 /root/.ssh
CMD ["/sbin/tini", "/usr/bin/ssh.sh"]
LABEL org.mobyproject.config='{"pid": "host", "binds": ["/root/.ssh:/root/.ssh", "/etc/resolv.conf:/etc/resolv.conf", "/run:/run", "/tmp:/tmp", "/etc:/hostroot/etc", "/usr/bin/ctr:/usr/bin/ctr", "/usr/bin/runc:/usr/bin/runc", "/usr/bin/dist:/usr/bin/dist", "/var:/var","/containers:/containers","/dev:/dev","/sys:/sys"], "capabilities": ["all"]}'
LABEL org.mobyproject.config='{"pid": "host", "binds": ["/root/.ssh:/root/.ssh", "/etc/resolv.conf:/etc/resolv.conf", "/run:/run", "/tmp:/tmp", "/etc:/hostroot/etc", "/usr/bin/ctr:/usr/bin/ctr", "/usr/bin/runc:/usr/bin/runc", "/var:/var","/containers:/containers","/dev:/dev","/sys:/sys"], "capabilities": ["all"]}'

2
projects/compose/compose-dynamic.yml
View File

@ -4,7 +4,7 @@ kernel:
init:
- linuxkit/init:d049e7b2074da5cd699a27defb47eb101142455d
- linuxkit/runc:d5cbeb95bdafedb82ad2cf11cff1a5da7fcae630
- linuxkit/containerd:b6ffbb669248e3369081a6c4427026aa968a2385
- linuxkit/containerd:e33e0534d6fca88e1eb86897a1ea410b4a5d722e
- linuxkit/ca-certificates:67acf038c44bb191ebb704ec7bb39a1524052cdf
onboot:
- name: sysctl

2
projects/compose/compose-static.yml
View File

@ -4,7 +4,7 @@ kernel:
init:
- linuxkit/init:d049e7b2074da5cd699a27defb47eb101142455d
- linuxkit/runc:d5cbeb95bdafedb82ad2cf11cff1a5da7fcae630
- linuxkit/containerd:b6ffbb669248e3369081a6c4427026aa968a2385
- linuxkit/containerd:e33e0534d6fca88e1eb86897a1ea410b4a5d722e
- linuxkit/ca-certificates:67acf038c44bb191ebb704ec7bb39a1524052cdf
onboot:
- name: sysctl

2
projects/etcd/etcd.yml
View File

@ -4,7 +4,7 @@ kernel:
init:
- linuxkit/init:12348442d56c2ee9abf13ff38dff2e36b515bd1e
- linuxkit/runc:d5cbeb95bdafedb82ad2cf11cff1a5da7fcae630
- linuxkit/containerd:b6ffbb669248e3369081a6c4427026aa968a2385
- linuxkit/containerd:e33e0534d6fca88e1eb86897a1ea410b4a5d722e
- linuxkit/ca-certificates:67acf038c44bb191ebb704ec7bb39a1524052cdf
onboot:
- name: sysctl

2
projects/ima-namespace/ima-namespace.yml
View File

@ -4,7 +4,7 @@ kernel:
init:
- linuxkit/init:d049e7b2074da5cd699a27defb47eb101142455d
- linuxkit/runc:d5cbeb95bdafedb82ad2cf11cff1a5da7fcae630
- linuxkit/containerd:b6ffbb669248e3369081a6c4427026aa968a2385
- linuxkit/containerd:e33e0534d6fca88e1eb86897a1ea410b4a5d722e
- linuxkit/ca-certificates:67acf038c44bb191ebb704ec7bb39a1524052cdf
- linuxkit/ima-utils:dfeb3896fd29308b80ff9ba7fe5b8b767e40ca29
onboot:

6
projects/kubernetes/kube-master.yml
View File

@ -4,7 +4,7 @@ kernel:
init:
- linuxkit/init:d049e7b2074da5cd699a27defb47eb101142455d
- linuxkit/runc:d5cbeb95bdafedb82ad2cf11cff1a5da7fcae630
- linuxkit/containerd:b6ffbb669248e3369081a6c4427026aa968a2385
- linuxkit/containerd:e33e0534d6fca88e1eb86897a1ea410b4a5d722e
- linuxkit/ca-certificates:67acf038c44bb191ebb704ec7bb39a1524052cdf
onboot:
- name: sysctl
@ -27,7 +27,7 @@ onboot:
- /var/lib:/var/lib
services:
- name: getty
image: linuxkit/getty:0a2955f3d7a10a0e71972791c3ba6400118f327e
image: linuxkit/getty:9c32352b2a7b2f233de8741396afeb26b58f9a05
env:
- INSECURE=true
- name: rngd
@ -37,7 +37,7 @@ services:
- name: ntpd
image: linuxkit/openntpd:19370f5d9bec84eb91073b7196b732f1301d9c90
- name: sshd
image: linuxkit/sshd:89b2e91d7d1bf2f40220be0e3ed586e74746cceb
image: linuxkit/sshd:a00846032891f77f4f78b8a197e94e13a476a3ee
- name: docker
image: docker:17.06.0-ce-dind
capabilities:

6
projects/kubernetes/kube-node.yml
View File

@ -4,7 +4,7 @@ kernel:
init:
- linuxkit/init:d049e7b2074da5cd699a27defb47eb101142455d
- linuxkit/runc:d5cbeb95bdafedb82ad2cf11cff1a5da7fcae630
- linuxkit/containerd:b6ffbb669248e3369081a6c4427026aa968a2385
- linuxkit/containerd:e33e0534d6fca88e1eb86897a1ea410b4a5d722e
- linuxkit/ca-certificates:67acf038c44bb191ebb704ec7bb39a1524052cdf
onboot:
- name: sysctl
@ -27,7 +27,7 @@ onboot:
- /var/lib:/var/lib
services:
- name: getty
image: linuxkit/getty:0a2955f3d7a10a0e71972791c3ba6400118f327e
image: linuxkit/getty:9c32352b2a7b2f233de8741396afeb26b58f9a05
env:
- INSECURE=true
- name: rngd
@ -37,7 +37,7 @@ services:
- name: ntpd
image: linuxkit/openntpd:19370f5d9bec84eb91073b7196b732f1301d9c90
- name: sshd
image: linuxkit/sshd:89b2e91d7d1bf2f40220be0e3ed586e74746cceb
image: linuxkit/sshd:a00846032891f77f4f78b8a197e94e13a476a3ee
- name: docker
image: docker:17.06.0-ce-dind
capabilities:

2
projects/logging/examples/logging.yml
View File

@ -4,7 +4,7 @@ kernel:
init:
- linuxkit/init:12348442d56c2ee9abf13ff38dff2e36b515bd1e # with runc, logwrite, startmemlogd
- linuxkit/runc:d5cbeb95bdafedb82ad2cf11cff1a5da7fcae630
- linuxkit/containerd:b6ffbb669248e3369081a6c4427026aa968a2385
- linuxkit/containerd:e33e0534d6fca88e1eb86897a1ea410b4a5d722e
- linuxkit/ca-certificates:67acf038c44bb191ebb704ec7bb39a1524052cdf
- linuxkit/memlogd:9b5834189f598f43c507f6938077113906f51012
onboot:

2
projects/miragesdk/examples/fdd.yml
View File

@ -4,7 +4,7 @@ kernel:
init:
- linuxkit/init:d049e7b2074da5cd699a27defb47eb101142455d
- linuxkit/runc:d5cbeb95bdafedb82ad2cf11cff1a5da7fcae630
- linuxkit/containerd:b6ffbb669248e3369081a6c4427026aa968a2385
- linuxkit/containerd:e33e0534d6fca88e1eb86897a1ea410b4a5d722e
- linuxkit/ca-certificates:67acf038c44bb191ebb704ec7bb39a1524052cdf
- samoht/fdd
onboot:

6
projects/miragesdk/examples/mirage-dhcp.yml
View File

@ -4,7 +4,7 @@ kernel:
init:
- linuxkit/init:d049e7b2074da5cd699a27defb47eb101142455d
- linuxkit/runc:d5cbeb95bdafedb82ad2cf11cff1a5da7fcae630
- linuxkit/containerd:b6ffbb669248e3369081a6c4427026aa968a2385
- linuxkit/containerd:e33e0534d6fca88e1eb86897a1ea410b4a5d722e
onboot:
- name: sysctl
image: linuxkit/sysctl:d1a43c7c91e92374766f962dc8534cf9508756b0
@ -28,9 +28,9 @@ onboot:
- /lib:/lib # for ifconfig
services:
- name: sshd
image: linuxkit/sshd:89b2e91d7d1bf2f40220be0e3ed586e74746cceb
image: linuxkit/sshd:a00846032891f77f4f78b8a197e94e13a476a3ee
- name: getty
image: linuxkit/getty:0a2955f3d7a10a0e71972791c3ba6400118f327e
image: linuxkit/getty:9c32352b2a7b2f233de8741396afeb26b58f9a05
env:
- INSECURE=true
files:

4
projects/okernel/examples/okernel_simple.yaml
View File

@ -4,7 +4,7 @@ kernel:
init:
- linuxkit/init:d049e7b2074da5cd699a27defb47eb101142455d
- linuxkit/runc:d5cbeb95bdafedb82ad2cf11cff1a5da7fcae630
- linuxkit/containerd:b6ffbb669248e3369081a6c4427026aa968a2385
- linuxkit/containerd:e33e0534d6fca88e1eb86897a1ea410b4a5d722e
- linuxkit/ca-certificates:67acf038c44bb191ebb704ec7bb39a1524052cdf
onboot:
- name: sysctl
@ -15,7 +15,7 @@ services:
- name: dhcpcd
image: linuxkit/dhcpcd:4b7b8bb024cebb1bbb9c8026d44d7cbc8e202c41
- name: sshd
image: linuxkit/sshd:89b2e91d7d1bf2f40220be0e3ed586e74746cceb
image: linuxkit/sshd:a00846032891f77f4f78b8a197e94e13a476a3ee
files:
- path: root/.ssh/authorized_keys
source: ~/.ssh/id_rsa.pub

4
projects/shiftfs/shiftfs.yml
View File

@ -4,7 +4,7 @@ kernel:
init:
- linuxkit/init:d049e7b2074da5cd699a27defb47eb101142455d
- linuxkit/runc:d5cbeb95bdafedb82ad2cf11cff1a5da7fcae630
- linuxkit/containerd:b6ffbb669248e3369081a6c4427026aa968a2385
- linuxkit/containerd:e33e0534d6fca88e1eb86897a1ea410b4a5d722e
- linuxkit/ca-certificates:67acf038c44bb191ebb704ec7bb39a1524052cdf
onboot:
- name: sysctl
@ -16,7 +16,7 @@ onboot:
command: ["/sbin/dhcpcd", "--nobackground", "-f", "/dhcpcd.conf", "-1"]
services:
- name: getty
image: linuxkit/getty:0a2955f3d7a10a0e71972791c3ba6400118f327e
image: linuxkit/getty:9c32352b2a7b2f233de8741396afeb26b58f9a05
env:
- INSECURE=true
- name: rngd

2
projects/swarmd/swarmd.yml
View File

@ -4,7 +4,7 @@ kernel:
init:
- linuxkit/init:d049e7b2074da5cd699a27defb47eb101142455d
- linuxkit/runc:d5cbeb95bdafedb82ad2cf11cff1a5da7fcae630
- linuxkit/containerd:b6ffbb669248e3369081a6c4427026aa968a2385
- linuxkit/containerd:e33e0534d6fca88e1eb86897a1ea410b4a5d722e
- linuxkit/ca-certificates:67acf038c44bb191ebb704ec7bb39a1524052cdf
onboot:
- name: sysctl

2
projects/wireguard/wireguard.yml
View File

@ -4,7 +4,7 @@ kernel:
init:
- linuxkit/init:d049e7b2074da5cd699a27defb47eb101142455d
- linuxkit/runc:d5cbeb95bdafedb82ad2cf11cff1a5da7fcae630
- linuxkit/containerd:b6ffbb669248e3369081a6c4427026aa968a2385
- linuxkit/containerd:e33e0534d6fca88e1eb86897a1ea410b4a5d722e
- linuxkit/ca-certificates:4e9a83e890e6477dcd25029fc4f1ced61d0642f4
- linuxkit/wireguard-utils:26fe3d38455f2d441549e3c54bdec1b26ac819b8
onboot:

2
test/cases/010_platforms/010_hyperkit/010_acpi/test.yml
View File

@ -4,7 +4,7 @@ kernel:
init:
- linuxkit/init:d049e7b2074da5cd699a27defb47eb101142455d
- linuxkit/runc:d5cbeb95bdafedb82ad2cf11cff1a5da7fcae630
- linuxkit/containerd:b6ffbb669248e3369081a6c4427026aa968a2385
- linuxkit/containerd:e33e0534d6fca88e1eb86897a1ea410b4a5d722e
services:
- name: acpid
image: linuxkit/acpid:1966310cb75e28ffc668863a6577ee991327f918

2
test/cases/030_security/000_docker-bench/test-docker-bench.yml
View File

@ -4,7 +4,7 @@ kernel:
init:
- linuxkit/init:d049e7b2074da5cd699a27defb47eb101142455d
- linuxkit/runc:d5cbeb95bdafedb82ad2cf11cff1a5da7fcae630
- linuxkit/containerd:b6ffbb669248e3369081a6c4427026aa968a2385
- linuxkit/containerd:e33e0534d6fca88e1eb86897a1ea410b4a5d722e
- linuxkit/ca-certificates:67acf038c44bb191ebb704ec7bb39a1524052cdf
onboot:
- name: sysctl

2
test/cases/040_packages/003_containerd/test-containerd.yml
View File

@ -4,7 +4,7 @@ kernel:
init:
- linuxkit/init:d049e7b2074da5cd699a27defb47eb101142455d
- linuxkit/runc:d5cbeb95bdafedb82ad2cf11cff1a5da7fcae630
- linuxkit/containerd:b6ffbb669248e3369081a6c4427026aa968a2385
- linuxkit/containerd:e33e0534d6fca88e1eb86897a1ea410b4a5d722e
- linuxkit/ca-certificates:67acf038c44bb191ebb704ec7bb39a1524052cdf
onboot:
- name: sysctl

4
test/cases/040_packages/007_getty-containerd/test-ctr.yml
View File

@ -4,7 +4,7 @@ kernel:
init:
- linuxkit/init:d049e7b2074da5cd699a27defb47eb101142455d
- linuxkit/runc:d5cbeb95bdafedb82ad2cf11cff1a5da7fcae630
- linuxkit/containerd:b6ffbb669248e3369081a6c4427026aa968a2385
- linuxkit/containerd:e33e0534d6fca88e1eb86897a1ea410b4a5d722e
- linuxkit/ca-certificates:67acf038c44bb191ebb704ec7bb39a1524052cdf
onboot:
- name: dhcpcd
@ -12,7 +12,7 @@ onboot:
command: ["/sbin/dhcpcd", "--nobackground", "-f", "/dhcpcd.conf", "-1"]
services:
- name: getty
image: linuxkit/getty:0a2955f3d7a10a0e71972791c3ba6400118f327e
image: linuxkit/getty:9c32352b2a7b2f233de8741396afeb26b58f9a05
files:
- path: etc/getty.shadow
# sample sets password for root to "abcdefgh" (without quotes)

8
test/cases/040_packages/007_getty-containerd/test.exp
View File

@ -40,22 +40,22 @@ expect {
expect {
timeout {
puts "FAILED dist pull"
puts "FAILED ctr pull"
exec kill -9 $pid
exit 1
}
$prompt {
send "dist pull $image\n"
send "ctr pull $image\n"
}
}
expect {
timeout {
puts "FAILED dist pull"
puts "FAILED ctr pull"
exec kill -9 $pid
exit 1
}
$prompt {
puts "SUCCESS dist pull"
puts "SUCCESS ctr pull"
send "ctr run -t $image test\n"
}
}

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

@ -4,7 +4,7 @@ kernel:
init:
- linuxkit/init:d049e7b2074da5cd699a27defb47eb101142455d
- linuxkit/runc:d5cbeb95bdafedb82ad2cf11cff1a5da7fcae630
- linuxkit/containerd:b6ffbb669248e3369081a6c4427026aa968a2385
- linuxkit/containerd:e33e0534d6fca88e1eb86897a1ea410b4a5d722e
onboot:
- name: ltp
image: linuxkit/test-ltp:6df23ac196332cafb9c0f8e32f328e22d612267d

2
test/hack/test.yml
View File

@ -6,7 +6,7 @@ kernel:
init:
- linuxkit/init:d049e7b2074da5cd699a27defb47eb101142455d
- linuxkit/runc:d5cbeb95bdafedb82ad2cf11cff1a5da7fcae630
- linuxkit/containerd:b6ffbb669248e3369081a6c4427026aa968a2385
- linuxkit/containerd:e33e0534d6fca88e1eb86897a1ea410b4a5d722e
onboot:
- name: dhcpcd
image: linuxkit/dhcpcd:4b7b8bb024cebb1bbb9c8026d44d7cbc8e202c41

3
tools/alpine/Dockerfile
View File

@ -50,5 +50,6 @@ COPY --from=mirror /Dockerfile /Dockerfile
RUN apk update && apk upgrade -a
# v1.0.0-alpha1 plus https://github.com/containerd/containerd/pull/1141
ENV CONTAINERD_REPO=https://github.com/ijc/containerd.git
ENV CONTAINERD_COMMIT=3455ffc08c553db0ca9fe60b4ba2b3e8a2dc960b
ENV CONTAINERD_COMMIT=d42cb88ba2b08d2ca6c8c017d629b394bf1dd08c

1
tools/alpine/packages
View File

@ -85,4 +85,5 @@ xorriso
xz
xz-dev
zfs
xfsprogs-extra
zlib-dev

6
tools/alpine/versions
View File

@ -1,6 +1,6 @@
# linuxkit/alpine:3744607156e6b67e3e7d083b15be9e7722215e73
# linuxkit/alpine:a39a433162a873519910a07beeb3e8db22529956
# automatically generated list of installed packages
abuild-3.0.0_rc2-r7
abuild-3.0.0_rc2-r8
alpine-baselayout-3.0.4-r0
alpine-keys-2.1-r1
alsa-lib-1.1.3-r0
@ -216,6 +216,8 @@ vde2-libs-2.3.2-r7
vim-8.0.0595-r0
wayland-1.13.0-r0
xfsprogs-4.5.0-r0
xfsprogs-extra-4.5.0-r0
xfsprogs-libs-4.5.0-r0
xorriso-1.4.6-r0
xz-5.2.3-r0
xz-dev-5.2.3-r0