Permalink
Browse files

Merge pull request #3138 from rn/rel_v0.6

Release prep for v0.6
  • Loading branch information...
rn committed Jul 26, 2018
2 parents bfa8be5 + 483e7fd commit 10f07ca1624102de3c2d93da7792be5528c32022
Showing with 803 additions and 783 deletions.
  1. +4 −3 .mailmap
  2. +1 −1 AUTHORS
  3. +18 −0 CHANGELOG.md
  4. +1 −1 MAINTAINERS
  5. +2 −2 Makefile
  6. +4 −4 contrib/crosvm/README.md
  7. +1 −0 docs/releasing.md
  8. +2 −2 docs/vendoring.md
  9. +9 −9 examples/aws.yml
  10. +8 −8 examples/azure.yml
  11. +13 −13 examples/cadvisor.yml
  12. +20 −20 examples/docker-for-mac.yml
  13. +13 −13 examples/docker.yml
  14. +10 −10 examples/gcp.yml
  15. +8 −8 examples/getty.yml
  16. +8 −8 examples/hostmount-writeable-overlay.yml
  17. +6 −6 examples/influxdb-os.yml
  18. +10 −10 examples/logging.yml
  19. +5 −5 examples/minimal.yml
  20. +7 −7 examples/node_exporter.yml
  21. +9 −9 examples/openstack.yml
  22. +1 −1 examples/packet.arm64.yml
  23. +12 −12 examples/packet.yml
  24. +5 −5 examples/redis-os.yml
  25. +9 −9 examples/rt-for-vmware.yml
  26. +10 −10 examples/scaleway.yml
  27. +10 −10 examples/sshd.yml
  28. +11 −11 examples/swap.yml
  29. +9 −9 examples/tpm.yml
  30. +8 −8 examples/vmware.yml
  31. +6 −6 examples/vpnkit-forwarder.yml
  32. +5 −5 examples/vsudd-containerd.yml
  33. +10 −10 examples/vultr.yml
  34. +10 −10 examples/wireguard.yml
  35. +8 −8 linuxkit.yml
  36. +2 −2 pkg/acpid/Dockerfile
  37. +1 −1 pkg/auditd/Dockerfile
  38. +1 −1 pkg/binfmt/Dockerfile
  39. +1 −1 pkg/ca-certificates/Dockerfile
  40. +2 −2 pkg/cadvisor/Dockerfile
  41. +1 −1 pkg/containerd/Dockerfile
  42. +1 −1 pkg/dhcpcd/Dockerfile
  43. +2 −2 pkg/extend/Dockerfile
  44. +1 −1 pkg/firmware-all/Dockerfile
  45. +1 −1 pkg/firmware/Dockerfile
  46. +2 −2 pkg/format/Dockerfile
  47. +1 −1 pkg/getty/Dockerfile
  48. +1 −1 pkg/host-timesync-daemon/Dockerfile
  49. +2 −2 pkg/init/Dockerfile
  50. +1 −1 pkg/ip/Dockerfile
  51. +1 −1 pkg/kmsg/Dockerfile
  52. +1 −1 pkg/logwrite/Dockerfile
  53. +1 −1 pkg/memlogd/Dockerfile
  54. +1 −1 pkg/metadata/Dockerfile
  55. +1 −1 pkg/mkimage/Dockerfile
  56. +1 −1 pkg/modprobe/Dockerfile
  57. +2 −2 pkg/mount/Dockerfile
  58. +1 −1 pkg/node_exporter/Dockerfile
  59. +1 −1 pkg/open-vm-tools/Dockerfile
  60. +1 −1 pkg/openntpd/Dockerfile
  61. +1 −1 pkg/qemu-ga/Dockerfile
  62. +1 −1 pkg/rngd/Dockerfile
  63. +1 −1 pkg/runc/Dockerfile
  64. +1 −1 pkg/sshd/Dockerfile
  65. +1 −1 pkg/swap/Dockerfile
  66. +1 −1 pkg/sysctl/Dockerfile
  67. +1 −1 pkg/sysfs/Dockerfile
  68. +1 −1 pkg/trim-after-delete/Dockerfile
  69. +1 −1 pkg/tss/Dockerfile
  70. +1 −1 pkg/vpnkit-expose-port/Dockerfile
  71. +1 −1 pkg/vpnkit-forwarder/Dockerfile
  72. +1 −1 pkg/vsudd/Dockerfile
  73. +1 −1 projects/clear-containers/clear-containers.yml
  74. +11 −11 projects/compose/compose-dynamic.yml
  75. +11 −11 projects/compose/compose-static.yml
  76. +7 −7 projects/ima-namespace/ima-namespace.yml
  77. +1 −1 projects/landlock/landlock.yml
  78. +5 −5 projects/memorizer/memorizer.yml
  79. +8 −8 projects/miragesdk/examples/fdd.yml
  80. +6 −6 projects/miragesdk/examples/mirage-dhcp.yml
  81. +7 −7 projects/okernel/examples/okernel_simple.yaml
  82. +8 −8 projects/shiftfs/shiftfs.yml
  83. +4 −4 src/cmd/linuxkit/moby/linuxkit.go
  84. +8 −8 src/cmd/linuxkit/moby/output.go
  85. +1 −1 src/cmd/linuxkit/run_qemu.go
  86. +3 −3 test/cases/000_build/000_formats/test.yml
  87. +3 −3 test/cases/010_platforms/000_qemu/000_run_kernel+initrd/test.yml
  88. +3 −3 test/cases/010_platforms/000_qemu/005_run_kernel+squashfs/test.yml
  89. +3 −3 test/cases/010_platforms/000_qemu/010_run_iso/test.yml
  90. +3 −3 test/cases/010_platforms/000_qemu/020_run_efi/test.yml
  91. +3 −3 test/cases/010_platforms/000_qemu/030_run_qcow_bios/test.yml
  92. +3 −3 test/cases/010_platforms/000_qemu/040_run_raw_bios/test.yml
  93. +3 −3 test/cases/010_platforms/000_qemu/050_run_aws/test.yml
  94. +3 −3 test/cases/010_platforms/000_qemu/100_container/test.yml
  95. +3 −3 test/cases/010_platforms/010_hyperkit/000_run_kernel+initrd/test.yml
  96. +3 −3 test/cases/010_platforms/010_hyperkit/005_run_kernel+squashfs/test.yml
  97. +4 −4 test/cases/010_platforms/010_hyperkit/010_acpi/test.yml
  98. +4 −4 test/cases/020_kernel/000_config_4.4.x/test.yml
  99. +4 −4 test/cases/020_kernel/001_config_4.9.x/test.yml
  100. +4 −4 test/cases/020_kernel/006_config_4.14.x/test.yml
  101. +4 −4 test/cases/020_kernel/009_config_4.17.x/test.yml
  102. +1 −1 test/cases/020_kernel/010_kmod_4.4.x/Dockerfile
  103. +3 −3 test/cases/020_kernel/010_kmod_4.4.x/test.yml
  104. +1 −1 test/cases/020_kernel/011_kmod_4.9.x/Dockerfile
  105. +3 −3 test/cases/020_kernel/011_kmod_4.9.x/test.yml
  106. +1 −1 test/cases/020_kernel/016_kmod_4.14.x/Dockerfile
  107. +3 −3 test/cases/020_kernel/016_kmod_4.14.x/test.yml
  108. +1 −1 test/cases/020_kernel/019_kmod_4.17.x/Dockerfile
  109. +3 −3 test/cases/020_kernel/019_kmod_4.17.x/test.yml
  110. +2 −2 test/cases/020_kernel/110_namespace/010_veth/010_echo-tcp-ipv4-short-1con-single-reverse/test.yml
  111. +2 −2 test/cases/020_kernel/110_namespace/010_veth/010_echo-tcp-ipv4-short-1con-single/test.yml
  112. +2 −2 test/cases/020_kernel/110_namespace/010_veth/011_echo-tcp-ipv4-short-10con-single-reverse/test.yml
  113. +2 −2 test/cases/020_kernel/110_namespace/010_veth/011_echo-tcp-ipv4-short-10con-single/test.yml
  114. +2 −2 test/cases/020_kernel/110_namespace/010_veth/012_echo-tcp-ipv4-short-5con-multi-reverse/test.yml
  115. +2 −2 test/cases/020_kernel/110_namespace/010_veth/012_echo-tcp-ipv4-short-5con-multi/test.yml
  116. +2 −2 test/cases/020_kernel/110_namespace/010_veth/015_echo-tcp-ipv4-long-1con-single-reverse/test.yml
  117. +2 −2 test/cases/020_kernel/110_namespace/010_veth/015_echo-tcp-ipv4-long-1con-single/test.yml
  118. +2 −2 test/cases/020_kernel/110_namespace/010_veth/016_echo-tcp-ipv4-long-10con-single-reverse/test.yml
  119. +2 −2 test/cases/020_kernel/110_namespace/010_veth/016_echo-tcp-ipv4-long-10con-single/test.yml
  120. +2 −2 test/cases/020_kernel/110_namespace/010_veth/017_echo-tcp-ipv4-long-5con-multi-reverse/test.yml
  121. +2 −2 test/cases/020_kernel/110_namespace/010_veth/017_echo-tcp-ipv4-long-5con-multi/test.yml
  122. +2 −2 test/cases/020_kernel/110_namespace/010_veth/020_echo-tcp-ipv6-short-1con-single-reverse/test.yml
  123. +2 −2 test/cases/020_kernel/110_namespace/010_veth/020_echo-tcp-ipv6-short-1con-single/test.yml
  124. +2 −2 test/cases/020_kernel/110_namespace/010_veth/021_echo-tcp-ipv6-short-10con-single-reverse/test.yml
  125. +2 −2 test/cases/020_kernel/110_namespace/010_veth/021_echo-tcp-ipv6-short-10con-single/test.yml
  126. +2 −2 test/cases/020_kernel/110_namespace/010_veth/022_echo-tcp-ipv6-short-5con-multi-reverse/test.yml
  127. +2 −2 test/cases/020_kernel/110_namespace/010_veth/022_echo-tcp-ipv6-short-5con-multi/test.yml
  128. +2 −2 test/cases/020_kernel/110_namespace/010_veth/025_echo-tcp-ipv6-long-1con-single-reverse/test.yml
  129. +2 −2 test/cases/020_kernel/110_namespace/010_veth/025_echo-tcp-ipv6-long-1con-single/test.yml
  130. +2 −2 test/cases/020_kernel/110_namespace/010_veth/026_echo-tcp-ipv6-long-10con-single-reverse/test.yml
  131. +2 −2 test/cases/020_kernel/110_namespace/010_veth/026_echo-tcp-ipv6-long-10con-single/test.yml
  132. +2 −2 test/cases/020_kernel/110_namespace/010_veth/027_echo-tcp-ipv6-long-5con-multi-reverse/test.yml
  133. +2 −2 test/cases/020_kernel/110_namespace/010_veth/027_echo-tcp-ipv6-long-5con-multi/test.yml
  134. +2 −2 test/cases/020_kernel/110_namespace/010_veth/030_echo-udp-ipv4-short-1con-single-reverse/test.yml
  135. +2 −2 test/cases/020_kernel/110_namespace/010_veth/030_echo-udp-ipv4-short-1con-single/test.yml
  136. +2 −2 test/cases/020_kernel/110_namespace/010_veth/031_echo-udp-ipv4-short-10con-single-reverse/test.yml
  137. +2 −2 test/cases/020_kernel/110_namespace/010_veth/031_echo-udp-ipv4-short-10con-single/test.yml
  138. +2 −2 test/cases/020_kernel/110_namespace/010_veth/032_echo-udp-ipv4-short-5con-multi-reverse/test.yml
  139. +2 −2 test/cases/020_kernel/110_namespace/010_veth/032_echo-udp-ipv4-short-5con-multi/test.yml
  140. +2 −2 test/cases/020_kernel/110_namespace/010_veth/035_echo-udp-ipv4-long-1con-single-reverse/test.yml
  141. +2 −2 test/cases/020_kernel/110_namespace/010_veth/035_echo-udp-ipv4-long-1con-single/test.yml
  142. +2 −2 test/cases/020_kernel/110_namespace/010_veth/036_echo-udp-ipv4-long-10con-single-reverse/test.yml
  143. +2 −2 test/cases/020_kernel/110_namespace/010_veth/036_echo-udp-ipv4-long-10con-single/test.yml
  144. +2 −2 test/cases/020_kernel/110_namespace/010_veth/037_echo-udp-ipv4-long-5con-multi-reverse/test.yml
  145. +2 −2 test/cases/020_kernel/110_namespace/010_veth/037_echo-udp-ipv4-long-5con-multi/test.yml
  146. +2 −2 test/cases/020_kernel/110_namespace/010_veth/040_echo-udp-ipv6-short-1con-single-reverse/test.yml
  147. +2 −2 test/cases/020_kernel/110_namespace/010_veth/040_echo-udp-ipv6-short-1con-single/test.yml
  148. +2 −2 test/cases/020_kernel/110_namespace/010_veth/041_echo-udp-ipv6-short-10con-single-reverse/test.yml
  149. +2 −2 test/cases/020_kernel/110_namespace/010_veth/041_echo-udp-ipv6-short-10con-single/test.yml
  150. +2 −2 test/cases/020_kernel/110_namespace/010_veth/042_echo-udp-ipv6-short-5con-multi-reverse/test.yml
  151. +2 −2 test/cases/020_kernel/110_namespace/010_veth/042_echo-udp-ipv6-short-5con-multi/test.yml
  152. +2 −2 test/cases/020_kernel/110_namespace/010_veth/045_echo-udp-ipv6-long-1con-single-reverse/test.yml
  153. +2 −2 test/cases/020_kernel/110_namespace/010_veth/045_echo-udp-ipv6-long-1con-single/test.yml
  154. +2 −2 test/cases/020_kernel/110_namespace/010_veth/046_echo-udp-ipv6-long-10con-single-reverse/test.yml
  155. +2 −2 test/cases/020_kernel/110_namespace/010_veth/046_echo-udp-ipv6-long-10con-single/test.yml
  156. +2 −2 test/cases/020_kernel/110_namespace/010_veth/047_echo-udp-ipv6-long-5con-multi-reverse/test.yml
  157. +2 −2 test/cases/020_kernel/110_namespace/010_veth/047_echo-udp-ipv6-long-5con-multi/test.yml
  158. +2 −2 test/cases/020_kernel/110_namespace/050_unix-domain/010_echo-short-1con-single-reverse/test.yml
  159. +2 −2 test/cases/020_kernel/110_namespace/050_unix-domain/010_echo-short-1con-single/test.yml
  160. +2 −2 test/cases/020_kernel/110_namespace/050_unix-domain/011_echo-short-10con-single-reverse/test.yml
  161. +2 −2 test/cases/020_kernel/110_namespace/050_unix-domain/011_echo-short-10con-single/test.yml
  162. +2 −2 test/cases/020_kernel/110_namespace/050_unix-domain/012_echo-short-5con-multi-reverse/test.yml
  163. +2 −2 test/cases/020_kernel/110_namespace/050_unix-domain/012_echo-short-5con-multi/test.yml
  164. +2 −2 test/cases/020_kernel/110_namespace/050_unix-domain/015_echo-long-1con-single-reverse/test.yml
  165. +2 −2 test/cases/020_kernel/110_namespace/050_unix-domain/015_echo-long-1con-single/test.yml
  166. +2 −2 test/cases/020_kernel/110_namespace/050_unix-domain/016_echo-long-10con-single-reverse/test.yml
  167. +2 −2 test/cases/020_kernel/110_namespace/050_unix-domain/016_echo-long-10con-single/test.yml
  168. +2 −2 test/cases/020_kernel/110_namespace/050_unix-domain/017_echo-long-5con-multi-reverse/test.yml
  169. +2 −2 test/cases/020_kernel/110_namespace/050_unix-domain/017_echo-long-5con-multi/test.yml
  170. +2 −2 test/cases/020_kernel/110_namespace/100_mix/010_veth-unix-domain-echo/test.yml
  171. +2 −2 test/cases/020_kernel/110_namespace/100_mix/011_veth-unix-domain-echo-reverse/test.yml
  172. +2 −2 test/cases/020_kernel/110_namespace/100_mix/012_veth-ipv4-echo/test.yml
  173. +2 −2 test/cases/020_kernel/110_namespace/100_mix/013_veth-ipv6-echo/test.yml
  174. +2 −2 test/cases/020_kernel/110_namespace/100_mix/014_veth-tcp-echo/test.yml
  175. +2 −2 test/cases/020_kernel/110_namespace/100_mix/015_veth-udp-echo/test.yml
  176. +2 −2 test/cases/020_kernel/110_namespace/100_mix/020_unix-domain-echo/test.yml
  177. +2 −2 test/cases/020_kernel/110_namespace/common.yml
  178. +11 −11 test/cases/030_security/000_docker-bench/test.yml
  179. +3 −3 test/cases/030_security/010_ports/test.yml
  180. +4 −4 test/cases/040_packages/002_binfmt/test.yml
  181. +4 −4 test/cases/040_packages/003_ca-certificates/test.yml
  182. +10 −10 test/cases/040_packages/003_containerd/test.yml
  183. +4 −4 test/cases/040_packages/004_dhcpcd/test.yml
  184. +5 −5 test/cases/040_packages/005_extend/000_ext4/test-create.yml
  185. +5 −5 test/cases/040_packages/005_extend/000_ext4/test.yml
  186. +6 −6 test/cases/040_packages/005_extend/001_btrfs/test-create.yml
  187. +6 −6 test/cases/040_packages/005_extend/001_btrfs/test.yml
  188. +5 −5 test/cases/040_packages/005_extend/002_xfs/test-create.yml
  189. +5 −5 test/cases/040_packages/005_extend/002_xfs/test.yml
  190. +5 −5 test/cases/040_packages/006_format_mount/000_auto/test.yml
  191. +5 −5 test/cases/040_packages/006_format_mount/001_by_label/test.yml
  192. +5 −5 test/cases/040_packages/006_format_mount/002_by_name/test.yml.in
  193. +6 −6 test/cases/040_packages/006_format_mount/003_btrfs/test.yml
  194. +5 −5 test/cases/040_packages/006_format_mount/004_xfs/test.yml
  195. +8 −8 test/cases/040_packages/006_format_mount/005_by_device_force/test.yml
  196. +7 −7 test/cases/040_packages/006_format_mount/010_multiple/test.yml
  197. +6 −6 test/cases/040_packages/007_getty-containerd/test.yml
  198. +4 −4 test/cases/040_packages/013_mkimage/mkimage.yml
  199. +3 −3 test/cases/040_packages/013_mkimage/run.yml
  200. +4 −4 test/cases/040_packages/019_sysctl/test.yml
  201. +7 −7 test/cases/040_packages/023_wireguard/test.yml
  202. +6 −6 test/cases/040_packages/030_logwrite/test.yml
  203. +7 −7 test/cases/040_packages/031_kmsg/test.yml
  204. +4 −4 test/hack/test-ltp.yml
  205. +6 −6 test/hack/test.yml
  206. +1 −1 test/pkg/containerd/Dockerfile
  207. +1 −1 test/pkg/docker-bench/Dockerfile
  208. +1 −1 test/pkg/kernel-config/Dockerfile
  209. +2 −2 test/pkg/ns/Dockerfile
  210. +3 −3 test/pkg/ns/template.yml
  211. +1 −1 test/pkg/poweroff/Dockerfile
  212. +2 −2 test/pkg/virtsock/Dockerfile
  213. +8 −8 tools/alpine/versions.aarch64
  214. +8 −8 tools/alpine/versions.s390x
  215. +8 −8 tools/alpine/versions.x86_64
  216. +1 −1 tools/go-compile/Dockerfile
  217. +1 −1 tools/mkimage-iso-bios/Dockerfile
  218. +2 −2 tools/mkimage-iso-efi/Dockerfile
  219. +1 −1 tools/mkimage-iso/Dockerfile
  220. +2 −2 tools/mkimage-qcow2-efi/Dockerfile
  221. +1 −1 tools/mkimage-raw-bios/Dockerfile
  222. +2 −2 tools/mkimage-raw-efi/Dockerfile
  223. +1 −1 tools/mkimage-rpi3/Dockerfile
  224. +1 −1 tools/mkimage-squashfs/Dockerfile
  225. +1 −1 tools/qemu/Dockerfile
