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

Merge pull request #2526 from justincormack/build-containerd-in-alpine

Browse Source 
Build containerd in Alpine image
This commit is contained in:
Rolf Neugebauer 2017-09-21 08:05:11 +01:00 committed by GitHub
commit 8e5424f65f
42 changed files with 46 additions and 54 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -6,7 +6,7 @@ init:
- linuxkit/vpnkit-expose-port:fa4ab4ac78b83fe392e39b861b4114c3bb02d170 # install vpnkit-expose-port and vpnkit-iptables-wrapper on host - linuxkit/vpnkit-expose-port:fa4ab4ac78b83fe392e39b861b4114c3bb02d170 # install vpnkit-expose-port and vpnkit-iptables-wrapper on host
- linuxkit/init:6fe9d31a53bbd200183bb31edd795305e868d5a7 - linuxkit/init:6fe9d31a53bbd200183bb31edd795305e868d5a7
- linuxkit/runc:a1b564248a0d0b118c11e61db9f84ecf41dd2d2a - linuxkit/runc:a1b564248a0d0b118c11e61db9f84ecf41dd2d2a
- linuxkit/containerd:06876ceef325e49e9ba119659357768d5df89075 - linuxkit/containerd:ad6710e069cb538c76314a28e09d6b49958c88e0
- linuxkit/ca-certificates:e44b0a66df5a102c0e220f0066b0d904710dcb10 - linuxkit/ca-certificates:e44b0a66df5a102c0e220f0066b0d904710dcb10
onboot: onboot:
# support metadata for optional config in /var/config # support metadata for optional config in /var/config

2
examples/aws.yml
View File

@ -4,7 +4,7 @@ kernel:
init: init:
- linuxkit/init:6fe9d31a53bbd200183bb31edd795305e868d5a7 - linuxkit/init:6fe9d31a53bbd200183bb31edd795305e868d5a7
- linuxkit/runc:a1b564248a0d0b118c11e61db9f84ecf41dd2d2a - linuxkit/runc:a1b564248a0d0b118c11e61db9f84ecf41dd2d2a
- linuxkit/containerd:06876ceef325e49e9ba119659357768d5df89075 - linuxkit/containerd:ad6710e069cb538c76314a28e09d6b49958c88e0
- linuxkit/ca-certificates:e44b0a66df5a102c0e220f0066b0d904710dcb10 - linuxkit/ca-certificates:e44b0a66df5a102c0e220f0066b0d904710dcb10
onboot: onboot:
- name: sysctl - name: sysctl

2
examples/azure.yml
View File

@ -4,7 +4,7 @@ kernel:
init: init:
- linuxkit/init:6fe9d31a53bbd200183bb31edd795305e868d5a7 - linuxkit/init:6fe9d31a53bbd200183bb31edd795305e868d5a7
- linuxkit/runc:a1b564248a0d0b118c11e61db9f84ecf41dd2d2a - linuxkit/runc:a1b564248a0d0b118c11e61db9f84ecf41dd2d2a
- linuxkit/containerd:06876ceef325e49e9ba119659357768d5df89075 - linuxkit/containerd:ad6710e069cb538c76314a28e09d6b49958c88e0
- linuxkit/ca-certificates:e44b0a66df5a102c0e220f0066b0d904710dcb10 - linuxkit/ca-certificates:e44b0a66df5a102c0e220f0066b0d904710dcb10
onboot: onboot:
- name: sysctl - name: sysctl

2
examples/docker.yml
View File

@ -4,7 +4,7 @@ kernel:
init: init:
- linuxkit/init:6fe9d31a53bbd200183bb31edd795305e868d5a7 - linuxkit/init:6fe9d31a53bbd200183bb31edd795305e868d5a7
- linuxkit/runc:a1b564248a0d0b118c11e61db9f84ecf41dd2d2a - linuxkit/runc:a1b564248a0d0b118c11e61db9f84ecf41dd2d2a
- linuxkit/containerd:06876ceef325e49e9ba119659357768d5df89075 - linuxkit/containerd:ad6710e069cb538c76314a28e09d6b49958c88e0
- linuxkit/ca-certificates:e44b0a66df5a102c0e220f0066b0d904710dcb10 - linuxkit/ca-certificates:e44b0a66df5a102c0e220f0066b0d904710dcb10
onboot: onboot:
- name: sysctl - name: sysctl

2
examples/gcp.yml
View File

@ -4,7 +4,7 @@ kernel:
init: init:
- linuxkit/init:6fe9d31a53bbd200183bb31edd795305e868d5a7 - linuxkit/init:6fe9d31a53bbd200183bb31edd795305e868d5a7
- linuxkit/runc:a1b564248a0d0b118c11e61db9f84ecf41dd2d2a - linuxkit/runc:a1b564248a0d0b118c11e61db9f84ecf41dd2d2a
- linuxkit/containerd:06876ceef325e49e9ba119659357768d5df89075 - linuxkit/containerd:ad6710e069cb538c76314a28e09d6b49958c88e0
- linuxkit/ca-certificates:e44b0a66df5a102c0e220f0066b0d904710dcb10 - linuxkit/ca-certificates:e44b0a66df5a102c0e220f0066b0d904710dcb10
onboot: onboot:
- name: sysctl - name: sysctl

