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

Merge pull request #1861 from justincormack/containerd-build

Browse Source 
Update containerd
This commit is contained in:
Rolf Neugebauer 2017-05-21 11:13:07 +01:00 committed by GitHub
commit 4377ae3209
23 changed files with 25 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
examples/docker.yml
View File

@ -4,7 +4,7 @@ kernel:
init:
- linuxkit/init:cbd7ae748f0a082516501a3e914fa0c924ee941e
- linuxkit/runc:24dfe632ed3ff53a026ee3fac046fd544434e2d6
- linuxkit/containerd:1c71f95fa36040ea7e987deb98a7a2a363853f01
- linuxkit/containerd:f1130450206d4f64f0ddc13d15bb68435aa1ff61
- linuxkit/ca-certificates:4e9a83e890e6477dcd25029fc4f1ced61d0642f4
onboot:
- name: sysctl

2
examples/gcp.yml
View File

@ -4,7 +4,7 @@ kernel:
init:
- linuxkit/init:cbd7ae748f0a082516501a3e914fa0c924ee941e
- linuxkit/runc:24dfe632ed3ff53a026ee3fac046fd544434e2d6
- linuxkit/containerd:1c71f95fa36040ea7e987deb98a7a2a363853f01
- linuxkit/containerd:f1130450206d4f64f0ddc13d15bb68435aa1ff61
- linuxkit/ca-certificates:4e9a83e890e6477dcd25029fc4f1ced61d0642f4
onboot:
- name: sysctl

2
examples/minimal.yml
View File

@ -4,7 +4,7 @@ kernel:
init:
- linuxkit/init:cbd7ae748f0a082516501a3e914fa0c924ee941e
- linuxkit/runc:24dfe632ed3ff53a026ee3fac046fd544434e2d6
- linuxkit/containerd:1c71f95fa36040ea7e987deb98a7a2a363853f01
- linuxkit/containerd:f1130450206d4f64f0ddc13d15bb68435aa1ff61
onboot:
- name: dhcpcd
image: "linuxkit/dhcpcd:cb96c09a33c166eca6530f166f0f79927c3e83b0"

2
examples/node_exporter.yml
View File

@ -4,7 +4,7 @@ kernel:
init:
- linuxkit/init:cbd7ae748f0a082516501a3e914fa0c924ee941e
- linuxkit/runc:24dfe632ed3ff53a026ee3fac046fd544434e2d6
- linuxkit/containerd:1c71f95fa36040ea7e987deb98a7a2a363853f01
- linuxkit/containerd:f1130450206d4f64f0ddc13d15bb68435aa1ff61
services:
- name: rngd
image: "linuxkit/rngd:c97ef16be340884a985d8b025983505a9bcc51f0"

2
examples/packet.yml
View File

@ -4,7 +4,7 @@ kernel:
init:
- linuxkit/init:cbd7ae748f0a082516501a3e914fa0c924ee941e
- linuxkit/runc:24dfe632ed3ff53a026ee3fac046fd544434e2d6
- linuxkit/containerd:1c71f95fa36040ea7e987deb98a7a2a363853f01
- linuxkit/containerd:f1130450206d4f64f0ddc13d15bb68435aa1ff61
- linuxkit/ca-certificates:4e9a83e890e6477dcd25029fc4f1ced61d0642f4
onboot:
- name: sysctl

2
examples/redis-os.yml
View File

@ -6,7 +6,7 @@ kernel:
init:
- linuxkit/init:cbd7ae748f0a082516501a3e914fa0c924ee941e
- linuxkit/runc:24dfe632ed3ff53a026ee3fac046fd544434e2d6
- linuxkit/containerd:1c71f95fa36040ea7e987deb98a7a2a363853f01
- linuxkit/containerd:f1130450206d4f64f0ddc13d15bb68435aa1ff61
services:
- name: dhcpcd
image: "linuxkit/dhcpcd:cb96c09a33c166eca6530f166f0f79927c3e83b0"

2
examples/sshd.yml
View File

@ -4,7 +4,7 @@ kernel:
init:
- linuxkit/init:cbd7ae748f0a082516501a3e914fa0c924ee941e
- linuxkit/runc:24dfe632ed3ff53a026ee3fac046fd544434e2d6
- linuxkit/containerd:1c71f95fa36040ea7e987deb98a7a2a363853f01
- linuxkit/containerd:f1130450206d4f64f0ddc13d15bb68435aa1ff61
- linuxkit/ca-certificates:4e9a83e890e6477dcd25029fc4f1ced61d0642f4
onboot:
- name: sysctl

2
examples/swap.yml
View File

@ -4,7 +4,7 @@ kernel:
init:
- linuxkit/init:42fe8cb1508b3afed39eb89821906e3cc7a70551
- linuxkit/runc:24dfe632ed3ff53a026ee3fac046fd544434e2d6
- linuxkit/containerd:1c71f95fa36040ea7e987deb98a7a2a363853f01
- linuxkit/containerd:f1130450206d4f64f0ddc13d15bb68435aa1ff61
- linuxkit/ca-certificates:eabc5a6e59f05aa91529d80e9a595b85b046f935
onboot:
- name: sysctl