@@ -48,9 +48,10 @@ Radu Matei <matei.radu94@gmail.com>
Riyaz Faizullabhoy <riyaz.faizullabhoy@docker.com> <riyazdf@berkeley.edu>
Riyaz Faizullabhoy <riyaz.faizullabhoy@docker.com> <riyazdf@gmail.com>
Robin Winkelewski <w9ncontact@gmail.com>
Rolf Neugebauer <rolf.neugebauer@docker.com> <rneugeba@users.noreply.github.com>
Rolf Neugebauer <rolf.neugebauer@docker.com> <rn@users.noreply.github.com>
Rolf Neugebauer <rolf.neugebauer@docker.com> <rolf.neugebauer@gmail.com>
Rolf Neugebauer <rn@rneugeba.io> <rneugeba@users.noreply.github.com>
Rolf Neugebauer <rn@rneugeba.io> <rn@users.noreply.github.com>
Rolf Neugebauer <rn@rneugeba.io> <rolf.neugebauer@gmail.com>
Rolf Neugebauer <rn@rneugeba.io> <rolf.neugebauer@docker.com>
Sebastiaan van Stijn <sebastiaan.vanstijn@docker.com> <github@gone.nl>
Simon Ferquel <simon.ferquel@docker.com> <simon.ferquel@hotmail.fr>
Thomas Gazagnaire <thomas.gazagnaire@docker.com> <thomas@gazagnaire.com>
@@ -94,7 +94,7 @@ Richard Mortier <mort@cantab.net>
Riyaz Faizullabhoy <riyaz.faizullabhoy@docker.com>
Robb Kistler <robb.kistler@docker.com>
Robin Winkelewski <w9ncontact@gmail.com>
Rolf Neugebauer <rolf.neugebauer@docker.com>
Rolf Neugebauer <rn@rneugeba.io>
Roman Shaposhnik <rvs@zededa.com>
Rui Lopes <rgl@ruilopes.com>
Ryoga Saito <proelbtn@gmail.com>
@@ -3,6 +3,24 @@ 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.6] - 2018-07-26
### Added
- `linuxkit build` now works with private repositories and registries.
- `linuxkit pkg build` can build packages with sources outside the package directory.
- New `kernel+iso` format for `linuxkit build`.