2
examples/getty.yml
View File

@ -4,7 +4,7 @@ kernel:
init: init:
- linuxkit/init:6fe9d31a53bbd200183bb31edd795305e868d5a7 - linuxkit/init:6fe9d31a53bbd200183bb31edd795305e868d5a7
- linuxkit/runc:a1b564248a0d0b118c11e61db9f84ecf41dd2d2a - linuxkit/runc:a1b564248a0d0b118c11e61db9f84ecf41dd2d2a
- linuxkit/containerd:06876ceef325e49e9ba119659357768d5df89075 - linuxkit/containerd:ad6710e069cb538c76314a28e09d6b49958c88e0
- linuxkit/ca-certificates:e44b0a66df5a102c0e220f0066b0d904710dcb10 - linuxkit/ca-certificates:e44b0a66df5a102c0e220f0066b0d904710dcb10
onboot: onboot:
- name: sysctl - name: sysctl

2
examples/minimal.yml
View File

@ -4,7 +4,7 @@ kernel:
init: init:
- linuxkit/init:6fe9d31a53bbd200183bb31edd795305e868d5a7 - linuxkit/init:6fe9d31a53bbd200183bb31edd795305e868d5a7
- linuxkit/runc:a1b564248a0d0b118c11e61db9f84ecf41dd2d2a - linuxkit/runc:a1b564248a0d0b118c11e61db9f84ecf41dd2d2a
- linuxkit/containerd:06876ceef325e49e9ba119659357768d5df89075 - linuxkit/containerd:ad6710e069cb538c76314a28e09d6b49958c88e0
onboot: onboot:
- name: dhcpcd - name: dhcpcd
image: linuxkit/dhcpcd:f3f5413abb78fae9020e35bd4788fa93df4530b7 image: linuxkit/dhcpcd:f3f5413abb78fae9020e35bd4788fa93df4530b7

2
examples/node_exporter.yml
View File

@ -4,7 +4,7 @@ kernel:
init: init:
- linuxkit/init:6fe9d31a53bbd200183bb31edd795305e868d5a7 - linuxkit/init:6fe9d31a53bbd200183bb31edd795305e868d5a7
- linuxkit/runc:a1b564248a0d0b118c11e61db9f84ecf41dd2d2a - linuxkit/runc:a1b564248a0d0b118c11e61db9f84ecf41dd2d2a
- linuxkit/containerd:06876ceef325e49e9ba119659357768d5df89075 - linuxkit/containerd:ad6710e069cb538c76314a28e09d6b49958c88e0
services: services:
- name: getty - name: getty
image: linuxkit/getty:bf6872ce0a9f3ab519b3e502cc41ba3958bda2a6 image: linuxkit/getty:bf6872ce0a9f3ab519b3e502cc41ba3958bda2a6

2
examples/packet.yml
View File

@ -4,7 +4,7 @@ kernel:
init: init:
- linuxkit/init:6fe9d31a53bbd200183bb31edd795305e868d5a7 - linuxkit/init:6fe9d31a53bbd200183bb31edd795305e868d5a7
- linuxkit/runc:a1b564248a0d0b118c11e61db9f84ecf41dd2d2a - linuxkit/runc:a1b564248a0d0b118c11e61db9f84ecf41dd2d2a
- linuxkit/containerd:06876ceef325e49e9ba119659357768d5df89075 - linuxkit/containerd:ad6710e069cb538c76314a28e09d6b49958c88e0
- linuxkit/ca-certificates:e44b0a66df5a102c0e220f0066b0d904710dcb10 - linuxkit/ca-certificates:e44b0a66df5a102c0e220f0066b0d904710dcb10
onboot: onboot:
- name: rngd1 - name: rngd1

2
examples/redis-os.yml
View File

@ -6,7 +6,7 @@ kernel:
init: init:
- linuxkit/init:6fe9d31a53bbd200183bb31edd795305e868d5a7 - linuxkit/init:6fe9d31a53bbd200183bb31edd795305e868d5a7
- linuxkit/runc:a1b564248a0d0b118c11e61db9f84ecf41dd2d2a - linuxkit/runc:a1b564248a0d0b118c11e61db9f84ecf41dd2d2a
- linuxkit/containerd:06876ceef325e49e9ba119659357768d5df89075 - linuxkit/containerd:ad6710e069cb538c76314a28e09d6b49958c88e0
onboot: onboot:
- name: dhcpcd - name: dhcpcd
image: linuxkit/dhcpcd:f3f5413abb78fae9020e35bd4788fa93df4530b7 image: linuxkit/dhcpcd:f3f5413abb78fae9020e35bd4788fa93df4530b7

2
examples/sshd.yml
View File

