Justin Cormack
c4da8863fd
Merge pull request #1804 from justincormack/containerdup
...
Switch to containerd
2017-05-11 11:41:54 +01:00
Justin Cormack
66d6d3a6e3
Update containers to use containerd
...
Now the issues seem fixed, switch over to containerd.
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2017-05-11 11:25:06 +01:00
Justin Cormack
716f60f226
Update containerd
...
This includes the bug fix that was causing output to be lost much
of the time.
fix #1660
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2017-05-11 10:11:18 +01:00
Rolf Neugebauer
54479cb917
Merge pull request #1802 from ijc25/metadata-simple-content
...
Metadata fix + a simpler file content option
2017-05-11 08:18:25 +01:00
Ian Campbell
800badea42
metadata: Allow simple string keys
...
If a file is a simple string (as opposed to a map) then write it with the
default perms. This makes for slightly terser metadata when creating a simple
datafile.
Signed-off-by: Ian Campbell <ian.campbell@docker.com>
2017-05-11 01:39:03 +01:00
Ian Campbell
8fd1a3cbdb
metadata: Fix parsing of JSON
...
`ok` was not assigned when type casting to `map[string]interface{}` so the
subsequent check was testing a stale value.
Also, the error message upon failure had the wrong sense.
Signed-off-by: Ian Campbell <ian.campbell@docker.com>
2017-05-10 17:37:45 +01:00
Justin Cormack
ba07bbfb0d
Merge pull request #26 from justincormack/gitignore-del
...
Remove .gitignore
2017-05-10 17:00:17 +01:00
Justin Cormack
0ea9dfdfe1
Remove .gitignore
...
Was ignoring too much...
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2017-05-10 16:59:25 +01:00
Justin Cormack
e0bcac3a28
Merge pull request #1799 from rneugeba/win-script
...
scripts: Rename named pipe for the serial port on Hyper-V
2017-05-10 14:54:46 +01:00
Rolf Neugebauer
3efdc694c5
Merge pull request #1798 from rneugeba/virtsock
...
Update virtsock test
2017-05-10 13:45:14 +01:00
Rolf Neugebauer
008edbb438
scripts: Rename named pipe for the serial port on Hyper-V
...
Signed-off-by: Rolf Neugebauer <rolf.neugebauer@docker.com>
2017-05-10 13:36:27 +01:00
Rolf Neugebauer
287653c76d
tests: Update virtsock YAML file
...
Pick up the new versin of the virtsock test package
Also remove the iso-ios output and adjust the choice of Linux kernels.
Signed-off-by: Rolf Neugebauer <rolf.neugebauer@docker.com>
2017-05-10 13:35:01 +01:00
Rolf Neugebauer
bfd7a62f1f
tests: Update virtsock stress test commit
...
The new version has improvements to the Windows code as well
as initial support for the VMware/virtio based Hyper-V socket
interface.
Signed-off-by: Rolf Neugebauer <rolf.neugebauer@docker.com>
2017-05-10 13:32:48 +01:00
Justin Cormack
38d21aab4b
Merge pull request #1797 from justincormack/init-dirs
...
Remove making directories from init
2017-05-10 12:00:56 +01:00
Justin Cormack
b14f8a2337
Update yaml files with new init
...
Note these are only the ones using the `containerd` based `init` as
the `runc` ones are still using an old one.
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2017-05-10 11:39:29 +01:00
Justin Cormack
515b25d518
Do not make directories
...
These should now be in the image.
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2017-05-10 11:00:35 +01:00
Rolf Neugebauer
decbd727d4
Merge pull request #1796 from rneugeba/kern-vsock
...
kernel: Fix Hyper-V socket support in 4.11 kernels
2017-05-09 22:51:50 +01:00
Rolf Neugebauer
477a56432b
Merge pull request #1787 from tych0/kernel-config
...
projects: add a project that re-works how we manage kernel config
2017-05-09 20:56:53 +01:00
Rolf Neugebauer
5d88623faf
kernel: Fix Hyper-V socket support in 4.11 kernels
...
In order to enable Hyper-V sockets, the CONFIG_HYPERV_VSOCKETS
option must be set. This is different to the older kernel patches.
In order for the Hyper-V socket code to compile, f3dd3f4797652c311df
("vmbus: introduce in-place packet iterator") needed cherry-picking.
Signed-off-by: Rolf Neugebauer <rolf.neugebauer@docker.com>
2017-05-09 20:49:24 +01:00
Rolf Neugebauer
e98e6fc0ba
Merge pull request #1795 from jeffrey-hogan/GCP_README_TYPO
...
Correct gcp.yml Example URL Path
2017-05-09 19:52:15 +01:00
Jeffrey Hogan
50875c5a21
Correct gcp.yml example URL path
...
Signed-off-by: Jeffrey Hogan <jeff.hogan1@gmail.com>
2017-05-09 13:12:35 -05:00
Tycho Andersen
1c10661069
collapse kernel build back into one file
...
Signed-off-by: Tycho Andersen <tycho@docker.com>
2017-05-09 11:13:32 -06:00
Justin Cormack
11b913606d
Merge pull request #11 from riyazdf/run-api
...
Use Docker API for run
2017-05-09 16:31:57 +01:00
Justin Cormack
b39e477c10
Merge pull request #1793 from justincormack/mobyup
...
Update moby tool to fix symlinks handling
2017-05-09 14:08:53 +01:00
Justin Cormack
5c792e791a
Merge pull request #1790 from justincormack/docker-17.05
...
Update to Docker 17.05
2017-05-09 13:57:48 +01:00
Justin Cormack
6dced3a196
Update moby tool to fix symlinks handling
...
Symlinks were being handled incorrectly in initrd output.
Fix #1792
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2017-05-09 13:54:38 +01:00
Justin Cormack
0a06eb2cea
Merge pull request #25 from justincormack/fix-symlinks-misc
...
Fix symlinks handling in initramfs
2017-05-09 13:54:17 +01:00
Justin Cormack
fbdd5047dd
Update linuxkit vendor
...
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2017-05-09 13:45:48 +01:00
Justin Cormack
ad8a4cad1f
Merge pull request #1791 from justincormack/initrd-symlink-cleanup
...
Clean up initrd creation library
2017-05-09 13:44:34 +01:00
Justin Cormack
6187570b7a
Add missing Close in initrd creation
...
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2017-05-09 13:34:41 +01:00
Justin Cormack
56e30fdbc5
Clean up initrd creation library
...
Remove duplicated code and clean up file handling a little.
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2017-05-09 13:30:14 +01:00
Justin Cormack
cc2a3a645f
Add support for symlinks in files section
...
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2017-05-09 13:15:11 +01:00
Justin Cormack
96ae98d2d5
Do not log information about empty sections
...
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2017-05-09 13:12:51 +01:00
Justin Cormack
e25033f70d
Allow no kernel to be specified
...
This is needed for non LinuxKit use cases.
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2017-05-09 13:03:58 +01:00
Justin Cormack
9ca3ba489a
Update yaml files to new Docker CE
...
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2017-05-09 11:12:39 +01:00
Justin Cormack
9e879dc56a
Update Docker to 17.05.0-ce
...
This includes nested build support so we can look at starting to dogfood.
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2017-05-09 11:08:16 +01:00
Rolf Neugebauer
b848b40687
Merge pull request #1789 from justincormack/go-in-alpine
...
Multistage builds for containerd and runc
2017-05-08 23:31:39 +01:00
Justin Cormack
61bbbf0808
Change containerd and runc to use multistage builds from new Alpine base
...
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2017-05-08 22:37:59 +01:00
Justin Cormack
f2fc503bb0
Add Go to linuxkit/alpine
...
Note this is currently Go 1.7.4 but should be updated soon to 1.8.1.
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2017-05-08 22:03:02 +01:00
Justin Cormack
8269292398
Merge pull request #1788 from justincormack/containerd-up
...
Update containerd
2017-05-08 22:02:25 +01:00
Justin Cormack
b70ca67931
Remove dist tool from containerd
...
It is 20MB and we don't use it...
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2017-05-08 21:12:12 +01:00
Justin Cormack
c73f9b3e6b
Update containerd
...
My patch has been merged so may as well use upstream.
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2017-05-08 21:10:54 +01:00
Justin Cormack
618c86fcc9
Merge pull request #1786 from justincormack/mobyup
...
Update moby tool
2017-05-08 20:32:39 +01:00
Justin Cormack
da72655886
Merge pull request #1777 from deitch/document-container-mount-options
...
Add docs how to use mount options for special mounting containers
2017-05-08 20:32:15 +01:00
Justin Cormack
1e29c39c81
Merge pull request #1776 from deitch/external-disk-docs
...
Add docs on how to use external disk
2017-05-08 20:19:56 +01:00
Justin Cormack
4261ce0a81
Update moby tool
...
Adds support for tar output, various fixes.
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2017-05-08 20:18:59 +01:00
Avi Deitcher
a9e9958d7c
Add docs how to use mount options for special mounting containers
...
Signed-off-by: Avi Deitcher <avi@deitcher.net>
2017-05-08 15:15:01 -04:00
Justin Cormack
a1b24b4de2
Merge pull request #24 from MagnusS/fix-build
...
Don't exit after pulling init or kernel image without -pull
2017-05-08 20:14:03 +01:00
Magnus Skjegstad
09c2904994
Don't exit after pulling init or kernel image
...
Due to a missing else the tool would previously terminate with an error
message showing that the kernel or init image didn't exist, even if it
was pulled successfully. Invoking the tool again would continue to the
next image.
Signed-off-by: Magnus Skjegstad <magnus@skjegstad.com>
2017-05-08 20:48:20 +02:00
Avi Deitcher
ff7de6e532
Add docs on how to use external disk
...
Signed-off-by: Avi Deitcher <avi@deitcher.net>
2017-05-08 14:47:45 -04:00