github/linuxkit
1
0
Fork 0
mirror of https://github.com/linuxkit/linuxkit.git synced 2025-07-24 19:28:09 +00:00
Code Issues Projects Releases Wiki Activity
1,228 Commits 1 Branch 27 Tags 240 MiB
eaeea2dfb8
Commit Graph

1228 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Rolf Neugebauer
c36072713a diagnostics: fix diagnostics for local/desktop editions 
Signed-off-by: Rolf Neugebauer <rolf.neugebauer@docker.com>
 2016-07-29 16:28:34 +01:00
Justin Cormack
e30cb91bce Update kernel to 4.4.16 
This contains a lot of fixes for overlay.

Fix #374

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
 2016-07-29 16:21:24 +01:00
Justin Cormack
8fbee7e0b8 Use a container for doing gzip compression 
The CI uses Alpine with busybox and that version is not good
at compression.

ALso use `.DELETE_ON_ERROR` so empty files are not created on failure.

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
 2016-07-29 16:00:49 +01:00
Justin Cormack
06fda31deb Merge pull request #379 from nathanleclaire/bump_1.12.0 
Bump cloud tag for 1.12.0
 2016-07-29 00:23:37 +01:00
Nathan LeClaire
61224972e6 Bump cloud tag for 1.12.0 
Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>
 2016-07-28 16:22:09 -07:00
Justin Cormack
eb8430115d Merge pull request #376 from justincormack/slowershutdown 
Allow longer for Docker to shut down
 2016-07-28 19:13:14 +01:00
Justin Cormack
9e51ff5401 Allow longer for Docker to shut down 
Docker needs 10s at least for containers to be allowed to shut down,
so allow 15s maximum between SIGTERM and SIGKILL.

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
 2016-07-28 17:25:49 +01:00
Justin Cormack
0ceb8111e9 Merge pull request #372 from justincormack/docker-1.12.0 
Update docker to 1.12.0 final
 2016-07-28 01:17:55 +01:00
Justin Cormack
4813ffe3cd Update docker to 1.12.0 final 
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
 2016-07-28 00:43:12 +01:00
Justin Cormack
6ac08f29dc Merge pull request #371 from nathanleclaire/remove_azure_deprecated_swarm_features 
Remove now incompatible Swarm init logic
 2016-07-27 18:36:53 +01:00
Nathan LeClaire
be9fc93b72 Remove now incompatible Swarm init logic 
Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>
 2016-07-27 10:34:57 -07:00
Justin Cormack
af0158dd43 Merge pull request #367 from nathanleclaire/nohvc0 
Remove unneeded console=/dev/hvc0
 2016-07-26 21:15:02 +01:00
Nathan LeClaire
86b2468a45 Remove unneeded console=/dev/hvc0 
Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>
 2016-07-26 09:13:34 -07:00
Justin Cormack
d1e5233fff Merge pull request #365 from ncopa/cleanup-script-moby 
Cleanup script moby
 2016-07-26 16:40:58 +01:00
Natanael Copa
3f13365771 Only backup vmlinuz/initrd once with moby script 
We probably want keep the backup of the original so don't overwrite
backup if it exists.

Signed-off-by: Natanael Copa <natanael.copa@docker.com>
 2016-07-26 17:33:32 +02:00
Natanael Copa
d976eef44e Minor readabaility cleanup of scripts/moby.sh 
Use a variable $mobydir to make script more readable. No changes in
functionality.

Signed-off-by: Natanael Copa <natanael.copa@docker.com>
 2016-07-26 17:33:32 +02:00
Justin Cormack
63dd3d6890 Merge pull request #364 from justincormack/swarmtest 
Enable swarm mode in test suite
 2016-07-26 16:21:07 +01:00
Justin Cormack
3bed9a18e9 Enable swarm mode in test suite 
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
 2016-07-26 16:20:29 +01:00
Justin Cormack
1cf7eb62a2 Merge pull request #362 from justincormack/swarmadvert 
On desktop editions, set default swarm advertise address to eth0
 2016-07-26 16:14:02 +01:00
Justin Cormack
6c9a66263e On desktop editions, set default swarm advertise address to eth0 
This allows plain `swarm init` to work. We do not support multi
node clusters yet as there is no way to reqach this address from
externally at present.

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
 2016-07-26 16:10:20 +01:00
Justin Cormack
d6752e9eb8 Merge pull request #359 from justincormack/xhyvefix 
Fix make xhyve after kernel image moved
 2016-07-26 13:48:24 +01:00
Justin Cormack
8af8647331 Merge pull request #358 from justincormack/dockerup 
Update Docker to 1.12.0-rc5
 2016-07-26 13:48:09 +01:00
Justin Cormack
733dc57813 Fix make xhyve after kernel image moved 
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
 2016-07-26 13:47:51 +01:00
Justin Cormack
d8f9d6c0b7 Update Docker to 1.12.0-rc5 
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
 2016-07-26 13:23:29 +01:00
Justin Cormack
5bffb3ffa9 Merge pull request #354 from justincormack/experimental-switch 
Support make flags for Docker version and experimental
 2016-07-26 13:22:23 +01:00