2
examples/vmware.yml
View File

@ -4,7 +4,7 @@ kernel:
init:
- linuxkit/init:cbd7ae748f0a082516501a3e914fa0c924ee941e
- linuxkit/runc:24dfe632ed3ff53a026ee3fac046fd544434e2d6
- linuxkit/containerd:1c71f95fa36040ea7e987deb98a7a2a363853f01
- linuxkit/containerd:f1130450206d4f64f0ddc13d15bb68435aa1ff61
- linuxkit/ca-certificates:4e9a83e890e6477dcd25029fc4f1ced61d0642f4
onboot:
- name: sysctl

2
linuxkit.yml
View File

@ -4,7 +4,7 @@ kernel:
init:
- linuxkit/init:cbd7ae748f0a082516501a3e914fa0c924ee941e
- linuxkit/runc:24dfe632ed3ff53a026ee3fac046fd544434e2d6
- linuxkit/containerd:1c71f95fa36040ea7e987deb98a7a2a363853f01
- linuxkit/containerd:f1130450206d4f64f0ddc13d15bb68435aa1ff61
- linuxkit/ca-certificates:4e9a83e890e6477dcd25029fc4f1ced61d0642f4
onboot:
- name: sysctl

6
pkg/containerd/Dockerfile
View File

@ -10,13 +10,13 @@ RUN \
make \
&& true
ENV GOPATH=/root/go
ENV CONTAINERD_COMMIT=b53105ed253b99f8b63809e704f23819dce9776e
ENV CONTAINERD_COMMIT=0f0f3b69dcba2efeba012ff55e2a596f12cf0bac
RUN mkdir -p $GOPATH/src/github.com/containerd && \
cd $GOPATH/src/github.com/containerd && \
git clone https://github.com/containerd/containerd.git
WORKDIR $GOPATH/src/github.com/containerd/containerd
RUN git checkout $CONTAINERD_COMMIT
RUN make binaries GO_GCFLAGS="-buildmode pie --ldflags '-extldflags \"-fno-PIC -static\"'"
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/
WORKDIR /
COPY . .
@ -24,5 +24,5 @@ COPY . .
FROM scratch
ENTRYPOINT []
WORKDIR /
COPY --from=alpine /usr/bin/containerd /usr/bin/ctr /usr/bin/containerd-shim /usr/bin/
COPY --from=alpine /usr/bin/containerd /usr/bin/ctr /usr/bin/dist /usr/bin/containerd-shim /usr/bin/
COPY --from=alpine /etc/containerd/config.toml /etc/containerd/

2
projects/etcd/etcd.yml
View File

@ -4,7 +4,7 @@ kernel:
init:
- linuxkit/init:cbd7ae748f0a082516501a3e914fa0c924ee941e
- linuxkit/runc:24dfe632ed3ff53a026ee3fac046fd544434e2d6
- linuxkit/containerd:1c71f95fa36040ea7e987deb98a7a2a363853f01
- linuxkit/containerd:f1130450206d4f64f0ddc13d15bb68435aa1ff61
- linuxkit/ca-certificates:4e9a83e890e6477dcd25029fc4f1ced61d0642f4
onboot:
- name: sysctl

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

@ -4,7 +4,7 @@ kernel:
init:
- linuxkit/init:cbd7ae748f0a082516501a3e914fa0c924ee941e
- linuxkit/runc:24dfe632ed3ff53a026ee3fac046fd544434e2d6
- linuxkit/containerd:1c71f95fa36040ea7e987deb98a7a2a363853f01
- linuxkit/containerd:f1130450206d4f64f0ddc13d15bb68435aa1ff61
- linuxkit/ca-certificates:4e9a83e890e6477dcd25029fc4f1ced61d0642f4
onboot:
- name: sysctl

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

@ -4,7 +4,7 @@ kernel:
init:
- linuxkit/init:cbd7ae748f0a082516501a3e914fa0c924ee941e
- linuxkit/runc:24dfe632ed3ff53a026ee3fac046fd544434e2d6
- linuxkit/containerd:1c71f95fa36040ea7e987deb98a7a2a363853f01
- linuxkit/containerd:f1130450206d4f64f0ddc13d15bb68435aa1ff61
- linuxkit/ca-certificates:4e9a83e890e6477dcd25029fc4f1ced61d0642f4
onboot:
- name: sysctl

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

@ -4,7 +4,7 @@ kernel:
init:
- linuxkit/init:062e57b1d1e017e44c6339fc2b4cd41f3f10b2a9 # with runc, logwrite, startmemlogd
- linuxkit/runc:24dfe632ed3ff53a026ee3fac046fd544434e2d6
- linuxkit/containerd:1c71f95fa36040ea7e987deb98a7a2a363853f01
- linuxkit/containerd:f1130450206d4f64f0ddc13d15bb68435aa1ff61
- linuxkit/ca-certificates:4e9a83e890e6477dcd25029fc4f1ced61d0642f4
- linuxkit/memlogd:9b5834189f598f43c507f6938077113906f51012
onboot:

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

