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 #1551 from justincormack/containerd-toml

Browse Source 
Add an (empty) config file for containerd
This commit is contained in:
Justin Cormack 2017-04-08 21:49:19 +01:00 committed by GitHub
commit f9c4c30142
13 changed files with 14 additions and 13 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:
- mobylinux/init:02f05d99b4eb9cd9223bb5915f4070cf7b67c862
- mobylinux/runc:b0fb122e10dbb7e4e45115177a61a3f8d68c19a9
- mobylinux/containerd:68bb523deea09da293d675cbf88474eced540b8c
- mobylinux/containerd:c7f6ecdcbcb615a53edee556ba03c7c873bc8488
- mobylinux/ca-certificates:eabc5a6e59f05aa91529d80e9a595b85b046f935
onboot:
- name: sysctl

2
examples/gcp.yml
View File

@ -4,7 +4,7 @@ kernel:
init:
- mobylinux/init:02f05d99b4eb9cd9223bb5915f4070cf7b67c862
- mobylinux/runc:b0fb122e10dbb7e4e45115177a61a3f8d68c19a9
- mobylinux/containerd:68bb523deea09da293d675cbf88474eced540b8c
- mobylinux/containerd:c7f6ecdcbcb615a53edee556ba03c7c873bc8488
- mobylinux/ca-certificates:eabc5a6e59f05aa91529d80e9a595b85b046f935
onboot:
- name: sysctl

2
examples/sshd.yml
View File

@ -4,7 +4,7 @@ kernel:
init:
- mobylinux/init:02f05d99b4eb9cd9223bb5915f4070cf7b67c862
- mobylinux/runc:b0fb122e10dbb7e4e45115177a61a3f8d68c19a9
- mobylinux/containerd:68bb523deea09da293d675cbf88474eced540b8c
- mobylinux/containerd:c7f6ecdcbcb615a53edee556ba03c7c873bc8488
- mobylinux/ca-certificates:eabc5a6e59f05aa91529d80e9a595b85b046f935
onboot:
- name: sysctl

2
examples/vmware.yml
View File

@ -4,7 +4,7 @@ kernel:
init:
- mobylinux/init:02f05d99b4eb9cd9223bb5915f4070cf7b67c862
- mobylinux/runc:b0fb122e10dbb7e4e45115177a61a3f8d68c19a9
- mobylinux/containerd:68bb523deea09da293d675cbf88474eced540b8c
- mobylinux/containerd:c7f6ecdcbcb615a53edee556ba03c7c873bc8488
- mobylinux/ca-certificates:eabc5a6e59f05aa91529d80e9a595b85b046f935
onboot:
- name: sysctl

2
moby.yml
View File

@ -4,7 +4,7 @@ kernel:
init:
- mobylinux/init:02f05d99b4eb9cd9223bb5915f4070cf7b67c862
- mobylinux/runc:b0fb122e10dbb7e4e45115177a61a3f8d68c19a9
- mobylinux/containerd:68bb523deea09da293d675cbf88474eced540b8c
- mobylinux/containerd:c7f6ecdcbcb615a53edee556ba03c7c873bc8488
- mobylinux/ca-certificates:eabc5a6e59f05aa91529d80e9a595b85b046f935
onboot:
- name: sysctl

5
pkg/containerd/Dockerfile
View File

@ -18,5 +18,6 @@ RUN git checkout $CONTAINERD_COMMIT
RUN make binaries GO_GCFLAGS="-buildmode pie --ldflags '-extldflags \"-fno-PIC -static\"'"
RUN cp bin/containerd bin/ctr bin/containerd-shim bin/dist /usr/bin/
WORKDIR /
RUN printf "FROM scratch\nCOPY /usr/bin/* /usr/bin/\n" > Dockerfile
CMD ["tar", "cf", "-", "Dockerfile", "usr/bin/containerd", "usr/bin/ctr", "usr/bin/containerd-shim", "usr/bin/dist"]
COPY . .
RUN printf "FROM scratch\nCOPY /usr/bin/* /usr/bin/\nCOPY /etc/containerd/config.toml /etc/containerd/\n" > Dockerfile
CMD ["tar", "cf", "-", "Dockerfile", "usr/bin/containerd", "usr/bin/ctr", "usr/bin/containerd-shim", "usr/bin/dist", "etc/containerd/config.toml"]

