diff --git a/docs/faq.md b/docs/faq.md index 00259db1f..5560e5bd7 100644 --- a/docs/faq.md +++ b/docs/faq.md @@ -11,16 +11,16 @@ system is installed, and it would be useful to support this for that use case, a updater container to control this for people who want to use this. We generally use external tooling such as [Infrakit](https://github.com/docker/infrakit) or -CloudFormation templates to manage the update process externally from Moby, including +CloudFormation templates to manage the update process externally from LinuxKit, including doing rolling cluster upgrades to make sure distributed applciations stay up and responsive. Updates may preserve the state disk used by applications if needed, either on the same physical node, or by reattaching a virtual cloud volume to a new node. -## What do I need to build Moby? +## What do I need to build LinuxKit? We have tried to make this as simple as possible, by using containers for the build process, so -you should be able to build Moby on any OSX or Linux laptop; we should have Windows build support +you should be able to build LinuxKit on any OSX or Linux laptop; we should have Windows build support soon. ## Why not use `systemd`? diff --git a/docs/kernel-patches.md b/docs/kernel-patches.md index 2982258a2..e0b211695 100644 --- a/docs/kernel-patches.md +++ b/docs/kernel-patches.md @@ -91,4 +91,4 @@ rm $KITSRC/kernel/patches-4.9/* git format-patch -o $KITSRC/kernel/patches-4.9 v4.9.15..HEAD ``` -The, create a PR for Moby. +The, create a PR for LinuxKit. diff --git a/docs/yaml.md b/docs/yaml.md index 74a0fc0f5..9e7bb3955 100644 --- a/docs/yaml.md +++ b/docs/yaml.md @@ -39,8 +39,8 @@ For details of the config for each container, see below. This section specifies which build components are to be cryptographically verified with [Docker Content Trust](https://docs.docker.com/engine/security/trust/content_trust/) prior to pulling. -Trust is a central concern in any build system, and Moby's is no exception: Docker Content Trust provides authenticity, -integrity, and freshness guarantees for the components it verifies. The Moby maintainers are responsible for signing +Trust is a central concern in any build system, and LinuxKit's is no exception: Docker Content Trust provides authenticity, +integrity, and freshness guarantees for the components it verifies. The LinuxKit maintainers are responsible for signing `mobylinux` components, though collaborators can sign their own images with Docker Content Trust or [Notary](https://github.com/docker/notary). - `image` lists which individual images to enforce pulling with Docker Content Trust. diff --git a/examples/docker.yml b/examples/docker.yml index 49cc33a4a..1d378efc2 100644 --- a/examples/docker.yml +++ b/examples/docker.yml @@ -2,7 +2,7 @@ kernel: image: "mobylinux/kernel:4.9.x" cmdline: "console=ttyS0 console=tty0 page_poison=1" init: - - mobylinux/init:8375addb923b8b88b2209740309c92aa5f2a4f9d + - linuxkit/init:63eed9ca7a09d2ce4c0c5e7238ac005fa44f564b - mobylinux/runc:b0fb122e10dbb7e4e45115177a61a3f8d68c19a9 - mobylinux/containerd:18eaf72f3f4f9a9f29ca1951f66df701f873060b - mobylinux/ca-certificates:eabc5a6e59f05aa91529d80e9a595b85b046f935 diff --git a/examples/gcp.yml b/examples/gcp.yml index 1eeaf1fb9..aefeccc24 100644 --- a/examples/gcp.yml +++ b/examples/gcp.yml @@ -2,7 +2,7 @@ kernel: image: "mobylinux/kernel:4.9.x" cmdline: "console=ttyS0 page_poison=1" init: - - mobylinux/init:8375addb923b8b88b2209740309c92aa5f2a4f9d + - linuxkit/init:63eed9ca7a09d2ce4c0c5e7238ac005fa44f564b - mobylinux/runc:b0fb122e10dbb7e4e45115177a61a3f8d68c19a9 - mobylinux/containerd:18eaf72f3f4f9a9f29ca1951f66df701f873060b - mobylinux/ca-certificates:eabc5a6e59f05aa91529d80e9a595b85b046f935 @@ -16,7 +16,7 @@ onboot: - CAP_SYS_ADMIN readonly: true - name: dhcpcd - image: "mobylinux/dhcpcd:0d4012269cb142972fed8542fbdc3ff5a7b695cd" + image: "linuxkit/dhcpcd:48e249ebef6a521eed886b3bce032db69fbb4afa" binds: - /var:/var - /tmp/etc:/etc @@ -44,7 +44,7 @@ services: oomScoreAdj: -800 readonly: true - name: sshd - image: "mobylinux/sshd:160631d59fffc13d523ff7f09b3b49538d34b9cd" + image: "linuxkit/sshd:e108d208adf692c8a0954f602743e0eec445364e" capabilities: - all net: host diff --git a/examples/packet.yml b/examples/packet.yml index eb72e562b..112487e08 100644 --- a/examples/packet.yml +++ b/examples/packet.yml @@ -21,7 +21,7 @@ services: - CAP_SYS_ADMIN oomScoreAdj: -800 - name: dhcpcd - image: "mobylinux/dhcpcd:0d4012269cb142972fed8542fbdc3ff5a7b695cd" + image: "linuxkit/dhcpcd:48e249ebef6a521eed886b3bce032db69fbb4afa" binds: - /var:/var - /tmp:/etc @@ -32,7 +32,7 @@ services: net: host oomScoreAdj: -800 - name: sshd - image: "mobylinux/sshd:160631d59fffc13d523ff7f09b3b49538d34b9cd" + image: "linuxkit/sshd:e108d208adf692c8a0954f602743e0eec445364e" capabilities: - all net: host diff --git a/examples/sshd.yml b/examples/sshd.yml index ad8bc1b8e..93349d7fc 100644 --- a/examples/sshd.yml +++ b/examples/sshd.yml @@ -2,7 +2,7 @@ kernel: image: "mobylinux/kernel:4.9.x" cmdline: "console=ttyS0 page_poison=1" init: - - mobylinux/init:8375addb923b8b88b2209740309c92aa5f2a4f9d + - linuxkit/init:63eed9ca7a09d2ce4c0c5e7238ac005fa44f564b - mobylinux/runc:b0fb122e10dbb7e4e45115177a61a3f8d68c19a9 - mobylinux/containerd:18eaf72f3f4f9a9f29ca1951f66df701f873060b - mobylinux/ca-certificates:eabc5a6e59f05aa91529d80e9a595b85b046f935 @@ -21,7 +21,7 @@ services: - CAP_SYS_ADMIN oomScoreAdj: -800 - name: dhcpcd - image: "mobylinux/dhcpcd:0d4012269cb142972fed8542fbdc3ff5a7b695cd" + image: "linuxkit/dhcpcd:48e249ebef6a521eed886b3bce032db69fbb4afa" binds: - /var:/var - /tmp:/etc @@ -32,7 +32,7 @@ services: net: host oomScoreAdj: -800 - name: sshd - image: "mobylinux/sshd:160631d59fffc13d523ff7f09b3b49538d34b9cd" + image: "linuxkit/sshd:e108d208adf692c8a0954f602743e0eec445364e" capabilities: - all net: host diff --git a/examples/vmware.yml b/examples/vmware.yml index e8964cd28..c987bb483 100644 --- a/examples/vmware.yml +++ b/examples/vmware.yml @@ -2,7 +2,7 @@ kernel: image: "mobylinux/kernel:4.9.x" cmdline: "console=tty0 page_poison=1" init: - - mobylinux/init:8375addb923b8b88b2209740309c92aa5f2a4f9d + - linuxkit/init:63eed9ca7a09d2ce4c0c5e7238ac005fa44f564b - mobylinux/runc:b0fb122e10dbb7e4e45115177a61a3f8d68c19a9 - mobylinux/containerd:18eaf72f3f4f9a9f29ca1951f66df701f873060b - mobylinux/ca-certificates:eabc5a6e59f05aa91529d80e9a595b85b046f935 @@ -23,7 +23,7 @@ services: oomScoreAdj: -800 readonly: true - name: dhcpcd - image: "mobylinux/dhcpcd:0d4012269cb142972fed8542fbdc3ff5a7b695cd" + image: "linuxkit/dhcpcd:48e249ebef6a521eed886b3bce032db69fbb4afa" binds: - /var:/var - /tmp:/etc diff --git a/linuxkit.yml b/linuxkit.yml index 8f721958c..0a0424d80 100644 --- a/linuxkit.yml +++ b/linuxkit.yml @@ -2,7 +2,7 @@ kernel: image: "mobylinux/kernel:4.9.x" cmdline: "console=ttyS0 console=tty0 page_poison=1" init: - - mobylinux/init:8375addb923b8b88b2209740309c92aa5f2a4f9d + - linuxkit/init:63eed9ca7a09d2ce4c0c5e7238ac005fa44f564b - mobylinux/runc:b0fb122e10dbb7e4e45115177a61a3f8d68c19a9 - mobylinux/containerd:18eaf72f3f4f9a9f29ca1951f66df701f873060b - mobylinux/ca-certificates:eabc5a6e59f05aa91529d80e9a595b85b046f935 @@ -21,7 +21,7 @@ onboot: - /proc/sys/fs/binfmt_misc:/binfmt_misc readonly: true - name: dhcpcd - image: "mobylinux/dhcpcd:0d4012269cb142972fed8542fbdc3ff5a7b695cd" + image: "linuxkit/dhcpcd:48e249ebef6a521eed886b3bce032db69fbb4afa" binds: - /var:/var - /tmp/etc:/etc diff --git a/pkg/dhcpcd/dhcpcd.conf b/pkg/dhcpcd/dhcpcd.conf index 62d2e6ec7..609c576bd 100644 --- a/pkg/dhcpcd/dhcpcd.conf +++ b/pkg/dhcpcd/dhcpcd.conf @@ -1,5 +1,3 @@ -# Moby dhcpcd config - # Only configure standard external ethernet allowinterfaces eth* diff --git a/pkg/init/etc/dhcpcd.conf b/pkg/init/etc/dhcpcd.conf deleted file mode 100644 index 695eb9fb2..000000000 --- a/pkg/init/etc/dhcpcd.conf +++ /dev/null @@ -1,46 +0,0 @@ -# Moby dhcpcd config - -# Only configure standard external ethernet -allowinterfaces eth* - -# Inform the DHCP server of our hostname for DDNS. -hostname - -# Use the hardware address of the interface for the Client ID. -clientid -# or -# Use the same DUID + IAID as set in DHCPv6 for DHCPv4 ClientID as per RFC4361. -# Some non-RFC compliant DHCP servers do not reply with this set. -# In this case, comment out duid and enable clientid above. -#duid - -# Persist interface configuration when dhcpcd exits. -persistent - -# Rapid commit support. -# Safe to enable by default because it requires the equivalent option set -# on the server to actually work. -option rapid_commit - -# A list of options to request from the DHCP server. -option domain_name_servers, domain_name, domain_search, host_name -option classless_static_routes -# Most distributions have NTP support. -option ntp_servers -# Respect the network MTU. This is applied to DHCP routes. -option interface_mtu - -# A ServerID is required by RFC2131. -require dhcp_server_identifier - -# Generate Stable Private IPv6 Addresses instead of hardware based ones -slaac private - -# Do not wait -nodelay - -# Do not arp to check IP -noarp - -# Only fork when we have ipv4 -# waitip 4 diff --git a/pkg/init/etc/issue b/pkg/init/etc/issue index f5a95ea49..ac3f79e41 100644 --- a/pkg/init/etc/issue +++ b/pkg/init/etc/issue @@ -1,5 +1,5 @@ -Welcome to Moby +Welcome to LinuxKit ## . ## ## ## == diff --git a/pkg/sshd/etc/motd b/pkg/sshd/etc/motd index bd3a02625..8132011ca 100644 --- a/pkg/sshd/etc/motd +++ b/pkg/sshd/etc/motd @@ -1 +1 @@ -Welcome to Moby +Welcome to LinuxKit diff --git a/projects/clear-containers/clear-containers.yml b/projects/clear-containers/clear-containers.yml index 7401e286f..22e87477e 100644 --- a/projects/clear-containers/clear-containers.yml +++ b/projects/clear-containers/clear-containers.yml @@ -2,7 +2,7 @@ kernel: image: "linuxkit/kernel-clear-containers:4.9.x" cmdline: "root=/dev/pmem0p1 rootflags=dax,data=ordered,errors=remount-ro rw rootfstype=ext4 tsc=reliable no_timer_check rcupdate.rcu_expedited=1 i8042.direct=1 i8042.dumbkbd=1 i8042.nopnp=1 i8042.noaux=1 noreplace-smp reboot=k panic=1 console=hvc0 console=hvc1 initcall_debug iommu=off quiet cryptomgr.notests page_poison=on" init: - - mobylinux/init:8375addb923b8b88b2209740309c92aa5f2a4f9d + - linuxkit/init:63eed9ca7a09d2ce4c0c5e7238ac005fa44f564b onboot: - name: sysctl image: "mobylinux/sysctl:2cf2f9d5b4d314ba1bfc22b2fe931924af666d8c" diff --git a/projects/kubernetes/kube-master.yml b/projects/kubernetes/kube-master.yml index a5d80e29e..aa4e59d8b 100644 --- a/projects/kubernetes/kube-master.yml +++ b/projects/kubernetes/kube-master.yml @@ -2,7 +2,7 @@ kernel: image: "mobylinux/kernel:4.9.x" cmdline: "console=ttyS0 console=tty0 page_poison=1" init: - - mobylinux/init:8375addb923b8b88b2209740309c92aa5f2a4f9d + - linuxkit/init:63eed9ca7a09d2ce4c0c5e7238ac005fa44f564b - mobylinux/runc:b0fb122e10dbb7e4e45115177a61a3f8d68c19a9 - mobylinux/containerd:18eaf72f3f4f9a9f29ca1951f66df701f873060b - mobylinux/ca-certificates:eabc5a6e59f05aa91529d80e9a595b85b046f935 @@ -66,7 +66,7 @@ services: - CAP_SETGID net: host - name: sshd - image: "mobylinux/sshd:160631d59fffc13d523ff7f09b3b49538d34b9cd" + image: "linuxkit/sshd:e108d208adf692c8a0954f602743e0eec445364e" capabilities: - all net: host diff --git a/projects/kubernetes/kube-node.yml b/projects/kubernetes/kube-node.yml index 76e628203..c31326728 100644 --- a/projects/kubernetes/kube-node.yml +++ b/projects/kubernetes/kube-node.yml @@ -2,7 +2,7 @@ kernel: image: "mobylinux/kernel:4.9.x" cmdline: "console=ttyS0 console=tty0 page_poison=1" init: - - mobylinux/init:8375addb923b8b88b2209740309c92aa5f2a4f9d + - linuxkit/init:63eed9ca7a09d2ce4c0c5e7238ac005fa44f564b - mobylinux/runc:b0fb122e10dbb7e4e45115177a61a3f8d68c19a9 - mobylinux/containerd:18eaf72f3f4f9a9f29ca1951f66df701f873060b - mobylinux/ca-certificates:eabc5a6e59f05aa91529d80e9a595b85b046f935 @@ -66,7 +66,7 @@ services: - CAP_SETGID net: host - name: sshd - image: "mobylinux/sshd:160631d59fffc13d523ff7f09b3b49538d34b9cd" + image: "linuxkit/sshd:e108d208adf692c8a0954f602743e0eec445364e" capabilities: - all net: host diff --git a/projects/landlock/landlock.yml b/projects/landlock/landlock.yml index a0fe28cb9..ee4640ce3 100644 --- a/projects/landlock/landlock.yml +++ b/projects/landlock/landlock.yml @@ -2,7 +2,7 @@ kernel: image: "mobylinux/kernel-landlock:4.9.x" cmdline: "console=ttyS0 page_poison=1" init: - - mobylinux/init:8375addb923b8b88b2209740309c92aa5f2a4f9d + - linuxkit/init:63eed9ca7a09d2ce4c0c5e7238ac005fa44f564b - mobylinux/runc:b0fb122e10dbb7e4e45115177a61a3f8d68c19a9 - mobylinux/containerd:18eaf72f3f4f9a9f29ca1951f66df701f873060b - mobylinux/ca-certificates:eabc5a6e59f05aa91529d80e9a595b85b046f935 diff --git a/projects/swarmd/swarmd.yml b/projects/swarmd/swarmd.yml index a3013a8f6..c45929b01 100644 --- a/projects/swarmd/swarmd.yml +++ b/projects/swarmd/swarmd.yml @@ -20,7 +20,7 @@ services: oomScoreAdj: -800 readonly: true - name: dhcpcd - image: "mobylinux/dhcpcd:0d4012269cb142972fed8542fbdc3ff5a7b695cd" + image: "linuxkit/dhcpcd:48e249ebef6a521eed886b3bce032db69fbb4afa" binds: - /var:/var - /tmp/etc:/etc diff --git a/test/docker-bench/test-docker-bench.yml b/test/docker-bench/test-docker-bench.yml index 02338f1d9..62e13fe84 100644 --- a/test/docker-bench/test-docker-bench.yml +++ b/test/docker-bench/test-docker-bench.yml @@ -2,7 +2,7 @@ kernel: image: "mobylinux/kernel:4.9.x" cmdline: "console=ttyS0 console=tty0 page_poison=1" init: - - mobylinux/init:8375addb923b8b88b2209740309c92aa5f2a4f9d + - linuxkit/init:63eed9ca7a09d2ce4c0c5e7238ac005fa44f564b - mobylinux/runc:b0fb122e10dbb7e4e45115177a61a3f8d68c19a9 - mobylinux/containerd:18eaf72f3f4f9a9f29ca1951f66df701f873060b - mobylinux/ca-certificates:eabc5a6e59f05aa91529d80e9a595b85b046f935 diff --git a/test/ltp/test-ltp.yml b/test/ltp/test-ltp.yml index 4cf199526..d85bd81a8 100644 --- a/test/ltp/test-ltp.yml +++ b/test/ltp/test-ltp.yml @@ -2,7 +2,7 @@ kernel: image: "mobylinux/kernel:4.9.x" cmdline: "console=ttyS0" init: - - mobylinux/init:8375addb923b8b88b2209740309c92aa5f2a4f9d + - linuxkit/init:63eed9ca7a09d2ce4c0c5e7238ac005fa44f564b - mobylinux/runc:b0fb122e10dbb7e4e45115177a61a3f8d68c19a9 - mobylinux/containerd:18eaf72f3f4f9a9f29ca1951f66df701f873060b - mobylinux/ca-certificates:eabc5a6e59f05aa91529d80e9a595b85b046f935 diff --git a/test/test.yml b/test/test.yml index 0a49c4a2e..4cd21c41e 100644 --- a/test/test.yml +++ b/test/test.yml @@ -2,13 +2,13 @@ kernel: image: "mobylinux/kernel:4.9.x" cmdline: "console=ttyS0" init: - - mobylinux/init:8375addb923b8b88b2209740309c92aa5f2a4f9d + - linuxkit/init:63eed9ca7a09d2ce4c0c5e7238ac005fa44f564b - mobylinux/runc:b0fb122e10dbb7e4e45115177a61a3f8d68c19a9 - mobylinux/containerd:18eaf72f3f4f9a9f29ca1951f66df701f873060b - mobylinux/ca-certificates:eabc5a6e59f05aa91529d80e9a595b85b046f935 onboot: - name: dhcpcd - image: "mobylinux/dhcpcd:0d4012269cb142972fed8542fbdc3ff5a7b695cd" + image: "linuxkit/dhcpcd:48e249ebef6a521eed886b3bce032db69fbb4afa" binds: - /var:/var - /tmp:/etc diff --git a/test/virtsock/test-virtsock-server.yml b/test/virtsock/test-virtsock-server.yml index 95fdc3256..c9f86970b 100644 --- a/test/virtsock/test-virtsock-server.yml +++ b/test/virtsock/test-virtsock-server.yml @@ -6,7 +6,7 @@ kernel: image: "mobylinux/kernel:4.9.x" cmdline: "console=ttyS0 page_poison=1" init: - - mobylinux/init:8375addb923b8b88b2209740309c92aa5f2a4f9d + - linuxkit/init:63eed9ca7a09d2ce4c0c5e7238ac005fa44f564b - mobylinux/runc:b0fb122e10dbb7e4e45115177a61a3f8d68c19a9 - mobylinux/containerd:18eaf72f3f4f9a9f29ca1951f66df701f873060b - mobylinux/ca-certificates:eabc5a6e59f05aa91529d80e9a595b85b046f935 @@ -27,7 +27,7 @@ services: oomScoreAdj: -800 readonly: true - name: dhcpcd - image: "mobylinux/dhcpcd:0d4012269cb142972fed8542fbdc3ff5a7b695cd" + image: "linuxkit/dhcpcd:48e249ebef6a521eed886b3bce032db69fbb4afa" binds: - /var:/var - /tmp:/etc