github/linuxkit
1
0
Fork 0
mirror of https://github.com/linuxkit/linuxkit.git synced 2025-07-29 13:38:00 +00:00
Code Issues Projects Releases Wiki Activity
1,052 Commits 1 Branch 27 Tags 240 MiB
3dd0aa67d9
Commit Graph

1052 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Justin Cormack
3dd0aa67d9 Stop using container for gzip 
Issue fixed in upstream alpine, gzip -9 now works correctly.

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
 2016-08-10 15:07:11 +01:00
Justin Cormack
9c79549d59 Merge pull request #405 from justincormack/kernelup 
Update kernel and aufs
 2016-08-10 15:05:43 +01:00
Justin Cormack
55e15928ff Update kernel and aufs 
- Linux 4.4.17
- AUFS 20160808

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
 2016-08-10 15:03:36 +01:00
Justin Cormack
213a4da03e Merge pull request #403 from justincormack/butts 
Create a systemd cgroups mountpoint
 2016-08-10 14:35:41 +01:00
Justin Cormack
5ab0f81954 Merge pull request #402 from rneugeba/htools-tweak 
hvtools: remove broken size check for mount points
 2016-08-10 14:35:19 +01:00
Justin Cormack
496c7caeed Create a systemd cgroups mountpoint 
This allows systemd based containers to "just work".

Fixes https://github.com/docker/pinata/issues/3126

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
 2016-08-10 14:27:17 +01:00
Rolf Neugebauer
b5779784ca hvtools: remove broken size check for mount points 
Signed-off-by: Rolf Neugebauer <rolf.neugebauer@docker.com>
 2016-08-10 10:43:07 +01:00
Justin Cormack
fee67f0c85 Merge pull request #400 from justincormack/testerr 
hide any messages from tee about short writes when pipe aborted
 2016-08-09 22:42:19 +01:00
Rolf Neugebauer
45c24d20b0 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
a844c4b0e5 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
dde7f73985 hide any messages from tee about short writes when pipe aborted 
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
 2016-08-09 17:40:32 +01:00
Justin Cormack
82c391f47f Merge pull request #397 from nathanleclaire/kickup_dhcp_timeouts 
Increase DHCP timeout and retries
 2016-08-09 16:18:25 +01:00
Justin Cormack
194b383885 Merge pull request #398 from justincormack/shared-run 
Mount /run as shared
 2016-08-09 11:50:53 +01:00
Justin Cormack
398ade787e 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
de80738b07 Increase DHCP timeout and retries 
Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>
 2016-08-08 17:41:46 -07:00
Justin Cormack
f1f73ad14e 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
1c8faeb1a1 Merge pull request #390 from justincormack/filemax 
Increase fs.file-max
 2016-08-08 12:13:42 +02:00
Justin Cormack
48d9367139 Merge pull request #394 from justincormack/jq 
Add jq to base
 2016-08-04 12:13:11 +02:00
Justin Cormack
9f41d17f89 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
3c090b7fa4 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
17bf65f0de Merge pull request #382 from justincormack/gzip 
Use a container for doing gzip compression
 2016-07-29 17:07:10 +01:00
Justin Cormack
05df812959 Merge pull request #383 from justincormack/kernelup 
Update kernel to 4.4.16
 2016-07-29 16:43:41 +01:00
Justin Cormack
2e11737f16 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
da7448e6ef 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
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