Skip to content
Permalink
Browse files

Merge pull request #3327 from rn/containerd-1.2.6

Update containerd to v1.2.6
  • Loading branch information...
rn committed Apr 14, 2019
2 parents 916b20a + c42569a commit 2f3e42a68c79f0cc7059a99f51dbd8733b6a32ea
Showing with 315 additions and 315 deletions.
  1. +3 −3 examples/aws.yml
  2. +3 −3 examples/azure.yml
  3. +3 −3 examples/cadvisor.yml
  4. +3 −3 examples/dm-crypt-loop.yml
  5. +3 −3 examples/dm-crypt.yml
  6. +3 −3 examples/docker-for-mac.yml
  7. +3 −3 examples/docker.yml
  8. +3 −3 examples/gcp.yml
  9. +3 −3 examples/getty.yml
  10. +3 −3 examples/hostmount-writeable-overlay.yml
  11. +3 −3 examples/influxdb-os.yml
  12. +3 −3 examples/logging.yml
  13. +3 −3 examples/minimal.yml
  14. +3 −3 examples/node_exporter.yml
  15. +3 −3 examples/openstack.yml
  16. +3 −3 examples/packet.yml
  17. +3 −3 examples/redis-os.yml
  18. +3 −3 examples/rt-for-vmware.yml
  19. +3 −3 examples/scaleway.yml
  20. +3 −3 examples/sshd.yml
  21. +3 −3 examples/static-ip.yml
  22. +3 −3 examples/swap.yml
  23. +3 −3 examples/tpm.yml
  24. +3 −3 examples/vmware.yml
  25. +3 −3 examples/vpnkit-forwarder.yml
  26. +3 −3 examples/vsudd-containerd.yml
  27. +3 −3 examples/vultr.yml
  28. +3 −3 examples/wireguard.yml
  29. +3 −3 linuxkit.yml
  30. +1 −1 pkg/containerd/Dockerfile
  31. +2 −2 pkg/init/Dockerfile
  32. +2 −2 pkg/runc/Dockerfile
  33. +1 −1 projects/clear-containers/clear-containers.yml
  34. +3 −3 projects/compose/compose-dynamic.yml
  35. +3 −3 projects/compose/compose-static.yml
  36. +3 −3 projects/ima-namespace/ima-namespace.yml
  37. +1 −1 projects/landlock/landlock.yml
  38. +3 −3 projects/memorizer/memorizer.yml
  39. +3 −3 projects/miragesdk/examples/fdd.yml
  40. +3 −3 projects/miragesdk/examples/mirage-dhcp.yml
  41. +3 −3 projects/okernel/examples/okernel_simple.yaml
  42. +3 −3 projects/shiftfs/shiftfs.yml
  43. +2 −2 src/cmd/linuxkit/moby/linuxkit.go
  44. +2 −2 test/cases/000_build/000_formats/test.yml
  45. +3 −3 test/cases/000_build/010_reproducible/test.yml
  46. +2 −2 test/cases/010_platforms/000_qemu/000_run_kernel+initrd/test.yml
  47. +2 −2 test/cases/010_platforms/000_qemu/005_run_kernel+squashfs/test.yml
  48. +2 −2 test/cases/010_platforms/000_qemu/010_run_iso/test.yml
  49. +2 −2 test/cases/010_platforms/000_qemu/020_run_efi/test.yml
  50. +2 −2 test/cases/010_platforms/000_qemu/030_run_qcow_bios/test.yml
  51. +2 −2 test/cases/010_platforms/000_qemu/040_run_raw_bios/test.yml
  52. +2 −2 test/cases/010_platforms/000_qemu/050_run_aws/test.yml
  53. +2 −2 test/cases/010_platforms/000_qemu/100_container/test.yml
  54. +2 −2 test/cases/010_platforms/010_hyperkit/000_run_kernel+initrd/test.yml
  55. +2 −2 test/cases/010_platforms/010_hyperkit/005_run_kernel+squashfs/test.yml
  56. +3 −3 test/cases/010_platforms/010_hyperkit/010_acpi/test.yml
  57. +2 −2 test/cases/020_kernel/001_config_4.9.x/test.yml
  58. +2 −2 test/cases/020_kernel/002_config_4.14.x/test.yml
  59. +2 −2 test/cases/020_kernel/005_config_4.19.x/test.yml
  60. +1 −1 test/cases/020_kernel/007_config_5.0.x/test.yml
  61. +2 −2 test/cases/020_kernel/011_kmod_4.9.x/test.yml
  62. +2 −2 test/cases/020_kernel/012_kmod_4.14.x/test.yml
  63. +2 −2 test/cases/020_kernel/015_kmod_4.19.x/test.yml
  64. +1 −1 test/cases/020_kernel/017_kmod_5.0.x/test.yml
  65. +2 −2 test/cases/020_kernel/110_namespace/common.yml
  66. +3 −3 test/cases/030_security/000_docker-bench/test.yml
  67. +2 −2 test/cases/030_security/010_ports/test.yml
  68. +2 −2 test/cases/040_packages/002_binfmt/test.yml
  69. +2 −2 test/cases/040_packages/003_ca-certificates/test.yml
  70. +4 −4 test/cases/040_packages/003_containerd/test.yml
  71. +2 −2 test/cases/040_packages/004_dhcpcd/test.yml
  72. +2 −2 test/cases/040_packages/004_dm-crypt/000_simple/test.yml
  73. +2 −2 test/cases/040_packages/004_dm-crypt/001_luks/test.yml
  74. +2 −2 test/cases/040_packages/004_dm-crypt/002_key/test.yml
  75. +2 −2 test/cases/040_packages/005_extend/000_ext4/test-create.yml
  76. +2 −2 test/cases/040_packages/005_extend/000_ext4/test.yml
  77. +2 −2 test/cases/040_packages/005_extend/001_btrfs/test-create.yml
  78. +2 −2 test/cases/040_packages/005_extend/001_btrfs/test.yml
  79. +2 −2 test/cases/040_packages/005_extend/002_xfs/test-create.yml
  80. +2 −2 test/cases/040_packages/005_extend/002_xfs/test.yml
  81. +2 −2 test/cases/040_packages/006_format_mount/000_auto/test.yml
  82. +2 −2 test/cases/040_packages/006_format_mount/001_by_label/test.yml
  83. +2 −2 test/cases/040_packages/006_format_mount/002_by_name/test.yml.in
  84. +2 −2 test/cases/040_packages/006_format_mount/003_btrfs/test.yml
  85. +2 −2 test/cases/040_packages/006_format_mount/004_xfs/test.yml
  86. +2 −2 test/cases/040_packages/006_format_mount/005_by_device_force/test.yml
  87. +2 −2 test/cases/040_packages/006_format_mount/010_multiple/test.yml
  88. +3 −3 test/cases/040_packages/007_getty-containerd/test.yml
  89. +2 −2 test/cases/040_packages/012_losetup/test.yml
  90. +2 −2 test/cases/040_packages/013_mkimage/mkimage.yml
  91. +2 −2 test/cases/040_packages/013_mkimage/run.yml
  92. +2 −2 test/cases/040_packages/019_sysctl/test.yml
  93. +3 −3 test/cases/040_packages/023_wireguard/test.yml
  94. +3 −3 test/cases/040_packages/030_logwrite/test.yml
  95. +3 −3 test/cases/040_packages/031_kmsg/test.yml
  96. +2 −2 test/cases/040_packages/032_bcc/test.yml
  97. +3 −3 test/hack/test-ltp.yml
  98. +3 −3 test/hack/test.yml
  99. +1 −1 test/pkg/containerd/Dockerfile
  100. +2 −2 test/pkg/ns/template.yml
  101. +1 −1 tools/alpine/Dockerfile
  102. +24 −24 tools/alpine/versions.aarch64
  103. +24 −24 tools/alpine/versions.s390x
  104. +24 −24 tools/alpine/versions.x86_64