### Changed
- `containerd` updated to v1.1.2.
- WireGuard updated to 0.0.20180718.
- Fixed SSH key handling on GCP.
- Changed name of logfiles when memlogd/logwrite is used.
- `moby/tool` code merged back into `linuxkit/linuxkit`
- Smaller `mkimage-*` packages.

### Removed



## [v0.5] - 2018-07-10
### Added
- New logging support with log rotation.
@@ -195,5 +195,5 @@ on disputes for technical matters."

[people.rn]
Name = "Rolf Neugebauer"
Email = "rolf.neugebauer@docker.com"
Email = "rn@rneugeba.io"
GitHub = "rn"
@@ -1,7 +1,7 @@
VERSION="v0.5+"
VERSION="v0.6"
GIT_COMMIT=$(shell git rev-list -1 HEAD)

GO_COMPILE=linuxkit/go-compile:49a2e8f8672ca95ad0159eebcc631773503465c1
GO_COMPILE=linuxkit/go-compile:e1204ce9921c1d45362a374e06be7234d3bf1184

ifeq ($(OS),Windows_NT)
LINUXKIT?=bin/linuxkit.exe
@@ -33,12 +33,12 @@ kernel:
image: linuxkit/kernel:4.9.115
cmdline: "console=tty0 console=ttyS0 console=ttyAMA0"
init:
- linuxkit/init:598439400c1e4bf8c25c63c98b2d3e83b1382be9
- linuxkit/runc:v0.5
- linuxkit/containerd:0784cc754edb296b996c3510abbdf69686ef0f24
- linuxkit/init:v0.6
- linuxkit/runc:v0.6
- linuxkit/containerd:v0.6
services:
- name: getty
image: linuxkit/getty:v0.5
image: linuxkit/getty:v0.6
env:
- INSECURE=true
trust:
@@ -241,6 +241,7 @@ git commit -a -s -m "Update package tags to $LK_RELEASE"