2
pkg/containerd/Makefile
View File

@ -7,7 +7,7 @@ IMAGE=containerd
default: push
hash: Dockerfile
hash: Dockerfile etc/containerd/config.toml
DOCKER_CONTENT_TRUST=1 docker pull $(BASE)
tar cf - $^ | docker build --no-cache -t $(IMAGE):build0 -
docker run --rm $(IMAGE):build0 | docker build --no-cache -t $(IMAGE):build -

0
pkg/containerd/etc/containerd/config.toml Normal file
View File

2
projects/demo/etcd/etcd.yml
View File

@ -4,7 +4,7 @@ kernel:
init:
- mobylinux/init:925c88f42d92d57cd36b656db1f8757b152163a7
- mobylinux/runc:b0fb122e10dbb7e4e45115177a61a3f8d68c19a9
- mobylinux/containerd:68bb523deea09da293d675cbf88474eced540b8c
- mobylinux/containerd:c7f6ecdcbcb615a53edee556ba03c7c873bc8488
onboot:
- name: sysctl
image: "mobylinux/sysctl:2cf2f9d5b4d314ba1bfc22b2fe931924af666d8c"

2
projects/demo/intro/intro.yml
View File

@ -4,7 +4,7 @@ kernel:
init:
- mobylinux/init:925c88f42d92d57cd36b656db1f8757b152163a7
- mobylinux/runc:b0fb122e10dbb7e4e45115177a61a3f8d68c19a9
- mobylinux/containerd:68bb523deea09da293d675cbf88474eced540b8c
- mobylinux/containerd:c7f6ecdcbcb615a53edee556ba03c7c873bc8488
onboot:
- name: sysctl
image: "mobylinux/sysctl:2cf2f9d5b4d314ba1bfc22b2fe931924af666d8c"

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

@ -4,7 +4,7 @@ kernel:
init:
- mobylinux/init:02f05d99b4eb9cd9223bb5915f4070cf7b67c862
- mobylinux/runc:b0fb122e10dbb7e4e45115177a61a3f8d68c19a9
- mobylinux/containerd:68bb523deea09da293d675cbf88474eced540b8c
- mobylinux/containerd:c7f6ecdcbcb615a53edee556ba03c7c873bc8488
- mobylinux/ca-certificates:eabc5a6e59f05aa91529d80e9a595b85b046f935
onboot:
- name: ltp

2
test/test.yml
View File

@ -4,7 +4,7 @@ kernel:
init:
- mobylinux/init:02f05d99b4eb9cd9223bb5915f4070cf7b67c862
- mobylinux/runc:b0fb122e10dbb7e4e45115177a61a3f8d68c19a9
- mobylinux/containerd:68bb523deea09da293d675cbf88474eced540b8c
- mobylinux/containerd:c7f6ecdcbcb615a53edee556ba03c7c873bc8488
- mobylinux/ca-certificates:eabc5a6e59f05aa91529d80e9a595b85b046f935
onboot:
- name: binfmt

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

@ -8,7 +8,7 @@ kernel:
init:
- mobylinux/init:02f05d99b4eb9cd9223bb5915f4070cf7b67c862
- mobylinux/runc:b0fb122e10dbb7e4e45115177a61a3f8d68c19a9
- mobylinux/containerd:68bb523deea09da293d675cbf88474eced540b8c
- mobylinux/containerd:c7f6ecdcbcb615a53edee556ba03c7c873bc8488
- mobylinux/ca-certificates:eabc5a6e59f05aa91529d80e9a595b85b046f935
onboot:
- name: sysctl