@ -4,7 +4,7 @@ kernel:
init: init:
- linuxkit/init:6fe9d31a53bbd200183bb31edd795305e868d5a7 - linuxkit/init:6fe9d31a53bbd200183bb31edd795305e868d5a7
- linuxkit/runc:a1b564248a0d0b118c11e61db9f84ecf41dd2d2a - linuxkit/runc:a1b564248a0d0b118c11e61db9f84ecf41dd2d2a
- linuxkit/containerd:06876ceef325e49e9ba119659357768d5df89075 - linuxkit/containerd:ad6710e069cb538c76314a28e09d6b49958c88e0
- linuxkit/ca-certificates:e44b0a66df5a102c0e220f0066b0d904710dcb10 - linuxkit/ca-certificates:e44b0a66df5a102c0e220f0066b0d904710dcb10
onboot: onboot:
- name: sysctl - name: sysctl

2
examples/swap.yml
View File

@ -4,7 +4,7 @@ kernel:
init: init:
- linuxkit/init:6fe9d31a53bbd200183bb31edd795305e868d5a7 - linuxkit/init:6fe9d31a53bbd200183bb31edd795305e868d5a7
- linuxkit/runc:a1b564248a0d0b118c11e61db9f84ecf41dd2d2a - linuxkit/runc:a1b564248a0d0b118c11e61db9f84ecf41dd2d2a
- linuxkit/containerd:06876ceef325e49e9ba119659357768d5df89075 - linuxkit/containerd:ad6710e069cb538c76314a28e09d6b49958c88e0
- linuxkit/ca-certificates:e44b0a66df5a102c0e220f0066b0d904710dcb10 - linuxkit/ca-certificates:e44b0a66df5a102c0e220f0066b0d904710dcb10
onboot: onboot:
- name: sysctl - name: sysctl

2
examples/tpm.yml
View File

@ -4,7 +4,7 @@ kernel:
init: init:
- linuxkit/init:6fe9d31a53bbd200183bb31edd795305e868d5a7 - linuxkit/init:6fe9d31a53bbd200183bb31edd795305e868d5a7
- linuxkit/runc:a1b564248a0d0b118c11e61db9f84ecf41dd2d2a - linuxkit/runc:a1b564248a0d0b118c11e61db9f84ecf41dd2d2a
- linuxkit/containerd:06876ceef325e49e9ba119659357768d5df89075 - linuxkit/containerd:ad6710e069cb538c76314a28e09d6b49958c88e0
- linuxkit/ca-certificates:e44b0a66df5a102c0e220f0066b0d904710dcb10 - linuxkit/ca-certificates:e44b0a66df5a102c0e220f0066b0d904710dcb10
onboot: onboot:
- name: sysctl - name: sysctl

2
examples/vmware.yml
View File

@ -4,7 +4,7 @@ kernel:
init: init:
- linuxkit/init:6fe9d31a53bbd200183bb31edd795305e868d5a7 - linuxkit/init:6fe9d31a53bbd200183bb31edd795305e868d5a7
- linuxkit/runc:a1b564248a0d0b118c11e61db9f84ecf41dd2d2a - linuxkit/runc:a1b564248a0d0b118c11e61db9f84ecf41dd2d2a
- linuxkit/containerd:06876ceef325e49e9ba119659357768d5df89075 - linuxkit/containerd:ad6710e069cb538c76314a28e09d6b49958c88e0
- linuxkit/ca-certificates:e44b0a66df5a102c0e220f0066b0d904710dcb10 - linuxkit/ca-certificates:e44b0a66df5a102c0e220f0066b0d904710dcb10
onboot: onboot:
- name: sysctl - name: sysctl

2
examples/vpnkit-forwarder.yml
View File

@ -4,7 +4,7 @@ kernel:
init: init:
- linuxkit/init:6fe9d31a53bbd200183bb31edd795305e868d5a7 - linuxkit/init:6fe9d31a53bbd200183bb31edd795305e868d5a7
- linuxkit/runc:a1b564248a0d0b118c11e61db9f84ecf41dd2d2a - linuxkit/runc:a1b564248a0d0b118c11e61db9f84ecf41dd2d2a
- linuxkit/containerd:06876ceef325e49e9ba119659357768d5df89075 - linuxkit/containerd:ad6710e069cb538c76314a28e09d6b49958c88e0
onboot: onboot:
- name: dhcpcd - name: dhcpcd
image: linuxkit/dhcpcd:f3f5413abb78fae9020e35bd4788fa93df4530b7 image: linuxkit/dhcpcd:f3f5413abb78fae9020e35bd4788fa93df4530b7

2
examples/vsudd.yml
View File

