Permalink
Browse files

Merge pull request #3037 from rn/rel_v0.4

Preparation for the v0.4 release
  • Loading branch information...
rn committed May 12, 2018
2 parents 0297a03 + f84c13a commit 8d17887e11c7ad25efd7f201b8dfe2b0badc4bee
Showing with 741 additions and 722 deletions.
  1. +19 −0 CHANGELOG.md
  2. +2 −2 Makefile
  3. +4 −4 contrib/crosvm/README.md
  4. +2 −2 docs/vendoring.md
  5. +9 −9 examples/aws.yml
  6. +8 −8 examples/azure.yml
  7. +13 −13 examples/cadvisor.yml
  8. +20 −20 examples/docker-for-mac.yml
  9. +12 −12 examples/docker.yml
  10. +10 −10 examples/gcp.yml
  11. +8 −8 examples/getty.yml
  12. +8 −8 examples/hostmount-writeable-overlay.yml
  13. +6 −6 examples/influxdb-os.yml
  14. +5 −5 examples/minimal.yml
  15. +7 −7 examples/node_exporter.yml
  16. +9 −9 examples/openstack.yml
  17. +1 −1 examples/packet.arm64.yml
  18. +12 −12 examples/packet.yml
  19. +5 −5 examples/redis-os.yml
  20. +9 −9 examples/rt-for-vmware.yml
  21. +10 −10 examples/sshd.yml
  22. +11 −11 examples/swap.yml
  23. +9 −9 examples/tpm.yml
  24. +8 −8 examples/vmware.yml
  25. +6 −6 examples/vpnkit-forwarder.yml
  26. +5 −5 examples/vsudd-containerd.yml
  27. +10 −10 examples/vultr.yml
  28. +10 −10 examples/wireguard.yml
  29. +8 −8 linuxkit.yml
  30. +2 −2 pkg/acpid/Dockerfile
  31. +1 −1 pkg/auditd/Dockerfile
  32. +2 −2 pkg/binfmt/Dockerfile
  33. +1 −1 pkg/ca-certificates/Dockerfile
  34. +2 −2 pkg/cadvisor/Dockerfile
  35. +1 −1 pkg/containerd/Dockerfile
  36. +1 −1 pkg/dhcpcd/Dockerfile
  37. +2 −2 pkg/extend/Dockerfile
  38. +1 −1 pkg/firmware-all/Dockerfile
  39. +1 −1 pkg/firmware/Dockerfile
  40. +2 −2 pkg/format/Dockerfile
  41. +1 −1 pkg/getty/Dockerfile
  42. +1 −1 pkg/host-timesync-daemon/Dockerfile
  43. +2 −2 pkg/init/Dockerfile
  44. +1 −1 pkg/ip/Dockerfile
  45. +1 −1 pkg/metadata/Dockerfile
  46. +1 −1 pkg/mkimage/Dockerfile
  47. +1 −1 pkg/modprobe/Dockerfile
  48. +2 −2 pkg/mount/Dockerfile
  49. +1 −1 pkg/node_exporter/Dockerfile
  50. +1 −1 pkg/open-vm-tools/Dockerfile
  51. +1 −1 pkg/openntpd/Dockerfile
  52. +1 −1 pkg/qemu-ga/Dockerfile
  53. +1 −1 pkg/rngd/Dockerfile
  54. +1 −1 pkg/runc/Dockerfile
  55. +1 −1 pkg/sshd/Dockerfile
  56. +1 −1 pkg/swap/Dockerfile
  57. +1 −1 pkg/sysctl/Dockerfile
  58. +1 −1 pkg/sysfs/Dockerfile
  59. +1 −1 pkg/trim-after-delete/Dockerfile
  60. +1 −1 pkg/tss/Dockerfile
  61. +1 −1 pkg/vpnkit-expose-port/Dockerfile
  62. +1 −1 pkg/vpnkit-forwarder/Dockerfile
  63. +1 −1 pkg/vsudd/Dockerfile
  64. +1 −1 projects/clear-containers/clear-containers.yml
  65. +11 −11 projects/compose/compose-dynamic.yml
  66. +11 −11 projects/compose/compose-static.yml
  67. +7 −7 projects/ima-namespace/ima-namespace.yml
  68. +1 −1 projects/landlock/landlock.yml
  69. +7 −7 projects/logging/examples/logging.yml
  70. +5 −5 projects/memorizer/memorizer.yml
  71. +8 −8 projects/miragesdk/examples/fdd.yml
  72. +6 −6 projects/miragesdk/examples/mirage-dhcp.yml
  73. +7 −7 projects/okernel/examples/okernel_simple.yaml
  74. +8 −8 projects/shiftfs/shiftfs.yml
  75. +7 −7 src/cmd/linuxkit/main.go
  76. +1 −1 src/cmd/linuxkit/run_qemu.go
  77. +3 −3 test/cases/000_build/000_formats/test.yml
  78. +3 −3 test/cases/010_platforms/000_qemu/000_run_kernel+initrd/test.yml
  79. +3 −3 test/cases/010_platforms/000_qemu/005_run_kernel+squashfs/test.yml
  80. +3 −3 test/cases/010_platforms/000_qemu/010_run_iso/test.yml
  81. +3 −3 test/cases/010_platforms/000_qemu/020_run_efi/test.yml
  82. +3 −3 test/cases/010_platforms/000_qemu/030_run_qcow_bios/test.yml
  83. +3 −3 test/cases/010_platforms/000_qemu/040_run_raw_bios/test.yml
  84. +3 −3 test/cases/010_platforms/000_qemu/050_run_aws/test.yml
  85. +3 −3 test/cases/010_platforms/000_qemu/100_container/test.yml
  86. +3 −3 test/cases/010_platforms/010_hyperkit/000_run_kernel+initrd/test.yml
  87. +3 −3 test/cases/010_platforms/010_hyperkit/005_run_kernel+squashfs/test.yml
  88. +4 −4 test/cases/010_platforms/010_hyperkit/010_acpi/test.yml
  89. +4 −4 test/cases/020_kernel/000_config_4.4.x/test.yml
  90. +4 −4 test/cases/020_kernel/001_config_4.9.x/test.yml
  91. +4 −4 test/cases/020_kernel/006_config_4.14.x/test.yml
  92. +4 −4 test/cases/020_kernel/008_config_4.16.x/test.yml
  93. +3 −3 test/cases/020_kernel/010_kmod_4.4.x/test.yml
  94. +3 −3 test/cases/020_kernel/011_kmod_4.9.x/test.yml
  95. +3 −3 test/cases/020_kernel/016_kmod_4.14.x/test.yml
  96. +3 −3 test/cases/020_kernel/018_kmod_4.16.x/test.yml
  97. +2 −2 test/cases/020_kernel/110_namespace/010_veth/010_echo-tcp-ipv4-short-1con-single-reverse/test.yml
  98. +2 −2 test/cases/020_kernel/110_namespace/010_veth/010_echo-tcp-ipv4-short-1con-single/test.yml
  99. +2 −2 test/cases/020_kernel/110_namespace/010_veth/011_echo-tcp-ipv4-short-10con-single-reverse/test.yml
  100. +2 −2 test/cases/020_kernel/110_namespace/010_veth/011_echo-tcp-ipv4-short-10con-single/test.yml
  101. +2 −2 test/cases/020_kernel/110_namespace/010_veth/012_echo-tcp-ipv4-short-5con-multi-reverse/test.yml
  102. +2 −2 test/cases/020_kernel/110_namespace/010_veth/012_echo-tcp-ipv4-short-5con-multi/test.yml
  103. +2 −2 test/cases/020_kernel/110_namespace/010_veth/015_echo-tcp-ipv4-long-1con-single-reverse/test.yml
  104. +2 −2 test/cases/020_kernel/110_namespace/010_veth/015_echo-tcp-ipv4-long-1con-single/test.yml
  105. +2 −2 test/cases/020_kernel/110_namespace/010_veth/016_echo-tcp-ipv4-long-10con-single-reverse/test.yml
  106. +2 −2 test/cases/020_kernel/110_namespace/010_veth/016_echo-tcp-ipv4-long-10con-single/test.yml
  107. +2 −2 test/cases/020_kernel/110_namespace/010_veth/017_echo-tcp-ipv4-long-5con-multi-reverse/test.yml
  108. +2 −2 test/cases/020_kernel/110_namespace/010_veth/017_echo-tcp-ipv4-long-5con-multi/test.yml
  109. +2 −2 test/cases/020_kernel/110_namespace/010_veth/020_echo-tcp-ipv6-short-1con-single-reverse/test.yml
  110. +2 −2 test/cases/020_kernel/110_namespace/010_veth/020_echo-tcp-ipv6-short-1con-single/test.yml
  111. +2 −2 test/cases/020_kernel/110_namespace/010_veth/021_echo-tcp-ipv6-short-10con-single-reverse/test.yml
  112. +2 −2 test/cases/020_kernel/110_namespace/010_veth/021_echo-tcp-ipv6-short-10con-single/test.yml
  113. +2 −2 test/cases/020_kernel/110_namespace/010_veth/022_echo-tcp-ipv6-short-5con-multi-reverse/test.yml
  114. +2 −2 test/cases/020_kernel/110_namespace/010_veth/022_echo-tcp-ipv6-short-5con-multi/test.yml
  115. +2 −2 test/cases/020_kernel/110_namespace/010_veth/025_echo-tcp-ipv6-long-1con-single-reverse/test.yml
  116. +2 −2 test/cases/020_kernel/110_namespace/010_veth/025_echo-tcp-ipv6-long-1con-single/test.yml
  117. +2 −2 test/cases/020_kernel/110_namespace/010_veth/026_echo-tcp-ipv6-long-10con-single-reverse/test.yml
  118. +2 −2 test/cases/020_kernel/110_namespace/010_veth/026_echo-tcp-ipv6-long-10con-single/test.yml
  119. +2 −2 test/cases/020_kernel/110_namespace/010_veth/027_echo-tcp-ipv6-long-5con-multi-reverse/test.yml
  120. +2 −2 test/cases/020_kernel/110_namespace/010_veth/027_echo-tcp-ipv6-long-5con-multi/test.yml
  121. +2 −2 test/cases/020_kernel/110_namespace/010_veth/030_echo-udp-ipv4-short-1con-single-reverse/test.yml
  122. +2 −2 test/cases/020_kernel/110_namespace/010_veth/030_echo-udp-ipv4-short-1con-single/test.yml
  123. +2 −2 test/cases/020_kernel/110_namespace/010_veth/031_echo-udp-ipv4-short-10con-single-reverse/test.yml
  124. +2 −2 test/cases/020_kernel/110_namespace/010_veth/031_echo-udp-ipv4-short-10con-single/test.yml
  125. +2 −2 test/cases/020_kernel/110_namespace/010_veth/032_echo-udp-ipv4-short-5con-multi-reverse/test.yml
  126. +2 −2 test/cases/020_kernel/110_namespace/010_veth/032_echo-udp-ipv4-short-5con-multi/test.yml
  127. +2 −2 test/cases/020_kernel/110_namespace/010_veth/035_echo-udp-ipv4-long-1con-single-reverse/test.yml
  128. +2 −2 test/cases/020_kernel/110_namespace/010_veth/035_echo-udp-ipv4-long-1con-single/test.yml
  129. +2 −2 test/cases/020_kernel/110_namespace/010_veth/036_echo-udp-ipv4-long-10con-single-reverse/test.yml
  130. +2 −2 test/cases/020_kernel/110_namespace/010_veth/036_echo-udp-ipv4-long-10con-single/test.yml
  131. +2 −2 test/cases/020_kernel/110_namespace/010_veth/037_echo-udp-ipv4-long-5con-multi-reverse/test.yml
  132. +2 −2 test/cases/020_kernel/110_namespace/010_veth/037_echo-udp-ipv4-long-5con-multi/test.yml
  133. +2 −2 test/cases/020_kernel/110_namespace/010_veth/040_echo-udp-ipv6-short-1con-single-reverse/test.yml
  134. +2 −2 test/cases/020_kernel/110_namespace/010_veth/040_echo-udp-ipv6-short-1con-single/test.yml
  135. +2 −2 test/cases/020_kernel/110_namespace/010_veth/041_echo-udp-ipv6-short-10con-single-reverse/test.yml
  136. +2 −2 test/cases/020_kernel/110_namespace/010_veth/041_echo-udp-ipv6-short-10con-single/test.yml
  137. +2 −2 test/cases/020_kernel/110_namespace/010_veth/042_echo-udp-ipv6-short-5con-multi-reverse/test.yml
  138. +2 −2 test/cases/020_kernel/110_namespace/010_veth/042_echo-udp-ipv6-short-5con-multi/test.yml
  139. +2 −2 test/cases/020_kernel/110_namespace/010_veth/045_echo-udp-ipv6-long-1con-single-reverse/test.yml
  140. +2 −2 test/cases/020_kernel/110_namespace/010_veth/045_echo-udp-ipv6-long-1con-single/test.yml
  141. +2 −2 test/cases/020_kernel/110_namespace/010_veth/046_echo-udp-ipv6-long-10con-single-reverse/test.yml
  142. +2 −2 test/cases/020_kernel/110_namespace/010_veth/046_echo-udp-ipv6-long-10con-single/test.yml
  143. +2 −2 test/cases/020_kernel/110_namespace/010_veth/047_echo-udp-ipv6-long-5con-multi-reverse/test.yml
  144. +2 −2 test/cases/020_kernel/110_namespace/010_veth/047_echo-udp-ipv6-long-5con-multi/test.yml
  145. +2 −2 test/cases/020_kernel/110_namespace/050_unix-domain/010_echo-short-1con-single-reverse/test.yml
  146. +2 −2 test/cases/020_kernel/110_namespace/050_unix-domain/010_echo-short-1con-single/test.yml
  147. +2 −2 test/cases/020_kernel/110_namespace/050_unix-domain/011_echo-short-10con-single-reverse/test.yml
  148. +2 −2 test/cases/020_kernel/110_namespace/050_unix-domain/011_echo-short-10con-single/test.yml
  149. +2 −2 test/cases/020_kernel/110_namespace/050_unix-domain/012_echo-short-5con-multi-reverse/test.yml
  150. +2 −2 test/cases/020_kernel/110_namespace/050_unix-domain/012_echo-short-5con-multi/test.yml
  151. +2 −2 test/cases/020_kernel/110_namespace/050_unix-domain/015_echo-long-1con-single-reverse/test.yml
  152. +2 −2 test/cases/020_kernel/110_namespace/050_unix-domain/015_echo-long-1con-single/test.yml
  153. +2 −2 test/cases/020_kernel/110_namespace/050_unix-domain/016_echo-long-10con-single-reverse/test.yml
  154. +2 −2 test/cases/020_kernel/110_namespace/050_unix-domain/016_echo-long-10con-single/test.yml
  155. +2 −2 test/cases/020_kernel/110_namespace/050_unix-domain/017_echo-long-5con-multi-reverse/test.yml
  156. +2 −2 test/cases/020_kernel/110_namespace/050_unix-domain/017_echo-long-5con-multi/test.yml
  157. +2 −2 test/cases/020_kernel/110_namespace/100_mix/010_veth-unix-domain-echo/test.yml
  158. +2 −2 test/cases/020_kernel/110_namespace/100_mix/011_veth-unix-domain-echo-reverse/test.yml
  159. +2 −2 test/cases/020_kernel/110_namespace/100_mix/012_veth-ipv4-echo/test.yml
  160. +2 −2 test/cases/020_kernel/110_namespace/100_mix/013_veth-ipv6-echo/test.yml
  161. +2 −2 test/cases/020_kernel/110_namespace/100_mix/014_veth-tcp-echo/test.yml
  162. +2 −2 test/cases/020_kernel/110_namespace/100_mix/015_veth-udp-echo/test.yml
  163. +2 −2 test/cases/020_kernel/110_namespace/100_mix/020_unix-domain-echo/test.yml
  164. +2 −2 test/cases/020_kernel/110_namespace/common.yml
  165. +11 −11 test/cases/030_security/000_docker-bench/test.yml
  166. +3 −3 test/cases/030_security/010_ports/test.yml
  167. +4 −4 test/cases/040_packages/002_binfmt/test.yml
  168. +4 −4 test/cases/040_packages/003_ca-certificates/test.yml
  169. +10 −10 test/cases/040_packages/003_containerd/test.yml
  170. +4 −4 test/cases/040_packages/004_dhcpcd/test.yml
  171. +5 −5 test/cases/040_packages/005_extend/000_ext4/test-create.yml
  172. +5 −5 test/cases/040_packages/005_extend/000_ext4/test.yml
  173. +6 −6 test/cases/040_packages/005_extend/001_btrfs/test-create.yml
  174. +6 −6 test/cases/040_packages/005_extend/001_btrfs/test.yml
  175. +5 −5 test/cases/040_packages/005_extend/002_xfs/test-create.yml
  176. +5 −5 test/cases/040_packages/005_extend/002_xfs/test.yml
  177. +5 −5 test/cases/040_packages/006_format_mount/000_auto/test.yml
  178. +5 −5 test/cases/040_packages/006_format_mount/001_by_label/test.yml
  179. +5 −5 test/cases/040_packages/006_format_mount/002_by_name/test.yml.in
  180. +6 −6 test/cases/040_packages/006_format_mount/003_btrfs/test.yml
  181. +5 −5 test/cases/040_packages/006_format_mount/004_xfs/test.yml
  182. +8 −8 test/cases/040_packages/006_format_mount/005_by_device_force/test.yml
  183. +7 −7 test/cases/040_packages/006_format_mount/010_multiple/test.yml
  184. +6 −6 test/cases/040_packages/007_getty-containerd/test.yml
  185. +4 −4 test/cases/040_packages/013_mkimage/mkimage.yml
  186. +3 −3 test/cases/040_packages/013_mkimage/run.yml
  187. +4 −4 test/cases/040_packages/019_sysctl/test.yml
  188. +7 −7 test/cases/040_packages/023_wireguard/test.yml
  189. +4 −4 test/hack/test-ltp.yml
  190. +6 −6 test/hack/test.yml
  191. +1 −1 test/pkg/containerd/Dockerfile
  192. +1 −1 test/pkg/docker-bench/Dockerfile
  193. +1 −1 test/pkg/kernel-config/Dockerfile
  194. +2 −2 test/pkg/ns/Dockerfile
  195. +3 −3 test/pkg/ns/template.yml
  196. +1 −1 test/pkg/poweroff/Dockerfile
  197. +2 −2 test/pkg/virtsock/Dockerfile
  198. +2 −2 tools/alpine/versions.aarch64
  199. +2 −2 tools/alpine/versions.s390x
  200. +3 −3 tools/alpine/versions.x86_64
  201. +1 −1 tools/go-compile/Dockerfile
  202. +1 −1 tools/mkimage-iso-bios/Dockerfile
  203. +2 −2 tools/mkimage-iso-efi/Dockerfile
  204. +2 −2 tools/mkimage-qcow2-efi/Dockerfile
  205. +1 −1 tools/mkimage-raw-bios/Dockerfile
  206. +2 −2 tools/mkimage-raw-efi/Dockerfile
  207. +1 −1 tools/mkimage-rpi3/Dockerfile
  208. +1 −1 tools/mkimage-squashfs/Dockerfile
  209. +1 −1 tools/qemu/Dockerfile