### Final preparation steps

- Update AUTHORS by running `./scripts/generate-authors.sh`
- Update the `VERSION` variable in the top-level `Makefile`
- Create an entry in `CHANGELOG.md`. Take a look at `git log v0.3..HEAD` and pick interesting updates (of course adjust `v0.3` to the previous version).
- Create a PR with your changes.
@@ -22,7 +22,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:49a2e8f8672ca95ad0159eebcc631773503465c1
linuxkit/go-compile:e1204ce9921c1d45362a374e06be7234d3bf1184
```

To update a single dependency:
@@ -32,7 +32,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:49a2e8f8672ca95ad0159eebcc631773503465c1
linuxkit/go-compile:e1204ce9921c1d45362a374e06be7234d3bf1184
github.com/docker/docker
```

@@ -2,23 +2,23 @@ kernel:
image: linuxkit/kernel:4.14.58
cmdline: "console=ttyS0"
init:
- linuxkit/init:598439400c1e4bf8c25c63c98b2d3e83b1382be9
- linuxkit/runc:v0.5
- linuxkit/containerd:0784cc754edb296b996c3510abbdf69686ef0f24
- linuxkit/ca-certificates:v0.5
- linuxkit/init:v0.6
- linuxkit/runc:v0.6
- linuxkit/containerd:v0.6
- linuxkit/ca-certificates:v0.6
onboot:
- name: sysctl
image: linuxkit/sysctl:v0.5
image: linuxkit/sysctl:v0.6
- name: dhcpcd
image: linuxkit/dhcpcd:v0.5
image: linuxkit/dhcpcd:v0.6
command: ["/sbin/dhcpcd", "--nobackground", "-f", "/dhcpcd.conf", "-1"]
- name: metadata
image: linuxkit/metadata:721562e6f3ba9b6c003f9e746ff7ee94796f5251
image: linuxkit/metadata:v0.6
services:
- name: rngd
image: linuxkit/rngd:v0.5
image: linuxkit/rngd:v0.6
- name: sshd
image: linuxkit/sshd:v0.5
image: linuxkit/sshd:v0.6
binds:
- /run/config/ssh/authorized_keys:/root/.ssh/authorized_keys
- name: nginx
@@ -2,20 +2,20 @@ kernel:
image: linuxkit/kernel:4.14.58
cmdline: "console=ttyS0"
init:
- linuxkit/init:598439400c1e4bf8c25c63c98b2d3e83b1382be9
- linuxkit/runc:v0.5
- linuxkit/containerd:0784cc754edb296b996c3510abbdf69686ef0f24
- linuxkit/ca-certificates:v0.5
- linuxkit/init:v0.6
- linuxkit/runc:v0.6
- linuxkit/containerd:v0.6
- linuxkit/ca-certificates:v0.6
onboot:
- name: sysctl
image: linuxkit/sysctl:v0.5
image: linuxkit/sysctl:v0.6
services:
- name: rngd
image: linuxkit/rngd:v0.5
image: linuxkit/rngd:v0.6
- name: dhcpcd
image: linuxkit/dhcpcd:v0.5
image: linuxkit/dhcpcd:v0.6
- name: sshd
image: linuxkit/sshd:v0.5
image: linuxkit/sshd:v0.6
files:
- path: root/.ssh/authorized_keys
source: ~/.ssh/id_rsa.pub
@@ -2,33 +2,33 @@ kernel:
image: linuxkit/kernel:4.14.58
cmdline: "console=tty0 console=ttyS0 console=ttyAMA0 console=ttysclp0"
init:
- linuxkit/init:598439400c1e4bf8c25c63c98b2d3e83b1382be9
- linuxkit/runc:v0.5
- linuxkit/containerd:0784cc754edb296b996c3510abbdf69686ef0f24
- linuxkit/ca-certificates:v0.5
- linuxkit/init:v0.6
- linuxkit/runc:v0.6
- linuxkit/containerd:v0.6
- linuxkit/ca-certificates:v0.6
onboot:
- name: sysctl
image: linuxkit/sysctl:v0.5
image: linuxkit/sysctl:v0.6
- name: dhcpcd
image: linuxkit/dhcpcd:v0.5
image: linuxkit/dhcpcd:v0.6
command: ["/sbin/dhcpcd", "--nobackground", "-f", "/dhcpcd.conf", "-1"]
- name: sysfs
image: linuxkit/sysfs:v0.5
image: linuxkit/sysfs:v0.6
- name: format
image: linuxkit/format:v0.5
image: linuxkit/format:v0.6
- name: mount
image: linuxkit/mount:v0.5
image: linuxkit/mount:v0.6
command: ["/usr/bin/mountie", "/var/lib/docker"]