@ -4,7 +4,7 @@ kernel:
init: init:
- linuxkit/init:6fe9d31a53bbd200183bb31edd795305e868d5a7 - linuxkit/init:6fe9d31a53bbd200183bb31edd795305e868d5a7
- linuxkit/runc:a1b564248a0d0b118c11e61db9f84ecf41dd2d2a - linuxkit/runc:a1b564248a0d0b118c11e61db9f84ecf41dd2d2a
- linuxkit/containerd:06876ceef325e49e9ba119659357768d5df89075 - linuxkit/containerd:ad6710e069cb538c76314a28e09d6b49958c88e0
onboot: onboot:
- name: dhcpcd - name: dhcpcd
image: linuxkit/dhcpcd:f3f5413abb78fae9020e35bd4788fa93df4530b7 image: linuxkit/dhcpcd:f3f5413abb78fae9020e35bd4788fa93df4530b7

2
examples/vultr.yml
View File

@ -4,7 +4,7 @@ kernel:
init: init:
- linuxkit/init:6fe9d31a53bbd200183bb31edd795305e868d5a7 - linuxkit/init:6fe9d31a53bbd200183bb31edd795305e868d5a7
- linuxkit/runc:a1b564248a0d0b118c11e61db9f84ecf41dd2d2a - linuxkit/runc:a1b564248a0d0b118c11e61db9f84ecf41dd2d2a
- linuxkit/containerd:06876ceef325e49e9ba119659357768d5df89075 - linuxkit/containerd:ad6710e069cb538c76314a28e09d6b49958c88e0
- linuxkit/ca-certificates:e44b0a66df5a102c0e220f0066b0d904710dcb10 - linuxkit/ca-certificates:e44b0a66df5a102c0e220f0066b0d904710dcb10
onboot: onboot:
- name: sysctl - name: sysctl

2
examples/wireguard.yml
View File

@ -4,7 +4,7 @@ kernel:
init: init:
- linuxkit/init:6fe9d31a53bbd200183bb31edd795305e868d5a7 - linuxkit/init:6fe9d31a53bbd200183bb31edd795305e868d5a7
- linuxkit/runc:a1b564248a0d0b118c11e61db9f84ecf41dd2d2a - linuxkit/runc:a1b564248a0d0b118c11e61db9f84ecf41dd2d2a
- linuxkit/containerd:06876ceef325e49e9ba119659357768d5df89075 - linuxkit/containerd:ad6710e069cb538c76314a28e09d6b49958c88e0
- linuxkit/ca-certificates:e44b0a66df5a102c0e220f0066b0d904710dcb10 - linuxkit/ca-certificates:e44b0a66df5a102c0e220f0066b0d904710dcb10
onboot: onboot:
- name: sysctl - name: sysctl

2
linuxkit.yml
View File

@ -4,7 +4,7 @@ kernel:
init: init:
- linuxkit/init:6fe9d31a53bbd200183bb31edd795305e868d5a7 - linuxkit/init:6fe9d31a53bbd200183bb31edd795305e868d5a7
- linuxkit/runc:a1b564248a0d0b118c11e61db9f84ecf41dd2d2a - linuxkit/runc:a1b564248a0d0b118c11e61db9f84ecf41dd2d2a
- linuxkit/containerd:06876ceef325e49e9ba119659357768d5df89075 - linuxkit/containerd:ad6710e069cb538c76314a28e09d6b49958c88e0
- linuxkit/ca-certificates:e44b0a66df5a102c0e220f0066b0d904710dcb10 - linuxkit/ca-certificates:e44b0a66df5a102c0e220f0066b0d904710dcb10
onboot: onboot:
- name: sysctl - name: sysctl

15
pkg/containerd/Dockerfile
View File

@ -1,18 +1,7 @@
FROM linuxkit/alpine:1e67b8fdba849ed2f7e8537c13b7f280639623d6 as alpine FROM linuxkit/alpine:77287352db68b442534c0005edd6ff750c8189f3 as alpine
RUN \ RUN apk add tzdata
apk add \
btrfs-progs-dev \
gcc \
git \
go \
libc-dev \
linux-headers \
make \
tzdata \
&& true
WORKDIR $GOPATH/src/github.com/containerd/containerd WORKDIR $GOPATH/src/github.com/containerd/containerd
RUN make binaries EXTRA_FLAGS="-buildmode pie" EXTRA_LDFLAGS="-extldflags \\\"-fno-PIC -static\\\""
RUN cp bin/containerd bin/ctr bin/containerd-shim /usr/bin/ RUN cp bin/containerd bin/ctr bin/containerd-shim /usr/bin/
RUN mkdir -p /etc/init.d && ln -s /usr/bin/service /etc/init.d/020-containerd RUN mkdir -p /etc/init.d && ln -s /usr/bin/service /etc/init.d/020-containerd

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

@ -4,7 +4,7 @@ kernel:
init: init:
- linuxkit/init:6fe9d31a53bbd200183bb31edd795305e868d5a7 - linuxkit/init:6fe9d31a53bbd200183bb31edd795305e868d5a7
- linuxkit/runc:a1b564248a0d0b118c11e61db9f84ecf41dd2d2a - linuxkit/runc:a1b564248a0d0b118c11e61db9f84ecf41dd2d2a
- linuxkit/containerd:06876ceef325e49e9ba119659357768d5df89075 - linuxkit/containerd:ad6710e069cb538c76314a28e09d6b49958c88e0
- linuxkit/ca-certificates:e44b0a66df5a102c0e220f0066b0d904710dcb10 - linuxkit/ca-certificates:e44b0a66df5a102c0e220f0066b0d904710dcb10
onboot: onboot:
- name: sysctl - name: sysctl

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