@@ -3,6 +3,25 @@ All notable changes to this project will be documented in this file.

The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/).

## [v0.4] - 2018-05-12
### Added
- Support for v4.16.x kernels.
- Support for MPLS, USB_STORAGE, and SCTP support in the kernel config.
- Support for creating and booting from squashfs root filesystems.
- Super experimental support for crosvm.
- Support for compiling with go 1.10.
- Adjusted hyperkit support to be compatible with soon to be released Docker for Mac changes.

### Changed
- `containerd` updated to v1.1.0.
- WireGuard updated to 0.0.20180420.
- Intel CPU microcode update to 20180425.

### Removed
- Support for v4.15.x. kernels as they have been EOLed.
- `perf` support for 4.9.x kernels (the compile broke).


## [v0.3] - 2018-04-05
### Added
- Initial `s390x` support.
@@ -4,10 +4,10 @@
default: bin/linuxkit bin/rtf
all: default

VERSION="v0.3+"
VERSION="v0.4"
GIT_COMMIT=$(shell git rev-list -1 HEAD)

GO_COMPILE=linuxkit/go-compile:2940a8141d907c2976be15f201f6e9b7c4c1f931
GO_COMPILE=linuxkit/go-compile:a8bffe875268a973ea82e5937b0fb23a5b08cc79

