github/linuxkit
1
0
Fork 0
mirror of https://github.com/linuxkit/linuxkit.git synced 2026-04-25 10:24:46 +00:00
Code Issues Projects Releases Wiki Activity
1,069 Commits 1 Branch 32 Tags
2a026c6cd702cbc0e305f4b3a57add63e34c786f
Commit Graph

810 Commits

Author SHA1 Message Date
Nathan LeClaire
2a026c6cd7 Add modifications to help with downstream build 
Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>
 2016-08-17 18:23:01 -07:00
Justin Cormack
7fb834f850 Update docker to 1.12.1-rc2 
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
 2016-08-17 11:28:21 +01:00
Sebastiaan van Stijn
075da30ad7 remove "alpha" from motd 
commit 3eae35d77b removed
"alpha" from "issue", but missed removing it here.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2016-08-13 20:20:03 +02:00
Justin Cormack
b42dd0570b Update to Docker 1.12.1-rc1 
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
 2016-08-12 21:42:48 +01:00
Justin Cormack
f4442e388b Add default sysfs settings 
This uses the new Alpine sysfs.conf service to allow config of sysfs.

Default file that sets transparent huge pages to only be used on request
to fix #368

Database setting available for user configuration.

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
 2016-08-12 14:13:40 +01:00
Justin Cormack
000a78076f clean up images built by compose to avoid cacheing 
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
 2016-08-12 13:43:52 +01:00
Justin Cormack
eca2215a96 Not alpha any more, missed this 
Signed-off-by: Justin Cormack <justin@specialbusservice.com>
 2016-08-12 09:40:16 +01:00
David Sheets
296d1e10c7 kernel: apply debug configuration to all kernels 
Signed-off-by: David Sheets <dsheets@docker.com>
 2016-08-10 17:08:07 +01:00
David Sheets
661c19649a kernel: add a Makefile DEBUG variable and a kernel_config for debugging 
Signed-off-by: David Sheets <dsheets@docker.com>
 2016-08-10 17:07:48 +01:00
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
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
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
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
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
1c8faeb1a1 Merge pull request #390 from justincormack/filemax 
Increase fs.file-max
 2016-08-08 12:13:42 +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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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