services:
- name: getty
image: linuxkit/getty:v0.5
image: linuxkit/getty:v0.6
env:
- INSECURE=true
- name: rngd
image: linuxkit/rngd:v0.5
image: linuxkit/rngd:v0.6
- name: ntpd
image: linuxkit/openntpd:v0.5
image: linuxkit/openntpd:v0.6

- 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:v0.5
image: linuxkit/cadvisor:v0.6
files:
- path: var/lib/docker
directory: true
@@ -3,30 +3,30 @@ kernel:
image: linuxkit/kernel:4.14.58
cmdline: "console=ttyS0 page_poison=1"
init:
- linuxkit/vpnkit-expose-port:v0.5 # install vpnkit-expose-port and vpnkit-iptables-wrapper on host
- linuxkit/init:598439400c1e4bf8c25c63c98b2d3e83b1382be9
- linuxkit/runc:v0.5
- linuxkit/containerd:0784cc754edb296b996c3510abbdf69686ef0f24
- linuxkit/ca-certificates:v0.5
- linuxkit/vpnkit-expose-port:v0.6 # install vpnkit-expose-port and vpnkit-iptables-wrapper on host
- linuxkit/init:v0.6
- linuxkit/runc:v0.6
- linuxkit/containerd:v0.6
- linuxkit/ca-certificates:v0.6
onboot:
# support metadata for optional config in /run/config
- name: metadata
image: linuxkit/metadata:721562e6f3ba9b6c003f9e746ff7ee94796f5251
image: linuxkit/metadata:v0.6
- name: sysctl
image: linuxkit/sysctl:v0.5
image: linuxkit/sysctl:v0.6
- name: sysfs
image: linuxkit/sysfs:v0.5
image: linuxkit/sysfs:v0.6
- name: binfmt
image: linuxkit/binfmt:v0.5
image: linuxkit/binfmt:v0.6
# Format and mount the disk image in /var/lib/docker
- name: format
image: linuxkit/format:v0.5
image: linuxkit/format:v0.6
- name: mount
image: linuxkit/mount:v0.5
image: linuxkit/mount:v0.6
command: ["/usr/bin/mountie", "/var/lib"]
# make a swap file on the mounted disk
- name: swap
image: linuxkit/swap:v0.5
image: linuxkit/swap:v0.6
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:v0.5
image: linuxkit/dhcpcd:v0.6
command: ["/sbin/dhcpcd", "--nobackground", "-f", "/dhcpcd.conf", "-1"]
services:
# Enable acpi to shutdown on power events
- name: acpid
image: linuxkit/acpid:v0.5
image: linuxkit/acpid:v0.6
# Enable getty for easier debugging
- name: getty
image: linuxkit/getty:v0.5
image: linuxkit/getty:v0.6
env:
- INSECURE=true
# Run ntpd to keep time synchronised in the VM
- name: ntpd
image: linuxkit/openntpd:v0.5
image: linuxkit/openntpd:v0.6
# VSOCK to unix domain socket forwarding. Forwards guest /var/run/docker.sock
# to a socket on the host.
- name: vsudd
image: linuxkit/vsudd:v0.5
image: linuxkit/vsudd:v0.6
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:v0.5
image: linuxkit/vpnkit-forwarder:v0.6
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:v0.5
image: linuxkit/trim-after-delete:v0.6
# When the host resumes from sleep, force a clock resync
- name: host-timesync-daemon
image: linuxkit/host-timesync-daemon:v0.5
image: linuxkit/host-timesync-daemon:v0.6
# 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,33 +2,33 @@ kernel:
image: linuxkit/kernel:4.14.58
cmdline: "console=tty0 console=ttyS0 console=ttyAMA0 console=ttysclp0"
init:
- linuxkit/init:598439400c1e4bf8c25c63c98b2d3e83b1382be9
- linuxkit/runc:v0.5
- linuxkit/containerd:0784cc754edb296b996c3510abbdf69686ef0f24
- linuxkit/ca-certificates:v0.5
- linuxkit/init:v0.6
- linuxkit/runc:v0.6
- linuxkit/containerd:v0.6
- linuxkit/ca-certificates:v0.6
onboot:
- name: sysctl
image: linuxkit/sysctl:v0.5
image: linuxkit/sysctl:v0.6
- name: sysfs
image: linuxkit/sysfs:v0.5
image: linuxkit/sysfs:v0.6
- name: format
image: linuxkit/format:v0.5
image: linuxkit/format:v0.6
- name: mount
image: linuxkit/mount:v0.5
image: linuxkit/mount:v0.6
command: ["/usr/bin/mountie", "/var/lib/docker"]
services:
- name: getty
image: linuxkit/getty:v0.5
image: linuxkit/getty:v0.6
env:
- INSECURE=true
- name: rngd
image: linuxkit/rngd:v0.5
image: linuxkit/rngd:v0.6
- name: dhcpcd
image: linuxkit/dhcpcd:v0.5
image: linuxkit/dhcpcd:v0.6
- name: ntpd
image: linuxkit/openntpd:v0.5
image: linuxkit/openntpd:v0.6
- name: docker
image: docker:18.05.0-ce-dind
image: docker:18.06.0-ce-dind
capabilities:
- all
net: host
Oops, something went wrong.

0 comments on commit 10f07ca

Please sign in to comment.