LINUXKIT?=bin/linuxkit
GOOS?=$(shell uname -s | tr '[:upper:]' '[:lower:]')
@@ -33,12 +33,12 @@ kernel:
image: linuxkit/kernel:4.9.91
cmdline: "console=tty0 console=ttyS0 console=ttyAMA0"
init:
- linuxkit/init:11929b0007b87384f7372e9265067479c4616586
- linuxkit/runc:acba8886e4b1318457c711700f695a02fef9493d
- linuxkit/containerd:f197e7cbb2ede4370b75127c76de6f7b2e3d9873
- linuxkit/init:v0.4
- linuxkit/runc:v0.4
- linuxkit/containerd:v0.4
services:
- name: getty
image: linuxkit/getty:v0.3
image: linuxkit/getty:v0.4
env:
- INSECURE=true
trust:
@@ -28,7 +28,7 @@ docker run -it --rm \
-v $(pwd):/go/src/github.com/linuxkit/linuxkit \
-w /go/src/github.com/linuxkit/linuxkit/src/cmd/linuxkit \
--entrypoint /go/bin/vndr \
linuxkit/go-compile:2940a8141d907c2976be15f201f6e9b7c4c1f931
linuxkit/go-compile:a8bffe875268a973ea82e5937b0fb23a5b08cc79
```

To update a single dependency:
@@ -38,7 +38,7 @@ docker run -it --rm \
-v $(pwd):/go/src/github.com/linuxkit/linuxkit \
-w /go/src/github.com/linuxkit/linuxkit/src/cmd/linuxkit \
--entrypoint /go/bin/vndr \
linuxkit/go-compile:2940a8141d907c2976be15f201f6e9b7c4c1f931
linuxkit/go-compile:a8bffe875268a973ea82e5937b0fb23a5b08cc79
github.com/docker/docker
```

