From fb5d6a8fad9ae1c2a12157079ec53d86465f7179 Mon Sep 17 00:00:00 2001 From: Justin Cormack Date: Sat, 8 Apr 2017 21:38:31 +0100 Subject: [PATCH] Add an (empty) config file for containerd It needs one now. Signed-off-by: Justin Cormack --- examples/docker.yml | 2 +- examples/gcp.yml | 2 +- examples/sshd.yml | 2 +- examples/vmware.yml | 2 +- moby.yml | 2 +- pkg/containerd/Dockerfile | 5 +++-- pkg/containerd/Makefile | 2 +- pkg/containerd/etc/containerd/config.toml | 0 projects/demo/etcd/etcd.yml | 2 +- projects/demo/intro/intro.yml | 2 +- test/ltp/test-ltp.yml | 2 +- test/test.yml | 2 +- test/virtsock/test-virtsock-server.yml | 2 +- 13 files changed, 14 insertions(+), 13 deletions(-) create mode 100644 pkg/containerd/etc/containerd/config.toml diff --git a/examples/docker.yml b/examples/docker.yml index 11b53c078..cdeb2188e 100644 --- a/examples/docker.yml +++ b/examples/docker.yml @@ -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 diff --git a/examples/gcp.yml b/examples/gcp.yml index 6ec8045ca..e7f2b5a4a 100644 --- a/examples/gcp.yml +++ b/examples/gcp.yml @@ -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 diff --git a/examples/sshd.yml b/examples/sshd.yml index dadb7fdca..7b8cde517 100644 --- a/examples/sshd.yml +++ b/examples/sshd.yml @@ -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 diff --git a/examples/vmware.yml b/examples/vmware.yml index 839141e62..cec5bdd1d 100644 --- a/examples/vmware.yml +++ b/examples/vmware.yml @@ -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 diff --git a/moby.yml b/moby.yml index 835111ef0..a647d46de 100644 --- a/moby.yml +++ b/moby.yml @@ -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 diff --git a/pkg/containerd/Dockerfile b/pkg/containerd/Dockerfile index 882ddeaab..c9cff57f5 100644 --- a/pkg/containerd/Dockerfile +++ b/pkg/containerd/Dockerfile @@ -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"] diff --git a/pkg/containerd/Makefile b/pkg/containerd/Makefile index 376c9bfee..9c319b73d 100644 --- a/pkg/containerd/Makefile +++ b/pkg/containerd/Makefile @@ -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 - diff --git a/pkg/containerd/etc/containerd/config.toml b/pkg/containerd/etc/containerd/config.toml new file mode 100644 index 000000000..e69de29bb diff --git a/projects/demo/etcd/etcd.yml b/projects/demo/etcd/etcd.yml index 8e4810d22..453948f1e 100644 --- a/projects/demo/etcd/etcd.yml +++ b/projects/demo/etcd/etcd.yml @@ -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" diff --git a/projects/demo/intro/intro.yml b/projects/demo/intro/intro.yml index 810f9b12f..dd618a5bb 100644 --- a/projects/demo/intro/intro.yml +++ b/projects/demo/intro/intro.yml @@ -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" diff --git a/test/ltp/test-ltp.yml b/test/ltp/test-ltp.yml index bd57b8bd9..0b09b7375 100644 --- a/test/ltp/test-ltp.yml +++ b/test/ltp/test-ltp.yml @@ -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 diff --git a/test/test.yml b/test/test.yml index b012b3e02..c7efe5204 100644 --- a/test/test.yml +++ b/test/test.yml @@ -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 diff --git a/test/virtsock/test-virtsock-server.yml b/test/virtsock/test-virtsock-server.yml index 386eadaea..94d4a234b 100644 --- a/test/virtsock/test-virtsock-server.yml +++ b/test/virtsock/test-virtsock-server.yml @@ -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