Justin Cormack
c619fe5ec5 Support make flags for Docker version and experimental 
Use `make DOCKER_VERSION=xxx` to override version. Note that
as install process and packaging may vary this may not work.

Use `make DOCKER_EXPERIMENTAL=0` to build from either release
binaries, if version is a final release or test binaries for
release candidates.

Building experimental is still the default.

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
 2016-07-26 13:18:09 +01:00
Justin Cormack
b7c4f91408 Merge pull request #352 from nathanleclaire/cloud_arch 
Migrate script to new arch dir layout
 2016-07-25 23:42:58 +01:00
Justin Cormack
721bf2c6e5 Merge pull request #351 from nathanleclaire/nathanleclaire2docker4xazure 
Implement only one container for Azure
 2016-07-25 23:42:33 +01:00
Nathan LeClaire
27715eeee4 Migrate script to new arch dir layout 
Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>
 2016-07-25 15:41:35 -07:00
Nathan LeClaire
9684dd9e1d Implement only one container for Azure 
Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>
 2016-07-25 15:39:04 -07:00
Justin Cormack
398db31efe Merge pull request #350 from nathanleclaire/continue_posixify 
Continue POSIX-ifying build scripts
 2016-07-25 22:14:27 +01:00
Nathan LeClaire
c7e7e713f7 Continue POSIX-ifying build scripts 
Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>
 2016-07-25 11:14:57 -07:00
Justin Cormack
1b61921f01 Merge pull request #336 from ncopa/kernel-to-arch-dir 
Move built kernel to arch specific subdir
 2016-07-25 16:19:33 +01:00
Natanael Copa
66ba586cac Move built kernel to arch specific subdir 
We want be able to build kernels for different archs without that they
clash with each other so we but the generated files into an $arch subdir.

Signed-off-by: Natanael Copa <natanael.copa@docker.com>
 2016-07-25 17:18:02 +02:00
Justin Cormack
2547512809 Merge pull request #349 from justincormack/novmwarevsock 
Remove some VMWare devices
 2016-07-25 15:56:35 +01:00
Justin Cormack
4c68383d56 Remove some VMWare devices 
In particular vsock causes issues with virtio vsock

We are not supporting VMWare platform at present so not relevant..

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
 2016-07-25 14:23:24 +01:00
Justin Cormack
67e8349459 Merge pull request #347 from justincormack/mobyconfigfix2 
Fix up mobyconfig startup code
 2016-07-25 14:03:44 +01:00
Justin Cormack
d045eb449b Fix up mobyconfig startup code 
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
 2016-07-25 14:03:03 +01:00
Justin Cormack
7d1faa25dc Merge pull request #346 from justincormack/mobyconfigfix 
fix typo
 2016-07-25 12:36:19 +01:00
Justin Cormack
e3844179b6 fix typo 
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
 2016-07-25 12:35:45 +01:00
Justin Cormack
a3dfb93479 Merge pull request #343 from justincormack/etchosts 
add etc/hosts database key, as requested at Docker London
 2016-07-22 14:41:15 +01:00
Justin Cormack
b1abb2f523 add etc/hosts database key, as requested at Docker London 
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
 2016-07-22 14:27:20 +01:00
David Sheets
5567f50c1e Merge pull request #340 from dsheets/transfused-notify-channel 
transfused notify channel
 2016-07-22 13:58:28 +01:00
Justin Cormack
e0c08ab7b0 Merge pull request #341 from justincormack/vmwaredocs 
Document that VMWare Fusion is working
 2016-07-22 13:55:31 +01:00
Justin Cormack
e6e974b379 Document that VMWare Fusion is working 
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
 2016-07-22 13:54:42 +01:00
Justin Cormack
ca5dbde634 Merge pull request #339 from justincormack/vmwaredrive 
Support VMWare emulation
 2016-07-22 13:43:27 +01:00
Justin Cormack
993237bdcf Add default SCSI device used by VMWare Fusion 
As this is the default emulation, nicer to have it work.

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
 2016-07-22 13:41:45 +01:00
David Sheets
b25b891d3b transfused: copyedit a couple error messages 
Signed-off-by: David Sheets <dsheets@docker.com>
 2016-07-22 13:40:52 +01:00
David Sheets
821b329f7b transfused: add separate FUSE notify channel to avoid deadlock 
This adds a new notify channel to the transfuse protocol. It is not
optional yet but could be made to be optional. A notify protocol and
notify channel are required because writing FUSE response messages to
the FUSE device has different semantics from writing asynchronous
notifications. In particular, response message writes only error on
malformed messages, do not take locks, and do not block. In contrast,
asynchronous notifications can error under normal conditions
(e.g. invalidating a cache entry that doesn't exist), can take locks
during the write call, and can block.

If responses and notifications occur in the same thread, the file system
can become deadlocked when syscalls lock resources waiting for a
response and a notification is written that blocks attempting to acquire
those same locks. The response that would unlock the contended lock
could be queued behind the notification write but the notification write
can't unblock until the response is written in the future. This patch
enables file systems to avoid that fate by offering a secondary channel
on which to send notifications.

Signed-off-by: David Sheets <dsheets@docker.com>
 2016-07-22 13:35:57 +01:00
Justin Cormack
79076c4fbd Add VMWare kernel features 
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
 2016-07-22 12:54:20 +01:00