github/linuxkit
1
0
Fork 0
mirror of https://github.com/linuxkit/linuxkit.git synced 2025-07-28 21:18:28 +00:00
Code Issues Projects Releases Wiki Activity
1,057 Commits 1 Branch 27 Tags 240 MiB
bfb082206f
Commit Graph

1057 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Rolf Neugebauer
bfb082206f Merge pull request #399 from rneugeba/win-passwd-fix 
win: fix the CIFS mount extension of the KVP daemon
 2016-08-09 17:56:49 +01:00
Rolf Neugebauer
e4b27c8509 win: fix the CIFS mount extension of the KVP daemon 
Change the format of the registry value, create a credentials file
from the new value, and use that for the CIFS mount.

This should fix issues with password and usernames with un-usual characters in them.

Note this requires a matching change in the host app

Signed-off-by: Rolf Neugebauer <rolf.neugebauer@docker.com>
 2016-08-09 17:41:48 +01:00
Justin Cormack
4c63ca4ce6 Merge pull request #397 from nathanleclaire/kickup_dhcp_timeouts 
Increase DHCP timeout and retries
 2016-08-09 16:18:25 +01:00
Justin Cormack
1ed1694bf4 Merge pull request #398 from justincormack/shared-run 
Mount /run as shared
 2016-08-09 11:50:53 +01:00
Justin Cormack
9fdb923056 Mount /run as shared 
This is needed for volume drivers as they will mount their
volumes under here, and if they are running in a container
docker on the host will need to see these.

Also provide our own fstab, removes the media devices that were
there previously.

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
 2016-08-09 11:46:08 +01:00
Nathan LeClaire
c7f289e395 Increase DHCP timeout and retries 
Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>
 2016-08-08 17:41:46 -07:00
Justin Cormack
47c41dc02b Merge pull request #385 from justincormack/touch-tee 
make sure test.log exists, and append, otherwise racy
 2016-08-08 12:14:14 +02:00
Justin Cormack
7740b2cb86 Merge pull request #390 from justincormack/filemax 
Increase fs.file-max
 2016-08-08 12:13:42 +02:00
Justin Cormack
d260da34e0 Merge pull request #394 from justincormack/jq 
Add jq to base
 2016-08-04 12:13:11 +02:00
Justin Cormack
69eed1ea40 Add jq to base 
Several people have asked for this for processing JSON config
data, and about to do some myself and parsing with a regex is
not so nice.

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
 2016-08-04 11:11:53 +02:00
Justin Cormack
b8661a721b Increase fs.file-max 
fixes #389

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
 2016-08-02 14:07:38 +02:00
Justin Cormack
fdb7ff5a4b Merge pull request #382 from justincormack/gzip 
Use a container for doing gzip compression
 2016-07-29 17:07:10 +01:00
Justin Cormack
b0a11a214b Merge pull request #383 from justincormack/kernelup 
Update kernel to 4.4.16
 2016-07-29 16:43:41 +01:00
Justin Cormack
da8cc8344a Merge pull request #384 from rneugeba/diag-fix 
diagnostics: fix diagnostics for local/desktop editions
 2016-07-29 16:38:34 +01:00
Justin Cormack
b9532e2a89 make sure test.log exists, and append, otherwise racy 
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
 2016-07-29 16:33:01 +01:00
Rolf Neugebauer
02b7e852c7 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
1f4d6c0402 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
c310ffcd71 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
31fb1d0bdc 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
4a25850a68 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
3071da63ed Merge pull request #376 from justincormack/slowershutdown 
Allow longer for Docker to shut down
 2016-07-28 19:13:14 +01:00
Justin Cormack
05610e7965 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
62573222c1 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
202cb42a84 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
38f4bd252d 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
7f822ee8b3 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
1613789576 Merge pull request #367 from nathanleclaire/nohvc0 
Remove unneeded console=/dev/hvc0
 2016-07-26 21:15:02 +01:00
Nathan LeClaire
5fe8b815aa Remove unneeded console=/dev/hvc0 
Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>
 2016-07-26 09:13:34 -07:00
Justin Cormack
309a3ac18c Merge pull request #365 from ncopa/cleanup-script-moby 
Cleanup script moby
 2016-07-26 16:40:58 +01:00
Natanael Copa
3cb758c4ae 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
cf583a911e 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
00332e1947 Merge pull request #364 from justincormack/swarmtest 
Enable swarm mode in test suite
 2016-07-26 16:21:07 +01:00
Justin Cormack
7b75a2d741 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
d9925b5797 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
6973159dce 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
fc58be6798 Merge pull request #359 from justincormack/xhyvefix 
Fix make xhyve after kernel image moved
 2016-07-26 13:48:24 +01:00
Justin Cormack
d14c52734f Merge pull request #358 from justincormack/dockerup 
Update Docker to 1.12.0-rc5
 2016-07-26 13:48:09 +01:00
Justin Cormack
a428a78494 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
54f6dcc44e 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
df3be495fa 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
b17a1b7366 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
a8389c8410 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
48d09d8dc9 Merge pull request #351 from nathanleclaire/nathanleclaire2docker4xazure 
Implement only one container for Azure
 2016-07-25 23:42:33 +01:00
Nathan LeClaire
223ef9954d 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
d6f2883730 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
e9cc8512bf Merge pull request #350 from nathanleclaire/continue_posixify 
Continue POSIX-ifying build scripts
 2016-07-25 22:14:27 +01:00
Nathan LeClaire
0aae9b68d6 Continue POSIX-ifying build scripts 
Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>
 2016-07-25 11:14:57 -07:00
Justin Cormack
0759efd8b1 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
0bb80957bc 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
a36af2022c Merge pull request #349 from justincormack/novmwarevsock 
Remove some VMWare devices
 2016-07-25 15:56:35 +01:00