@ -4,7 +4,7 @@ kernel:
init: init:
- linuxkit/init:6fe9d31a53bbd200183bb31edd795305e868d5a7 - linuxkit/init:6fe9d31a53bbd200183bb31edd795305e868d5a7
- linuxkit/runc:a1b564248a0d0b118c11e61db9f84ecf41dd2d2a - linuxkit/runc:a1b564248a0d0b118c11e61db9f84ecf41dd2d2a
- linuxkit/containerd:06876ceef325e49e9ba119659357768d5df89075 - linuxkit/containerd:ad6710e069cb538c76314a28e09d6b49958c88e0
- linuxkit/ca-certificates:e44b0a66df5a102c0e220f0066b0d904710dcb10 - linuxkit/ca-certificates:e44b0a66df5a102c0e220f0066b0d904710dcb10
onboot: onboot:
- name: sysctl - name: sysctl

2
projects/etcd/etcd.yml
View File

@ -4,7 +4,7 @@ kernel:
init: init:
- linuxkit/init:6fe9d31a53bbd200183bb31edd795305e868d5a7 - linuxkit/init:6fe9d31a53bbd200183bb31edd795305e868d5a7
- linuxkit/runc:a1b564248a0d0b118c11e61db9f84ecf41dd2d2a - linuxkit/runc:a1b564248a0d0b118c11e61db9f84ecf41dd2d2a
- linuxkit/containerd:06876ceef325e49e9ba119659357768d5df89075 - linuxkit/containerd:ad6710e069cb538c76314a28e09d6b49958c88e0
- linuxkit/ca-certificates:e44b0a66df5a102c0e220f0066b0d904710dcb10 - linuxkit/ca-certificates:e44b0a66df5a102c0e220f0066b0d904710dcb10
onboot: onboot:
- name: sysctl - name: sysctl

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

@ -4,7 +4,7 @@ kernel:
init: init:
- linuxkit/init:6fe9d31a53bbd200183bb31edd795305e868d5a7 - linuxkit/init:6fe9d31a53bbd200183bb31edd795305e868d5a7
- linuxkit/runc:a1b564248a0d0b118c11e61db9f84ecf41dd2d2a - linuxkit/runc:a1b564248a0d0b118c11e61db9f84ecf41dd2d2a
- linuxkit/containerd:06876ceef325e49e9ba119659357768d5df89075 - linuxkit/containerd:ad6710e069cb538c76314a28e09d6b49958c88e0
- linuxkit/ca-certificates:e44b0a66df5a102c0e220f0066b0d904710dcb10 - linuxkit/ca-certificates:e44b0a66df5a102c0e220f0066b0d904710dcb10
- linuxkit/ima-utils:dfeb3896fd29308b80ff9ba7fe5b8b767e40ca29 - linuxkit/ima-utils:dfeb3896fd29308b80ff9ba7fe5b8b767e40ca29
onboot: onboot:

2
projects/kubernetes/kube.yml
View File

@ -4,7 +4,7 @@ kernel:
init: init:
- linuxkit/init:6fe9d31a53bbd200183bb31edd795305e868d5a7 - linuxkit/init:6fe9d31a53bbd200183bb31edd795305e868d5a7
- linuxkit/runc:a1b564248a0d0b118c11e61db9f84ecf41dd2d2a - linuxkit/runc:a1b564248a0d0b118c11e61db9f84ecf41dd2d2a
- linuxkit/containerd:06876ceef325e49e9ba119659357768d5df89075 - linuxkit/containerd:ad6710e069cb538c76314a28e09d6b49958c88e0
- linuxkit/ca-certificates:e44b0a66df5a102c0e220f0066b0d904710dcb10 - linuxkit/ca-certificates:e44b0a66df5a102c0e220f0066b0d904710dcb10
onboot: onboot:
- name: sysctl - name: sysctl

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

@ -4,7 +4,7 @@ kernel:
init: init:
- linuxkit/init:6fe9d31a53bbd200183bb31edd795305e868d5a7 # with runc, logwrite, startmemlogd - linuxkit/init:6fe9d31a53bbd200183bb31edd795305e868d5a7 # with runc, logwrite, startmemlogd
- linuxkit/runc:a1b564248a0d0b118c11e61db9f84ecf41dd2d2a - linuxkit/runc:a1b564248a0d0b118c11e61db9f84ecf41dd2d2a
- linuxkit/containerd:06876ceef325e49e9ba119659357768d5df89075 - linuxkit/containerd:ad6710e069cb538c76314a28e09d6b49958c88e0
- linuxkit/ca-certificates:e44b0a66df5a102c0e220f0066b0d904710dcb10 - linuxkit/ca-certificates:e44b0a66df5a102c0e220f0066b0d904710dcb10
- linuxkit/memlogd:9b5834189f598f43c507f6938077113906f51012 - linuxkit/memlogd:9b5834189f598f43c507f6938077113906f51012
onboot: onboot:

2
projects/memorizer/memorizer.yml
View File

@ -4,7 +4,7 @@ kernel:
init: init:
- linuxkit/init:6fe9d31a53bbd200183bb31edd795305e868d5a7 - linuxkit/init:6fe9d31a53bbd200183bb31edd795305e868d5a7
- linuxkit/runc:a1b564248a0d0b118c11e61db9f84ecf41dd2d2a - linuxkit/runc:a1b564248a0d0b118c11e61db9f84ecf41dd2d2a
- linuxkit/containerd:06876ceef325e49e9ba119659357768d5df89075 - linuxkit/containerd:ad6710e069cb538c76314a28e09d6b49958c88e0
onboot: onboot:
- name: dhcpcd - name: dhcpcd
image: linuxkit/dhcpcd:f3f5413abb78fae9020e35bd4788fa93df4530b7 image: linuxkit/dhcpcd:f3f5413abb78fae9020e35bd4788fa93df4530b7

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

@ -4,7 +4,7 @@ kernel:
init: init:
- linuxkit/init:6fe9d31a53bbd200183bb31edd795305e868d5a7 - linuxkit/init:6fe9d31a53bbd200183bb31edd795305e868d5a7
- linuxkit/runc:a1b564248a0d0b118c11e61db9f84ecf41dd2d2a - linuxkit/runc:a1b564248a0d0b118c11e61db9f84ecf41dd2d2a
- linuxkit/containerd:06876ceef325e49e9ba119659357768d5df89075 - linuxkit/containerd:ad6710e069cb538c76314a28e09d6b49958c88e0
- linuxkit/ca-certificates:e44b0a66df5a102c0e220f0066b0d904710dcb10 - linuxkit/ca-certificates:e44b0a66df5a102c0e220f0066b0d904710dcb10
- samoht/fdd - samoht/fdd
onboot: onboot:

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

@ -4,7 +4,7 @@ kernel:
init: init:
- linuxkit/init:6fe9d31a53bbd200183bb31edd795305e868d5a7 - linuxkit/init:6fe9d31a53bbd200183bb31edd795305e868d5a7
- linuxkit/runc:a1b564248a0d0b118c11e61db9f84ecf41dd2d2a - linuxkit/runc:a1b564248a0d0b118c11e61db9f84ecf41dd2d2a
- linuxkit/containerd:06876ceef325e49e9ba119659357768d5df89075 - linuxkit/containerd:ad6710e069cb538c76314a28e09d6b49958c88e0
onboot: onboot:
- name: sysctl - name: sysctl
image: linuxkit/sysctl:154913b72c6f1f33eb408609fca9963628e8c051 image: linuxkit/sysctl:154913b72c6f1f33eb408609fca9963628e8c051

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

@ -4,7 +4,7 @@ kernel:
init: init:
- linuxkit/init:6fe9d31a53bbd200183bb31edd795305e868d5a7 - linuxkit/init:6fe9d31a53bbd200183bb31edd795305e868d5a7
- linuxkit/runc:a1b564248a0d0b118c11e61db9f84ecf41dd2d2a - linuxkit/runc:a1b564248a0d0b118c11e61db9f84ecf41dd2d2a
- linuxkit/containerd:06876ceef325e49e9ba119659357768d5df89075 - linuxkit/containerd:ad6710e069cb538c76314a28e09d6b49958c88e0
- linuxkit/ca-certificates:e44b0a66df5a102c0e220f0066b0d904710dcb10 - linuxkit/ca-certificates:e44b0a66df5a102c0e220f0066b0d904710dcb10
onboot: onboot:
- name: sysctl - name: sysctl

2
projects/shiftfs/shiftfs.yml
View File

@ -4,7 +4,7 @@ kernel:
init: init:
- linuxkit/init:6fe9d31a53bbd200183bb31edd795305e868d5a7 - linuxkit/init:6fe9d31a53bbd200183bb31edd795305e868d5a7
- linuxkit/runc:a1b564248a0d0b118c11e61db9f84ecf41dd2d2a - linuxkit/runc:a1b564248a0d0b118c11e61db9f84ecf41dd2d2a
- linuxkit/containerd:06876ceef325e49e9ba119659357768d5df89075 - linuxkit/containerd:ad6710e069cb538c76314a28e09d6b49958c88e0
- linuxkit/ca-certificates:e44b0a66df5a102c0e220f0066b0d904710dcb10 - linuxkit/ca-certificates:e44b0a66df5a102c0e220f0066b0d904710dcb10
onboot: onboot:
- name: sysctl - name: sysctl

2
projects/swarmd/swarmd.yml
View File