@@ -2,9 +2,9 @@ kernel:
image: linuxkit/kernel:4.19.34
cmdline: "console=ttyS0"
init:
- linuxkit/init:629fdad56e62ae72bf8becf0c8a668241480d3ff
- linuxkit/runc:606971451ea29b4238029804ca638f9f85caf5af
- linuxkit/containerd:39ac21278cfcc10dbcc32ad7f5abbe820852c5bd
- linuxkit/init:3a772fafa2e45b872c72375dd6bc34993257b6d1
- linuxkit/runc:02f2f6dd425eb3ff98f488b5cdef0125be787332
- linuxkit/containerd:d197495c30d0c6e81cb038d8ab3b8f793736b39d
- linuxkit/ca-certificates:906c46a26fd2df271bf64c0259bf2267f7593213
onboot:
- name: sysctl
@@ -2,9 +2,9 @@ kernel:
image: linuxkit/kernel:4.19.34
cmdline: "console=ttyS0"
init:
- linuxkit/init:629fdad56e62ae72bf8becf0c8a668241480d3ff
- linuxkit/runc:606971451ea29b4238029804ca638f9f85caf5af
- linuxkit/containerd:39ac21278cfcc10dbcc32ad7f5abbe820852c5bd
- linuxkit/init:3a772fafa2e45b872c72375dd6bc34993257b6d1
- linuxkit/runc:02f2f6dd425eb3ff98f488b5cdef0125be787332
- linuxkit/containerd:d197495c30d0c6e81cb038d8ab3b8f793736b39d
- linuxkit/ca-certificates:906c46a26fd2df271bf64c0259bf2267f7593213
onboot:
- name: sysctl
@@ -2,9 +2,9 @@ kernel:
image: linuxkit/kernel:4.19.34
cmdline: "console=tty0 console=ttyS0 console=ttyAMA0 console=ttysclp0"
init:
- linuxkit/init:629fdad56e62ae72bf8becf0c8a668241480d3ff
- linuxkit/runc:606971451ea29b4238029804ca638f9f85caf5af
- linuxkit/containerd:39ac21278cfcc10dbcc32ad7f5abbe820852c5bd
- linuxkit/init:3a772fafa2e45b872c72375dd6bc34993257b6d1
- linuxkit/runc:02f2f6dd425eb3ff98f488b5cdef0125be787332
- linuxkit/containerd:d197495c30d0c6e81cb038d8ab3b8f793736b39d
- linuxkit/ca-certificates:906c46a26fd2df271bf64c0259bf2267f7593213
onboot:
- name: sysctl
@@ -2,9 +2,9 @@ kernel:
image: linuxkit/kernel:4.14.88
cmdline: "console=tty0 console=ttyS0"
init:
- linuxkit/init:629fdad56e62ae72bf8becf0c8a668241480d3ff
- linuxkit/runc:606971451ea29b4238029804ca638f9f85caf5af
- linuxkit/containerd:39ac21278cfcc10dbcc32ad7f5abbe820852c5bd
- linuxkit/init:3a772fafa2e45b872c72375dd6bc34993257b6d1
- linuxkit/runc:02f2f6dd425eb3ff98f488b5cdef0125be787332
- linuxkit/containerd:d197495c30d0c6e81cb038d8ab3b8f793736b39d
- linuxkit/ca-certificates:906c46a26fd2df271bf64c0259bf2267f7593213
onboot:
- name: sysctl
@@ -2,9 +2,9 @@ kernel:
image: linuxkit/kernel:4.14.88
cmdline: "console=tty0 console=ttyS0"
init:
- linuxkit/init:629fdad56e62ae72bf8becf0c8a668241480d3ff
- linuxkit/runc:606971451ea29b4238029804ca638f9f85caf5af
- linuxkit/containerd:39ac21278cfcc10dbcc32ad7f5abbe820852c5bd
- linuxkit/init:3a772fafa2e45b872c72375dd6bc34993257b6d1
- linuxkit/runc:02f2f6dd425eb3ff98f488b5cdef0125be787332
- linuxkit/containerd:d197495c30d0c6e81cb038d8ab3b8f793736b39d
- linuxkit/ca-certificates:906c46a26fd2df271bf64c0259bf2267f7593213
onboot:
- name: sysctl
@@ -4,9 +4,9 @@ kernel:
cmdline: "console=ttyS0 page_poison=1"
init:
- linuxkit/vpnkit-expose-port:b5f279abaa0386efeb3c03f46771609ff7c25bc3 # install vpnkit-expose-port and vpnkit-iptables-wrapper on host
- linuxkit/init:629fdad56e62ae72bf8becf0c8a668241480d3ff
- linuxkit/runc:606971451ea29b4238029804ca638f9f85caf5af
- linuxkit/containerd:39ac21278cfcc10dbcc32ad7f5abbe820852c5bd
- linuxkit/init:3a772fafa2e45b872c72375dd6bc34993257b6d1
- linuxkit/runc:02f2f6dd425eb3ff98f488b5cdef0125be787332
- linuxkit/containerd:d197495c30d0c6e81cb038d8ab3b8f793736b39d
- linuxkit/ca-certificates:906c46a26fd2df271bf64c0259bf2267f7593213
onboot:
# support metadata for optional config in /run/config
@@ -2,9 +2,9 @@ kernel:
image: linuxkit/kernel:4.19.34
cmdline: "console=tty0 console=ttyS0 console=ttyAMA0 console=ttysclp0"
init:
- linuxkit/init:629fdad56e62ae72bf8becf0c8a668241480d3ff
- linuxkit/runc:606971451ea29b4238029804ca638f9f85caf5af
- linuxkit/containerd:39ac21278cfcc10dbcc32ad7f5abbe820852c5bd
- linuxkit/init:3a772fafa2e45b872c72375dd6bc34993257b6d1
- linuxkit/runc:02f2f6dd425eb3ff98f488b5cdef0125be787332
- linuxkit/containerd:d197495c30d0c6e81cb038d8ab3b8f793736b39d
- linuxkit/ca-certificates:906c46a26fd2df271bf64c0259bf2267f7593213
onboot:
- name: sysctl
@@ -2,9 +2,9 @@ kernel:
image: linuxkit/kernel:4.19.34
cmdline: "console=ttyS0"
init:
- linuxkit/init:629fdad56e62ae72bf8becf0c8a668241480d3ff
- linuxkit/runc:606971451ea29b4238029804ca638f9f85caf5af
- linuxkit/containerd:39ac21278cfcc10dbcc32ad7f5abbe820852c5bd
- linuxkit/init:3a772fafa2e45b872c72375dd6bc34993257b6d1
- linuxkit/runc:02f2f6dd425eb3ff98f488b5cdef0125be787332
- linuxkit/containerd:d197495c30d0c6e81cb038d8ab3b8f793736b39d
- linuxkit/ca-certificates:906c46a26fd2df271bf64c0259bf2267f7593213
onboot:
- name: sysctl
@@ -2,9 +2,9 @@ kernel:
image: linuxkit/kernel:4.19.34
cmdline: "console=tty0 console=ttyS0 console=ttyAMA0 console=ttysclp0"
init:
- linuxkit/init:629fdad56e62ae72bf8becf0c8a668241480d3ff
- linuxkit/runc:606971451ea29b4238029804ca638f9f85caf5af
- linuxkit/containerd:39ac21278cfcc10dbcc32ad7f5abbe820852c5bd
- linuxkit/init:3a772fafa2e45b872c72375dd6bc34993257b6d1
- linuxkit/runc:02f2f6dd425eb3ff98f488b5cdef0125be787332
- linuxkit/containerd:d197495c30d0c6e81cb038d8ab3b8f793736b39d
- linuxkit/ca-certificates:906c46a26fd2df271bf64c0259bf2267f7593213
onboot:
- name: sysctl
@@ -2,9 +2,9 @@ kernel:
image: linuxkit/kernel:4.19.34
cmdline: "console=tty0 console=ttyS0 console=ttyAMA0 console=ttysclp0"
init:
- linuxkit/init:629fdad56e62ae72bf8becf0c8a668241480d3ff
- linuxkit/runc:606971451ea29b4238029804ca638f9f85caf5af
- linuxkit/containerd:39ac21278cfcc10dbcc32ad7f5abbe820852c5bd
- linuxkit/init:3a772fafa2e45b872c72375dd6bc34993257b6d1
- linuxkit/runc:02f2f6dd425eb3ff98f488b5cdef0125be787332
- linuxkit/containerd:d197495c30d0c6e81cb038d8ab3b8f793736b39d
- linuxkit/ca-certificates:906c46a26fd2df271bf64c0259bf2267f7593213
onboot:
- name: sysctl
@@ -2,9 +2,9 @@ kernel:
image: linuxkit/kernel:4.19.34
cmdline: "console=tty0 console=ttyS0 console=ttyAMA0"
init:
- linuxkit/init:629fdad56e62ae72bf8becf0c8a668241480d3ff
- linuxkit/runc:606971451ea29b4238029804ca638f9f85caf5af
- linuxkit/containerd:39ac21278cfcc10dbcc32ad7f5abbe820852c5bd
- linuxkit/init:3a772fafa2e45b872c72375dd6bc34993257b6d1
- linuxkit/runc:02f2f6dd425eb3ff98f488b5cdef0125be787332
- linuxkit/containerd:d197495c30d0c6e81cb038d8ab3b8f793736b39d
- linuxkit/ca-certificates:906c46a26fd2df271bf64c0259bf2267f7593213
onboot:
- name: dhcpcd
@@ -3,9 +3,9 @@ kernel:
image: linuxkit/kernel:4.19.34
cmdline: "console=tty0 console=ttyS0 console=ttyAMA0"
init:
- linuxkit/init:629fdad56e62ae72bf8becf0c8a668241480d3ff
- linuxkit/runc:606971451ea29b4238029804ca638f9f85caf5af
- linuxkit/containerd:39ac21278cfcc10dbcc32ad7f5abbe820852c5bd
- linuxkit/init:3a772fafa2e45b872c72375dd6bc34993257b6d1
- linuxkit/runc:02f2f6dd425eb3ff98f488b5cdef0125be787332
- linuxkit/containerd:d197495c30d0c6e81cb038d8ab3b8f793736b39d
- linuxkit/ca-certificates:906c46a26fd2df271bf64c0259bf2267f7593213
- linuxkit/memlogd:3d74c1153f99948d92c0fa9c759f816ab48d9855
onboot:
@@ -2,9 +2,9 @@ kernel:
image: linuxkit/kernel:4.19.34
cmdline: "console=tty0 console=ttyS0 console=ttyAMA0"
init:
- linuxkit/init:629fdad56e62ae72bf8becf0c8a668241480d3ff
- linuxkit/runc:606971451ea29b4238029804ca638f9f85caf5af
- linuxkit/containerd:39ac21278cfcc10dbcc32ad7f5abbe820852c5bd
- linuxkit/init:3a772fafa2e45b872c72375dd6bc34993257b6d1
- linuxkit/runc:02f2f6dd425eb3ff98f488b5cdef0125be787332
- linuxkit/containerd:d197495c30d0c6e81cb038d8ab3b8f793736b39d
onboot:
- name: dhcpcd
image: linuxkit/dhcpcd:85738d3d2f152a7879e17a61444f7714b858c2ee
@@ -2,9 +2,9 @@ kernel:
image: linuxkit/kernel:4.19.34
cmdline: "console=tty0 console=ttyS0"
init:
- linuxkit/init:629fdad56e62ae72bf8becf0c8a668241480d3ff
- linuxkit/runc:606971451ea29b4238029804ca638f9f85caf5af
- linuxkit/containerd:39ac21278cfcc10dbcc32ad7f5abbe820852c5bd
- linuxkit/init:3a772fafa2e45b872c72375dd6bc34993257b6d1
- linuxkit/runc:02f2f6dd425eb3ff98f488b5cdef0125be787332
- linuxkit/containerd:d197495c30d0c6e81cb038d8ab3b8f793736b39d
services:
- name: getty
image: linuxkit/getty:01993189b8c583dc91cbbc7d4be131832c0fc205
@@ -2,9 +2,9 @@ kernel:
image: linuxkit/kernel:4.19.34
cmdline: "console=ttyS0"
init:
- linuxkit/init:629fdad56e62ae72bf8becf0c8a668241480d3ff
- linuxkit/runc:606971451ea29b4238029804ca638f9f85caf5af
- linuxkit/containerd:39ac21278cfcc10dbcc32ad7f5abbe820852c5bd
- linuxkit/init:3a772fafa2e45b872c72375dd6bc34993257b6d1
- linuxkit/runc:02f2f6dd425eb3ff98f488b5cdef0125be787332
- linuxkit/containerd:d197495c30d0c6e81cb038d8ab3b8f793736b39d
- linuxkit/ca-certificates:906c46a26fd2df271bf64c0259bf2267f7593213
onboot:
- name: sysctl
@@ -3,9 +3,9 @@ kernel:
cmdline: console=ttyS1
ucode: intel-ucode.cpio
init:
- linuxkit/init:629fdad56e62ae72bf8becf0c8a668241480d3ff
- linuxkit/runc:606971451ea29b4238029804ca638f9f85caf5af
- linuxkit/containerd:39ac21278cfcc10dbcc32ad7f5abbe820852c5bd
- linuxkit/init:3a772fafa2e45b872c72375dd6bc34993257b6d1
- linuxkit/runc:02f2f6dd425eb3ff98f488b5cdef0125be787332
- linuxkit/containerd:d197495c30d0c6e81cb038d8ab3b8f793736b39d
- linuxkit/ca-certificates:906c46a26fd2df271bf64c0259bf2267f7593213
- linuxkit/firmware:0e37338a2c994f768fc4569fce47fcf8d9133506
onboot:
@@ -4,9 +4,9 @@ kernel:
image: linuxkit/kernel:4.19.34
cmdline: "console=tty0 console=ttyS0 console=ttyAMA0 console=ttysclp0"
init:
- linuxkit/init:629fdad56e62ae72bf8becf0c8a668241480d3ff
- linuxkit/runc:606971451ea29b4238029804ca638f9f85caf5af
- linuxkit/containerd:39ac21278cfcc10dbcc32ad7f5abbe820852c5bd
- linuxkit/init:3a772fafa2e45b872c72375dd6bc34993257b6d1
- linuxkit/runc:02f2f6dd425eb3ff98f488b5cdef0125be787332
- linuxkit/containerd:d197495c30d0c6e81cb038d8ab3b8f793736b39d
onboot:
- name: dhcpcd
image: linuxkit/dhcpcd:85738d3d2f152a7879e17a61444f7714b858c2ee
@@ -2,9 +2,9 @@ kernel:
image: linuxkit/kernel:4.19.25-rt
cmdline: "console=tty0"
init:
- linuxkit/init:629fdad56e62ae72bf8becf0c8a668241480d3ff
- linuxkit/runc:606971451ea29b4238029804ca638f9f85caf5af
- linuxkit/containerd:39ac21278cfcc10dbcc32ad7f5abbe820852c5bd
- linuxkit/init:3a772fafa2e45b872c72375dd6bc34993257b6d1
- linuxkit/runc:02f2f6dd425eb3ff98f488b5cdef0125be787332
- linuxkit/containerd:d197495c30d0c6e81cb038d8ab3b8f793736b39d
- linuxkit/ca-certificates:906c46a26fd2df271bf64c0259bf2267f7593213
onboot:
- name: sysctl
@@ -2,9 +2,9 @@ kernel:
image: linuxkit/kernel:4.19.34
cmdline: "console=tty0 console=ttyS0 console=ttyAMA0 console=ttysclp0 root=/dev/vda"
init:
- linuxkit/init:629fdad56e62ae72bf8becf0c8a668241480d3ff
- linuxkit/runc:606971451ea29b4238029804ca638f9f85caf5af
- linuxkit/containerd:39ac21278cfcc10dbcc32ad7f5abbe820852c5bd
- linuxkit/init:3a772fafa2e45b872c72375dd6bc34993257b6d1
- linuxkit/runc:02f2f6dd425eb3ff98f488b5cdef0125be787332
- linuxkit/containerd:d197495c30d0c6e81cb038d8ab3b8f793736b39d
- linuxkit/ca-certificates:906c46a26fd2df271bf64c0259bf2267f7593213
onboot:
- name: sysctl
@@ -2,9 +2,9 @@ kernel:
image: linuxkit/kernel:4.19.34
cmdline: "console=tty0 console=ttyS0 console=ttyAMA0 console=ttysclp0"
init:
- linuxkit/init:629fdad56e62ae72bf8becf0c8a668241480d3ff
- linuxkit/runc:606971451ea29b4238029804ca638f9f85caf5af
- linuxkit/containerd:39ac21278cfcc10dbcc32ad7f5abbe820852c5bd
- linuxkit/init:3a772fafa2e45b872c72375dd6bc34993257b6d1
- linuxkit/runc:02f2f6dd425eb3ff98f488b5cdef0125be787332
- linuxkit/containerd:d197495c30d0c6e81cb038d8ab3b8f793736b39d
- linuxkit/ca-certificates:906c46a26fd2df271bf64c0259bf2267f7593213
onboot:
- name: sysctl
@@ -2,9 +2,9 @@ kernel:
image: linuxkit/kernel:4.19.34
cmdline: "console=tty0 console=ttyS0 console=ttyAMA0"
init:
- linuxkit/init:629fdad56e62ae72bf8becf0c8a668241480d3ff
- linuxkit/runc:606971451ea29b4238029804ca638f9f85caf5af
- linuxkit/containerd:39ac21278cfcc10dbcc32ad7f5abbe820852c5bd
- linuxkit/init:3a772fafa2e45b872c72375dd6bc34993257b6d1
- linuxkit/runc:02f2f6dd425eb3ff98f488b5cdef0125be787332
- linuxkit/containerd:d197495c30d0c6e81cb038d8ab3b8f793736b39d
onboot:
- name: ip
image: linuxkit/ip:4787413a729748bcf7560c73e0b46d38b8a8df2b
@@ -2,9 +2,9 @@ kernel:
image: linuxkit/kernel:4.19.34
cmdline: "console=tty0 console=ttyS0 console=ttyAMA0 console=ttysclp0"
init:
- linuxkit/init:629fdad56e62ae72bf8becf0c8a668241480d3ff
- linuxkit/runc:606971451ea29b4238029804ca638f9f85caf5af
- linuxkit/containerd:39ac21278cfcc10dbcc32ad7f5abbe820852c5bd
- linuxkit/init:3a772fafa2e45b872c72375dd6bc34993257b6d1
- linuxkit/runc:02f2f6dd425eb3ff98f488b5cdef0125be787332
- linuxkit/containerd:d197495c30d0c6e81cb038d8ab3b8f793736b39d
- linuxkit/ca-certificates:906c46a26fd2df271bf64c0259bf2267f7593213
onboot:
- name: sysctl
@@ -2,9 +2,9 @@ kernel:
image: linuxkit/kernel:4.9.38
cmdline: "console=tty0 console=ttyS0"
init:
- linuxkit/init:629fdad56e62ae72bf8becf0c8a668241480d3ff
- linuxkit/runc:606971451ea29b4238029804ca638f9f85caf5af
- linuxkit/containerd:39ac21278cfcc10dbcc32ad7f5abbe820852c5bd
- linuxkit/init:3a772fafa2e45b872c72375dd6bc34993257b6d1
- linuxkit/runc:02f2f6dd425eb3ff98f488b5cdef0125be787332
- linuxkit/containerd:d197495c30d0c6e81cb038d8ab3b8f793736b39d
- linuxkit/ca-certificates:906c46a26fd2df271bf64c0259bf2267f7593213
onboot:
- name: sysctl
@@ -2,9 +2,9 @@ kernel:
image: linuxkit/kernel:4.19.34
cmdline: "console=tty0"
init:
- linuxkit/init:629fdad56e62ae72bf8becf0c8a668241480d3ff
- linuxkit/runc:606971451ea29b4238029804ca638f9f85caf5af
- linuxkit/containerd:39ac21278cfcc10dbcc32ad7f5abbe820852c5bd
- linuxkit/init:3a772fafa2e45b872c72375dd6bc34993257b6d1
- linuxkit/runc:02f2f6dd425eb3ff98f488b5cdef0125be787332
- linuxkit/containerd:d197495c30d0c6e81cb038d8ab3b8f793736b39d
- linuxkit/ca-certificates:906c46a26fd2df271bf64c0259bf2267f7593213
onboot:
- name: sysctl
@@ -2,9 +2,9 @@ kernel:
image: linuxkit/kernel:4.19.34
cmdline: "console=ttyS0"
init:
- linuxkit/init:629fdad56e62ae72bf8becf0c8a668241480d3ff
- linuxkit/runc:606971451ea29b4238029804ca638f9f85caf5af
- linuxkit/containerd:39ac21278cfcc10dbcc32ad7f5abbe820852c5bd
- linuxkit/init:3a772fafa2e45b872c72375dd6bc34993257b6d1
- linuxkit/runc:02f2f6dd425eb3ff98f488b5cdef0125be787332
- linuxkit/containerd:d197495c30d0c6e81cb038d8ab3b8f793736b39d
onboot:
- name: dhcpcd
image: linuxkit/dhcpcd:85738d3d2f152a7879e17a61444f7714b858c2ee
@@ -2,9 +2,9 @@ kernel:
image: linuxkit/kernel:4.19.34
cmdline: "console=ttyS0"
init:
- linuxkit/init:629fdad56e62ae72bf8becf0c8a668241480d3ff
- linuxkit/runc:606971451ea29b4238029804ca638f9f85caf5af
- linuxkit/containerd:39ac21278cfcc10dbcc32ad7f5abbe820852c5bd
- linuxkit/init:3a772fafa2e45b872c72375dd6bc34993257b6d1
- linuxkit/runc:02f2f6dd425eb3ff98f488b5cdef0125be787332
- linuxkit/containerd:d197495c30d0c6e81cb038d8ab3b8f793736b39d
onboot:
- name: dhcpcd
image: linuxkit/dhcpcd:85738d3d2f152a7879e17a61444f7714b858c2ee
@@ -2,9 +2,9 @@ kernel:
image: linuxkit/kernel:4.19.34
cmdline: "console=ttyS0"
init:
- linuxkit/init:629fdad56e62ae72bf8becf0c8a668241480d3ff
- linuxkit/runc:606971451ea29b4238029804ca638f9f85caf5af
- linuxkit/containerd:39ac21278cfcc10dbcc32ad7f5abbe820852c5bd
- linuxkit/init:3a772fafa2e45b872c72375dd6bc34993257b6d1
- linuxkit/runc:02f2f6dd425eb3ff98f488b5cdef0125be787332
- linuxkit/containerd:d197495c30d0c6e81cb038d8ab3b8f793736b39d
- linuxkit/ca-certificates:906c46a26fd2df271bf64c0259bf2267f7593213
onboot:
- name: sysctl
@@ -2,9 +2,9 @@ kernel:
image: linuxkit/kernel:4.19.34
cmdline: "console=tty0 console=ttyS0 console=ttyAMA0"
init:
- linuxkit/init:629fdad56e62ae72bf8becf0c8a668241480d3ff
- linuxkit/runc:606971451ea29b4238029804ca638f9f85caf5af
- linuxkit/containerd:39ac21278cfcc10dbcc32ad7f5abbe820852c5bd
- linuxkit/init:3a772fafa2e45b872c72375dd6bc34993257b6d1
- linuxkit/runc:02f2f6dd425eb3ff98f488b5cdef0125be787332
- linuxkit/containerd:d197495c30d0c6e81cb038d8ab3b8f793736b39d
- linuxkit/ca-certificates:906c46a26fd2df271bf64c0259bf2267f7593213
onboot:
- name: sysctl
@@ -2,9 +2,9 @@ kernel:
image: linuxkit/kernel:4.19.34
cmdline: "console=tty0 console=ttyS0 console=ttyAMA0"
init:
- linuxkit/init:629fdad56e62ae72bf8becf0c8a668241480d3ff
- linuxkit/runc:606971451ea29b4238029804ca638f9f85caf5af
- linuxkit/containerd:39ac21278cfcc10dbcc32ad7f5abbe820852c5bd
- linuxkit/init:3a772fafa2e45b872c72375dd6bc34993257b6d1
- linuxkit/runc:02f2f6dd425eb3ff98f488b5cdef0125be787332
- linuxkit/containerd:d197495c30d0c6e81cb038d8ab3b8f793736b39d
- linuxkit/ca-certificates:906c46a26fd2df271bf64c0259bf2267f7593213
onboot:
- name: sysctl
@@ -1,4 +1,4 @@
FROM linuxkit/alpine:6ed32ba2b29a12b3d75f3d5b9be1b4ac00e7d479 as alpine
FROM linuxkit/alpine:86cd4f51b49fb9a078b50201d892a3c7973d48ec as alpine
RUN apk add tzdata