@ -4,7 +4,7 @@ kernel:
init:
- linuxkit/init:cbd7ae748f0a082516501a3e914fa0c924ee941e
- linuxkit/runc:24dfe632ed3ff53a026ee3fac046fd544434e2d6
- linuxkit/containerd:1c71f95fa36040ea7e987deb98a7a2a363853f01
- linuxkit/containerd:f1130450206d4f64f0ddc13d15bb68435aa1ff61
- linuxkit/ca-certificates:4e9a83e890e6477dcd25029fc4f1ced61d0642f4
onboot:
- name: sysctl

2
projects/swarmd/swarmd.yml
View File

@ -4,7 +4,7 @@ kernel:
init:
- linuxkit/init:cbd7ae748f0a082516501a3e914fa0c924ee941e
- linuxkit/runc:2649198589ef0020d99f613adaeda45ce0093a38
- linuxkit/containerd:1c71f95fa36040ea7e987deb98a7a2a363853f01
- linuxkit/containerd:f1130450206d4f64f0ddc13d15bb68435aa1ff61
- linuxkit/ca-certificates:4e9a83e890e6477dcd25029fc4f1ced61d0642f4
onboot:
- name: sysctl

2
test/cases/000_build/000_outputs/test.yml
View File

@ -4,7 +4,7 @@ kernel:
init:
- linuxkit/init:cbd7ae748f0a082516501a3e914fa0c924ee941e
- linuxkit/runc:24dfe632ed3ff53a026ee3fac046fd544434e2d6
- linuxkit/containerd:1c71f95fa36040ea7e987deb98a7a2a363853f01
- linuxkit/containerd:f1130450206d4f64f0ddc13d15bb68435aa1ff61
onboot:
- name: dhcpcd
image: "linuxkit/dhcpcd:cb96c09a33c166eca6530f166f0f79927c3e83b0"

2
test/cases/020_kernel/000_config/test-kernel-config.yml
View File

@ -4,7 +4,7 @@ kernel:
init:
- linuxkit/init:cbd7ae748f0a082516501a3e914fa0c924ee941e
- linuxkit/runc:24dfe632ed3ff53a026ee3fac046fd544434e2d6
- linuxkit/containerd:1c71f95fa36040ea7e987deb98a7a2a363853f01
- linuxkit/containerd:f1130450206d4f64f0ddc13d15bb68435aa1ff61
- linuxkit/ca-certificates:4e9a83e890e6477dcd25029fc4f1ced61d0642f4
onboot:
- name: dhcpcd

2
test/cases/020_kernel/010_kmod/kmod.yml
View File

@ -4,7 +4,7 @@ kernel:
init:
- linuxkit/init:cbd7ae748f0a082516501a3e914fa0c924ee941e
- linuxkit/runc:24dfe632ed3ff53a026ee3fac046fd544434e2d6
- linuxkit/containerd:1c71f95fa36040ea7e987deb98a7a2a363853f01
- linuxkit/containerd:f1130450206d4f64f0ddc13d15bb68435aa1ff61
onboot:
- name: check
image: "kmod-test"

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

@ -4,7 +4,7 @@ kernel:
init:
- linuxkit/init:cbd7ae748f0a082516501a3e914fa0c924ee941e
- linuxkit/runc:24dfe632ed3ff53a026ee3fac046fd544434e2d6
- linuxkit/containerd:1c71f95fa36040ea7e987deb98a7a2a363853f01
- linuxkit/containerd:f1130450206d4f64f0ddc13d15bb68435aa1ff61
- linuxkit/ca-certificates:4e9a83e890e6477dcd25029fc4f1ced61d0642f4
onboot:
- name: sysctl

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

@ -4,7 +4,7 @@ kernel:
init:
- linuxkit/init:cbd7ae748f0a082516501a3e914fa0c924ee941e
- linuxkit/runc:24dfe632ed3ff53a026ee3fac046fd544434e2d6
- linuxkit/containerd:1c71f95fa36040ea7e987deb98a7a2a363853f01
- linuxkit/containerd:f1130450206d4f64f0ddc13d15bb68435aa1ff61
- linuxkit/ca-certificates:4e9a83e890e6477dcd25029fc4f1ced61d0642f4
onboot:
- name: ltp

2
test/hack/test.yml
View File

@ -6,7 +6,7 @@ kernel:
init:
- linuxkit/init:deea956a9ab07bf262083e93a86930bdc610cc2f
- linuxkit/runc:2649198589ef0020d99f613adaeda45ce0093a38
- linuxkit/containerd:1c71f95fa36040ea7e987deb98a7a2a363853f01
- linuxkit/containerd:f1130450206d4f64f0ddc13d15bb68435aa1ff61
- linuxkit/ca-certificates:4e9a83e890e6477dcd25029fc4f1ced61d0642f4
onboot:
- name: dhcpcd