@ -4,7 +4,7 @@ kernel:
init: init:
- linuxkit/init:6fe9d31a53bbd200183bb31edd795305e868d5a7 - linuxkit/init:6fe9d31a53bbd200183bb31edd795305e868d5a7
- linuxkit/runc:a1b564248a0d0b118c11e61db9f84ecf41dd2d2a - linuxkit/runc:a1b564248a0d0b118c11e61db9f84ecf41dd2d2a
- linuxkit/containerd:06876ceef325e49e9ba119659357768d5df89075 - linuxkit/containerd:ad6710e069cb538c76314a28e09d6b49958c88e0
- linuxkit/ca-certificates:e44b0a66df5a102c0e220f0066b0d904710dcb10 - linuxkit/ca-certificates:e44b0a66df5a102c0e220f0066b0d904710dcb10
onboot: onboot:
- name: sysctl - name: sysctl

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

@ -4,7 +4,7 @@ kernel:
init: init:
- linuxkit/init:6fe9d31a53bbd200183bb31edd795305e868d5a7 - linuxkit/init:6fe9d31a53bbd200183bb31edd795305e868d5a7
- linuxkit/runc:a1b564248a0d0b118c11e61db9f84ecf41dd2d2a - linuxkit/runc:a1b564248a0d0b118c11e61db9f84ecf41dd2d2a
- linuxkit/containerd:06876ceef325e49e9ba119659357768d5df89075 - linuxkit/containerd:ad6710e069cb538c76314a28e09d6b49958c88e0
services: services:
- name: acpid - name: acpid
image: linuxkit/acpid:79e5c20de96e1633c9c40935b99dde45aefba37b image: linuxkit/acpid:79e5c20de96e1633c9c40935b99dde45aefba37b

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

@ -4,7 +4,7 @@ kernel:
init: init:
- linuxkit/init:6fe9d31a53bbd200183bb31edd795305e868d5a7 - linuxkit/init:6fe9d31a53bbd200183bb31edd795305e868d5a7
- linuxkit/runc:a1b564248a0d0b118c11e61db9f84ecf41dd2d2a - linuxkit/runc:a1b564248a0d0b118c11e61db9f84ecf41dd2d2a
- linuxkit/containerd:06876ceef325e49e9ba119659357768d5df89075 - linuxkit/containerd:ad6710e069cb538c76314a28e09d6b49958c88e0
- linuxkit/ca-certificates:e44b0a66df5a102c0e220f0066b0d904710dcb10 - linuxkit/ca-certificates:e44b0a66df5a102c0e220f0066b0d904710dcb10
onboot: onboot:
- name: sysctl - name: sysctl

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

@ -4,7 +4,7 @@ kernel:
init: init:
- linuxkit/init:6fe9d31a53bbd200183bb31edd795305e868d5a7 - linuxkit/init:6fe9d31a53bbd200183bb31edd795305e868d5a7
- linuxkit/runc:a1b564248a0d0b118c11e61db9f84ecf41dd2d2a - linuxkit/runc:a1b564248a0d0b118c11e61db9f84ecf41dd2d2a
- linuxkit/containerd:06876ceef325e49e9ba119659357768d5df89075 - linuxkit/containerd:ad6710e069cb538c76314a28e09d6b49958c88e0
- linuxkit/ca-certificates:e44b0a66df5a102c0e220f0066b0d904710dcb10 - linuxkit/ca-certificates:e44b0a66df5a102c0e220f0066b0d904710dcb10
onboot: onboot:
- name: dhcpcd - name: dhcpcd

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

@ -4,7 +4,7 @@ kernel:
init: init:
- linuxkit/init:6fe9d31a53bbd200183bb31edd795305e868d5a7 - linuxkit/init:6fe9d31a53bbd200183bb31edd795305e868d5a7
- linuxkit/runc:a1b564248a0d0b118c11e61db9f84ecf41dd2d2a - linuxkit/runc:a1b564248a0d0b118c11e61db9f84ecf41dd2d2a
- linuxkit/containerd:06876ceef325e49e9ba119659357768d5df89075 - linuxkit/containerd:ad6710e069cb538c76314a28e09d6b49958c88e0
- linuxkit/ca-certificates:e44b0a66df5a102c0e220f0066b0d904710dcb10 - linuxkit/ca-certificates:e44b0a66df5a102c0e220f0066b0d904710dcb10
onboot: onboot:
- name: dhcpcd - name: dhcpcd

2
test/cases/040_packages/023_wireguard/test.yml
View File

@ -4,7 +4,7 @@ kernel:
init: init:
- linuxkit/init:6fe9d31a53bbd200183bb31edd795305e868d5a7 - linuxkit/init:6fe9d31a53bbd200183bb31edd795305e868d5a7
- linuxkit/runc:a1b564248a0d0b118c11e61db9f84ecf41dd2d2a - linuxkit/runc:a1b564248a0d0b118c11e61db9f84ecf41dd2d2a
- linuxkit/containerd:06876ceef325e49e9ba119659357768d5df89075 - linuxkit/containerd:ad6710e069cb538c76314a28e09d6b49958c88e0
- linuxkit/ca-certificates:e44b0a66df5a102c0e220f0066b0d904710dcb10 - linuxkit/ca-certificates:e44b0a66df5a102c0e220f0066b0d904710dcb10
onboot: onboot:
- name: dhcpcd - name: dhcpcd

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