WORKDIR $GOPATH/src/github.com/containerd/containerd
@@ -1,4 +1,4 @@
FROM linuxkit/alpine:6ed32ba2b29a12b3d75f3d5b9be1b4ac00e7d479 AS build
FROM linuxkit/alpine:86cd4f51b49fb9a078b50201d892a3c7973d48ec AS build
RUN apk add --no-cache --initdb alpine-baselayout make gcc musl-dev git linux-headers

ADD usermode-helper.c ./
@@ -16,7 +16,7 @@ RUN mkdir /tmp/bin && cd /tmp/bin/ && cp /go/bin/rc.init . && ln -s rc.init rc.s
RUN cd /go/src/cmd/service && ./skanky-vendor.sh $GOPATH/src/github.com/containerd/containerd
RUN go-compile.sh /go/src/cmd/service

FROM linuxkit/alpine:6ed32ba2b29a12b3d75f3d5b9be1b4ac00e7d479 AS mirror
FROM linuxkit/alpine:86cd4f51b49fb9a078b50201d892a3c7973d48ec AS mirror
RUN mkdir -p /out/etc/apk && cp -r /etc/apk/* /out/etc/apk/
RUN apk add --no-cache --initdb -p /out alpine-baselayout busybox musl

Oops, something went wrong.

0 comments on commit 2f3e42a

Please sign in to comment.
You can’t perform that action at this time.