@@ -2,23 +2,23 @@ kernel:
image: linuxkit/kernel:4.14.40
cmdline: "console=ttyS0"
init:
- linuxkit/init:11929b0007b87384f7372e9265067479c4616586
- linuxkit/runc:acba8886e4b1318457c711700f695a02fef9493d
- linuxkit/containerd:f197e7cbb2ede4370b75127c76de6f7b2e3d9873
- linuxkit/ca-certificates:fb5c7bf842a330f5b47cdf71f950fe0c85f4a772
- linuxkit/init:v0.4
- linuxkit/runc:v0.4
- linuxkit/containerd:v0.4
- linuxkit/ca-certificates:v0.4
onboot:
- name: sysctl
image: linuxkit/sysctl:b51c3da02bc2fc9a53f699efc51f650ac17ffac8
image: linuxkit/sysctl:v0.4
- name: dhcpcd
image: linuxkit/dhcpcd:01069780f536da8eb7745df7478a97253403b63d
image: linuxkit/dhcpcd:v0.4
command: ["/sbin/dhcpcd", "--nobackground", "-f", "/dhcpcd.conf", "-1"]
- name: metadata
image: linuxkit/metadata:be507a0718df8ed6733dfab1d6866672f446e8fd
image: linuxkit/metadata:v0.4
services:
- name: rngd
image: linuxkit/rngd:429e1308b8cad9dbe04b7a91fcebec17ee6f7591
image: linuxkit/rngd:v0.4
- name: sshd
image: linuxkit/sshd:8f11ee09b101ab7f41c7a6409a8d7a8d49957fbb
image: linuxkit/sshd:v0.4
binds:
- /run/config/ssh/authorized_keys:/root/.ssh/authorized_keys
- name: nginx
@@ -2,20 +2,20 @@ kernel:
image: linuxkit/kernel:4.14.40
cmdline: "console=ttyS0"
init:
- linuxkit/init:11929b0007b87384f7372e9265067479c4616586
- linuxkit/runc:acba8886e4b1318457c711700f695a02fef9493d
- linuxkit/containerd:f197e7cbb2ede4370b75127c76de6f7b2e3d9873
- linuxkit/ca-certificates:fb5c7bf842a330f5b47cdf71f950fe0c85f4a772
- linuxkit/init:v0.4
- linuxkit/runc:v0.4
- linuxkit/containerd:v0.4
- linuxkit/ca-certificates:v0.4
onboot:
- name: sysctl
image: linuxkit/sysctl:b51c3da02bc2fc9a53f699efc51f650ac17ffac8
image: linuxkit/sysctl:v0.4
services:
- name: rngd
image: linuxkit/rngd:429e1308b8cad9dbe04b7a91fcebec17ee6f7591
image: linuxkit/rngd:v0.4
- name: dhcpcd
image: linuxkit/dhcpcd:01069780f536da8eb7745df7478a97253403b63d
image: linuxkit/dhcpcd:v0.4
- name: sshd
image: linuxkit/sshd:8f11ee09b101ab7f41c7a6409a8d7a8d49957fbb
image: linuxkit/sshd:v0.4
files:
- path: root/.ssh/authorized_keys
source: ~/.ssh/id_rsa.pub
@@ -2,33 +2,33 @@ kernel:
image: linuxkit/kernel:4.14.40
cmdline: "console=tty0 console=ttyS0 console=ttyAMA0 console=ttysclp0"
init:
- linuxkit/init:11929b0007b87384f7372e9265067479c4616586
- linuxkit/runc:acba8886e4b1318457c711700f695a02fef9493d
- linuxkit/containerd:f197e7cbb2ede4370b75127c76de6f7b2e3d9873
- linuxkit/ca-certificates:fb5c7bf842a330f5b47cdf71f950fe0c85f4a772
- linuxkit/init:v0.4
- linuxkit/runc:v0.4
- linuxkit/containerd:v0.4
- linuxkit/ca-certificates:v0.4
onboot:
- name: sysctl
image: linuxkit/sysctl:b51c3da02bc2fc9a53f699efc51f650ac17ffac8
image: linuxkit/sysctl:v0.4
- name: dhcpcd
image: linuxkit/dhcpcd:01069780f536da8eb7745df7478a97253403b63d
image: linuxkit/dhcpcd:v0.4
command: ["/sbin/dhcpcd", "--nobackground", "-f", "/dhcpcd.conf", "-1"]
- name: sysfs
image: linuxkit/sysfs:98b340d360541f1e1e62bc30b62ab6a7e3dc9280
image: linuxkit/sysfs:v0.4
- name: format
image: linuxkit/format:d24885a226c42a40f7ed44dd3789a6a035254d98
image: linuxkit/format:v0.4
- name: mount
image: linuxkit/mount:763e67d733342281f3bdc55d7208b9c442837afe
image: linuxkit/mount:v0.4
command: ["/usr/bin/mountie", "/var/lib/docker"]