@ -4,7 +4,7 @@ kernel:
init: init:
- linuxkit/init:6fe9d31a53bbd200183bb31edd795305e868d5a7 - linuxkit/init:6fe9d31a53bbd200183bb31edd795305e868d5a7
- linuxkit/runc:a1b564248a0d0b118c11e61db9f84ecf41dd2d2a - linuxkit/runc:a1b564248a0d0b118c11e61db9f84ecf41dd2d2a
- linuxkit/containerd:06876ceef325e49e9ba119659357768d5df89075 - linuxkit/containerd:ad6710e069cb538c76314a28e09d6b49958c88e0
onboot: onboot:
- name: ltp - name: ltp
image: linuxkit/test-ltp:38cec1526acc8b1a2ce4b4ece78a810078c807e1 image: linuxkit/test-ltp:38cec1526acc8b1a2ce4b4ece78a810078c807e1

2
test/hack/test.yml
View File

@ -6,7 +6,7 @@ kernel:
init: init:
- linuxkit/init:6fe9d31a53bbd200183bb31edd795305e868d5a7 - linuxkit/init:6fe9d31a53bbd200183bb31edd795305e868d5a7
- linuxkit/runc:a1b564248a0d0b118c11e61db9f84ecf41dd2d2a - linuxkit/runc:a1b564248a0d0b118c11e61db9f84ecf41dd2d2a
- linuxkit/containerd:06876ceef325e49e9ba119659357768d5df89075 - linuxkit/containerd:ad6710e069cb538c76314a28e09d6b49958c88e0
onboot: onboot:
- name: dhcpcd - name: dhcpcd
image: linuxkit/dhcpcd:f3f5413abb78fae9020e35bd4788fa93df4530b7 image: linuxkit/dhcpcd:f3f5413abb78fae9020e35bd4788fa93df4530b7

5
tools/alpine/Dockerfile
View File

@ -40,7 +40,7 @@ RUN go get -u github.com/golang/lint/golint
RUN go get -u github.com/gordonklaus/ineffassign RUN go get -u github.com/gordonklaus/ineffassign
RUN go get -u github.com/LK4D4/vndr RUN go get -u github.com/LK4D4/vndr
# checkout containerd # checkout and compile containerd
# Update `FROM` in `pkg/containerd/Dockerfile`, `pkg/init/Dockerfile` and # Update `FROM` in `pkg/containerd/Dockerfile`, `pkg/init/Dockerfile` and
# `test/pkg/containerd/Dockerfile` when changing this. # `test/pkg/containerd/Dockerfile` when changing this.
ENV CONTAINERD_REPO=https://github.com/containerd/containerd.git ENV CONTAINERD_REPO=https://github.com/containerd/containerd.git
@ -50,6 +50,9 @@ RUN mkdir -p $GOPATH/src/github.com/containerd && \
git clone https://github.com/containerd/containerd.git && \ git clone https://github.com/containerd/containerd.git && \
cd $GOPATH/src/github.com/containerd/containerd && \ cd $GOPATH/src/github.com/containerd/containerd && \
git checkout $CONTAINERD_COMMIT git checkout $CONTAINERD_COMMIT
RUN apk add --no-cache btrfs-progs-dev gcc libc-dev linux-headers make
RUN cd $GOPATH/src/github.com/containerd/containerd && \
make binaries EXTRA_FLAGS="-buildmode pie" EXTRA_LDFLAGS="-extldflags \\\"-fno-PIC -static\\\""
FROM $BASE FROM $BASE

2
tools/alpine/versions.aarch64
View File

@ -1,4 +1,4 @@
# linuxkit/alpine:415e9417004bbd8940a4c2303195b20a5dbd8c9a-arm64 # linuxkit/alpine:a662efbaf4226d0ac358cc009ead9a95b3b1dd99-arm64
# automatically generated list of installed packages # automatically generated list of installed packages
abuild-3.0.0_rc2-r8 abuild-3.0.0_rc2-r8
alpine-baselayout-3.0.4-r0 alpine-baselayout-3.0.4-r0

2
tools/alpine/versions.x86_64
View File

@ -1,4 +1,4 @@
# linuxkit/alpine:79987c65c66700171c073151c1d3f0372597bec2-amd64 # linuxkit/alpine:77287352db68b442534c0005edd6ff750c8189f3-amd64
# automatically generated list of installed packages # automatically generated list of installed packages
abuild-3.0.0_rc2-r8 abuild-3.0.0_rc2-r8
alpine-baselayout-3.0.4-r0 alpine-baselayout-3.0.4-r0