services:
- name: getty
image: linuxkit/getty:b286a610ccbebc45251f3a9df3619d76318e2244
image: linuxkit/getty:v0.4
env:
- INSECURE=true
- name: rngd
image: linuxkit/rngd:429e1308b8cad9dbe04b7a91fcebec17ee6f7591
image: linuxkit/rngd:v0.4
- name: ntpd
image: linuxkit/openntpd:9851e80f16e4292b12fbe97b9d7f1c3dd40d1ea2
image: linuxkit/openntpd:v0.4

- name: docker
image: docker:17.10.0-ce-dind
@@ -46,7 +46,7 @@ services:
- /etc/docker/daemon.json:/etc/docker/daemon.json
command: ["/usr/local/bin/docker-init", "/usr/local/bin/dockerd"]
- name: cadvisor
image: linuxkit/cadvisor:9a4b626e808c6a961bf17c8c3eb8adbe55f94e20
image: linuxkit/cadvisor:v0.4
files:
- path: var/lib/docker
directory: true
@@ -3,30 +3,30 @@ kernel:
image: linuxkit/kernel:4.14.40
cmdline: "console=ttyS0 page_poison=1"
init:
- linuxkit/vpnkit-expose-port:4e2ea826aaefdd196c7473255654d06ad96c4c21 # install vpnkit-expose-port and vpnkit-iptables-wrapper on host
- linuxkit/init:11929b0007b87384f7372e9265067479c4616586
- linuxkit/runc:acba8886e4b1318457c711700f695a02fef9493d
- linuxkit/containerd:f197e7cbb2ede4370b75127c76de6f7b2e3d9873
- linuxkit/ca-certificates:fb5c7bf842a330f5b47cdf71f950fe0c85f4a772
- linuxkit/vpnkit-expose-port:v0.4 # install vpnkit-expose-port and vpnkit-iptables-wrapper on host
- linuxkit/init:v0.4
- linuxkit/runc:v0.4
- linuxkit/containerd:v0.4
- linuxkit/ca-certificates:v0.4
onboot:
# support metadata for optional config in /run/config
- name: metadata
image: linuxkit/metadata:be507a0718df8ed6733dfab1d6866672f446e8fd
image: linuxkit/metadata:v0.4
- name: sysctl
image: linuxkit/sysctl:b51c3da02bc2fc9a53f699efc51f650ac17ffac8
image: linuxkit/sysctl:v0.4
- name: sysfs
image: linuxkit/sysfs:98b340d360541f1e1e62bc30b62ab6a7e3dc9280
image: linuxkit/sysfs:v0.4
- name: binfmt
image: linuxkit/binfmt:aa7909fd14c251948a83edb5398b4fb7d5153ad1
image: linuxkit/binfmt:v0.4
# Format and mount the disk image in /var/lib/docker
- name: format
image: linuxkit/format:d24885a226c42a40f7ed44dd3789a6a035254d98
image: linuxkit/format:v0.4
- name: mount
image: linuxkit/mount:763e67d733342281f3bdc55d7208b9c442837afe
image: linuxkit/mount:v0.4
command: ["/usr/bin/mountie", "/var/lib"]
# make a swap file on the mounted disk
- name: swap
image: linuxkit/swap:d4241eabbc9086d30e462bfa6bb952fd4e6b74eb
image: linuxkit/swap:v0.4
command: ["/swap.sh", "--path", "/var/lib/swap", "--size", "1024M"]
# mount-vpnkit mounts the 9p share used by vpnkit to coordinate port forwarding
- name: mount-vpnkit
@@ -44,41 +44,41 @@ onboot:
- /var:/host_var
command: ["sh", "-c", "mv -v /host_var/log /host_var/lib && ln -vs /var/lib/log /host_var/log"]
- name: dhcpcd
image: linuxkit/dhcpcd:01069780f536da8eb7745df7478a97253403b63d
image: linuxkit/dhcpcd:v0.4
command: ["/sbin/dhcpcd", "--nobackground", "-f", "/dhcpcd.conf", "-1"]
services:
# Enable acpi to shutdown on power events
- name: acpid
image: linuxkit/acpid:6c05004a07f4f9228aec89605d5c72b184695d2a
image: linuxkit/acpid:v0.4
# Enable getty for easier debugging
- name: getty
image: linuxkit/getty:b286a610ccbebc45251f3a9df3619d76318e2244
image: linuxkit/getty:v0.4
env:
- INSECURE=true
# Run ntpd to keep time synchronised in the VM
- name: ntpd
image: linuxkit/openntpd:9851e80f16e4292b12fbe97b9d7f1c3dd40d1ea2
image: linuxkit/openntpd:v0.4
# VSOCK to unix domain socket forwarding. Forwards guest /var/run/docker.sock
# to a socket on the host.
- name: vsudd
image: linuxkit/vsudd:ef2fd68237c6fc1a3b97b37012ad81bf9643be4b
image: linuxkit/vsudd:v0.4
binds:
- /var/run:/var/run
command: ["/vsudd", "-inport", "2376:unix:/var/run/docker.sock"]
# vpnkit-forwarder forwards network traffic to/from the host via VSOCK port 62373.
# It needs access to the vpnkit 9P coordination share
- name: vpnkit-forwarder
image: linuxkit/vpnkit-forwarder:49b506c4dab8789fd42b216c35a4eb1cca503b32
image: linuxkit/vpnkit-forwarder:v0.4
binds:
- /var/vpnkit:/port
net: host
command: ["/vpnkit-forwarder", "-vsockPort", "62373"]
# Monitor for image deletes and invoke a TRIM on the container filesystem
- name: trim-after-delete
image: linuxkit/trim-after-delete:9e62cea1246d66659bc1a74987f5f4c40e04de83
image: linuxkit/trim-after-delete:v0.4
# When the host resumes from sleep, force a clock resync
- name: host-timesync-daemon
image: linuxkit/host-timesync-daemon:921f623f1d12b7a79417370c4628752c495e7ee8
image: linuxkit/host-timesync-daemon:v0.4
# Run dockerd with the vpnkit userland proxy from the vpnkit-forwarder container.
# Bind mounts /var/run to allow vsudd to connect to docker.sock, /var/vpnkit
# for vpnkit coordination and /run/config/docker for the configuration file.
@@ -2,31 +2,31 @@ kernel:
image: linuxkit/kernel:4.14.40
cmdline: "console=tty0 console=ttyS0 console=ttyAMA0 console=ttysclp0"
init:
- linuxkit/init:11929b0007b87384f7372e9265067479c4616586
- linuxkit/runc:acba8886e4b1318457c711700f695a02fef9493d
- linuxkit/containerd:f197e7cbb2ede4370b75127c76de6f7b2e3d9873
- linuxkit/ca-certificates:fb5c7bf842a330f5b47cdf71f950fe0c85f4a772
- linuxkit/init:v0.4
- linuxkit/runc:v0.4
- linuxkit/containerd:v0.4
- linuxkit/ca-certificates:v0.4
onboot:
- name: sysctl
image: linuxkit/sysctl:b51c3da02bc2fc9a53f699efc51f650ac17ffac8
image: linuxkit/sysctl:v0.4
- name: sysfs
image: linuxkit/sysfs:98b340d360541f1e1e62bc30b62ab6a7e3dc9280
image: linuxkit/sysfs:v0.4
- name: format
image: linuxkit/format:d24885a226c42a40f7ed44dd3789a6a035254d98
image: linuxkit/format:v0.4
- name: mount
image: linuxkit/mount:763e67d733342281f3bdc55d7208b9c442837afe
image: linuxkit/mount:v0.4
command: ["/usr/bin/mountie", "/var/lib/docker"]
services:
- name: getty
image: linuxkit/getty:b286a610ccbebc45251f3a9df3619d76318e2244
image: linuxkit/getty:v0.4
env:
- INSECURE=true
- name: rngd
image: linuxkit/rngd:429e1308b8cad9dbe04b7a91fcebec17ee6f7591
image: linuxkit/rngd:v0.4
- name: dhcpcd
image: linuxkit/dhcpcd:01069780f536da8eb7745df7478a97253403b63d
image: linuxkit/dhcpcd:v0.4
- name: ntpd
image: linuxkit/openntpd:9851e80f16e4292b12fbe97b9d7f1c3dd40d1ea2
image: linuxkit/openntpd:v0.4
- name: docker
image: docker:17.09.0-ce-dind
capabilities:
@@ -2,27 +2,27 @@ kernel:
image: linuxkit/kernel:4.14.40
cmdline: "console=ttyS0"
init:
- linuxkit/init:11929b0007b87384f7372e9265067479c4616586
- linuxkit/runc:acba8886e4b1318457c711700f695a02fef9493d
- linuxkit/containerd:f197e7cbb2ede4370b75127c76de6f7b2e3d9873
- linuxkit/ca-certificates:fb5c7bf842a330f5b47cdf71f950fe0c85f4a772
- linuxkit/init:v0.4
- linuxkit/runc:v0.4
- linuxkit/containerd:v0.4
- linuxkit/ca-certificates:v0.4
onboot:
- name: sysctl
image: linuxkit/sysctl:b51c3da02bc2fc9a53f699efc51f650ac17ffac8
image: linuxkit/sysctl:v0.4
- name: dhcpcd
image: linuxkit/dhcpcd:01069780f536da8eb7745df7478a97253403b63d
image: linuxkit/dhcpcd:v0.4
command: ["/sbin/dhcpcd", "--nobackground", "-f", "/dhcpcd.conf", "-1"]
- name: metadata
image: linuxkit/metadata:be507a0718df8ed6733dfab1d6866672f446e8fd
image: linuxkit/metadata:v0.4
services:
- name: getty
image: linuxkit/getty:b286a610ccbebc45251f3a9df3619d76318e2244
image: linuxkit/getty:v0.4
env:
- INSECURE=true
- name: rngd
image: linuxkit/rngd:429e1308b8cad9dbe04b7a91fcebec17ee6f7591
image: linuxkit/rngd:v0.4
- name: sshd
image: linuxkit/sshd:8f11ee09b101ab7f41c7a6409a8d7a8d49957fbb
image: linuxkit/sshd:v0.4
binds:
- /run/config/ssh/authorized_keys:/root/.ssh/authorized_keys
- name: nginx
@@ -2,24 +2,24 @@ kernel:
image: linuxkit/kernel:4.14.40
cmdline: "console=tty0 console=ttyS0 console=ttyAMA0 console=ttysclp0"
init:
- linuxkit/init:11929b0007b87384f7372e9265067479c4616586
- linuxkit/runc:acba8886e4b1318457c711700f695a02fef9493d
- linuxkit/containerd:f197e7cbb2ede4370b75127c76de6f7b2e3d9873
- linuxkit/ca-certificates:fb5c7bf842a330f5b47cdf71f950fe0c85f4a772
- linuxkit/init:v0.4
- linuxkit/runc:v0.4
- linuxkit/containerd:v0.4
- linuxkit/ca-certificates:v0.4
onboot:
- name: sysctl
image: linuxkit/sysctl:b51c3da02bc2fc9a53f699efc51f650ac17ffac8
image: linuxkit/sysctl:v0.4
- name: dhcpcd
image: linuxkit/dhcpcd:01069780f536da8eb7745df7478a97253403b63d
image: linuxkit/dhcpcd:v0.4
command: ["/sbin/dhcpcd", "--nobackground", "-f", "/dhcpcd.conf", "-1"]
services:
- name: getty
image: linuxkit/getty:b286a610ccbebc45251f3a9df3619d76318e2244
image: linuxkit/getty:v0.4
# to make insecure with passwordless root login, uncomment following lines
#env:
# - INSECURE=true
- name: rngd
image: linuxkit/rngd:429e1308b8cad9dbe04b7a91fcebec17ee6f7591
image: linuxkit/rngd:v0.4
files:
- path: etc/getty.shadow
# sample sets password for root to "abcdefgh" (without quotes)
Oops, something went wrong.

0 comments on commit 8d17887

Please sign in to comment.