github/linuxkit
1
0
Fork 0
mirror of https://github.com/linuxkit/linuxkit.git synced 2025-07-30 22:21:34 +00:00
Code Issues Projects Releases Wiki Activity
894 Commits 1 Branch 27 Tags 240 MiB
e67c6dd0d7
Commit Graph

894 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Justin Cormack
e67c6dd0d7 Merge pull request #279 from ncopa/kernel-build 
improve kernel build makefile
 2016-07-13 17:29:24 +01:00
Natanael Copa
47545dce55 improve kernel build makefile 
- create an empty dummy file to indicate that docker image is built
- reuse same make rule to extract the different files from docker image
- make sure that we remove empty files on failure

This makes build more robust and improves parallelism.

Signed-off-by: Natanael Copa <natanael.copa@docker.com>
 2016-07-13 18:03:16 +02:00
Justin Cormack
92dcb04653 Merge pull request #277 from justincormack/ulimit_nofile 
set nofile ulimit to maximum possible value
 2016-07-13 14:05:43 +01:00
Justin Cormack
9dad6b6467 set nofile ulimit to maximum possible value 
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
 2016-07-13 14:04:49 +01:00
Justin Cormack
ebd3e2ae26 Merge pull request #276 from justincormack/docker-1.12.0-rc4 
update to 1.12.0-rc4 upstream version
 2016-07-13 09:54:41 +01:00
Justin Cormack
72861a6c88 update to 1.12.0-rc4 upstream version 
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
 2016-07-13 09:50:25 +01:00
Justin Cormack
33eb13af7f Merge pull request #275 from justincormack/quotes 
modernise...
 2016-07-12 16:16:42 +01:00
Justin Cormack
09e966b3a2 modernise... 
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
 2016-07-12 16:02:49 +01:00
Justin Cormack
ed38dad3c8 Merge pull request #274 from justincormack/posix 
posixly correct
 2016-07-12 15:45:23 +01:00
Justin Cormack
c008b08ddf posixly correct 
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
 2016-07-12 15:44:43 +01:00
Justin Cormack
bbbbc2a121 Merge pull request #271 from rneugeba/init-fix 
Fix transfused and docker init scripts
 2016-07-12 15:09:37 +01:00
Rolf Neugebauer
0aee0c0ed5 diagnostics: Don't check for transfused on Windows 
Signed-off-by: Rolf Neugebauer <rolf.neugebauer@docker.com>
 2016-07-12 14:28:11 +01:00
Rolf Neugebauer
f8c53db413 init: don't start docker on 0.0.0.0:2375 on DfM/DfW 
Signed-off-by: Rolf Neugebauer <rolf.neugebauer@docker.com>
 2016-07-12 14:08:55 +01:00
Rolf Neugebauer
6c95bff567 init: don't start transfused on Windows 
Signed-off-by: Rolf Neugebauer <rolf.neugebauer@docker.com>
 2016-07-12 14:04:08 +01:00
Justin Cormack
17406ab88b Merge pull request #270 from justincormack/fixscript 
clean up moby script, add undo option
 2016-07-12 13:35:24 +01:00
Justin Cormack
da374fb13a clean up moby script, add undo option 
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
 2016-07-12 13:34:49 +01:00
Justin Cormack
a022934760 Merge pull request #269 from rneugeba/kernel-up 
kernel: Update to 4.4.15
 2016-07-12 10:42:59 +01:00
Rolf Neugebauer
2171a2e471 kernel: Update to 4.4.15 
patches from: https://github.com/rneugeba/linux-stable/tree/v4.4.15-moby

Signed-off-by: Rolf Neugebauer <rolf.neugebauer@docker.com>
 2016-07-12 10:36:57 +01:00
Justin Cormack
78b6fe84d6 Merge pull request #268 from djs55/iptables-for-master 
Add the piñata-ga iptables wrapper
 2016-07-12 10:28:16 +01:00
David Scott
4f205ed9b2 iptables: log to /var/log/... rather than /var/run/log 
Signed-off-by: David Scott <dave.scott@docker.com>
 2016-07-12 10:26:42 +01:00
David Scott
f6a85c0592 iptables: only open host ports if native/port-forwarding=true in the db 
Signed-off-by: David Scott <dave.scott@docker.com>
 2016-07-12 10:26:42 +01:00
David Scott
9762094fbb iptables: add a TODO 
Signed-off-by: David Scott <dave.scott@docker.com>
 2016-07-12 10:26:42 +01:00
David Scott
b6fb908ae5 iptables: remove the pid file after sending SIGTERM 
Signed-off-by: David Scott <dave.scott@docker.com>
 2016-07-12 10:26:42 +01:00
David Scott
9e441356b5 proxy: add a -no-local-ip option 
docker itself seems to bind to the port globally inside Moby, so we
get an EADDRINUSE if we try to do it too.

Signed-off-by: David Scott <dave.scott@docker.com>
 2016-07-12 10:26:42 +01:00
David Scott
5726f2b2c3 iptables: get the kill arguments the right way round 
Signed-off-by: David Scott <dave.scott@docker.com>
 2016-07-12 10:26:42 +01:00
David Scott
a97d9b92bc iptables: close all the fds we inherit from docker 
Signed-off-by: David Scott <dave.scott@docker.com>
 2016-07-12 10:26:42 +01:00
David Scott
dba37b747c /etc/init.d/docker: prepend /usr/local/sbin to the $PATH 
This is where the iptables wrapper lives.

Signed-off-by: David Scott <dave.scott@docker.com>
 2016-07-12 10:26:42 +01:00
David Scott
b672ec9bdd Add primitive iptables wrapper which can set up port forwards 
Signed-off-by: David Scott <dave.scott@docker.com>
 2016-07-12 10:26:42 +01:00
Ian Campbell
70514d09b3 Simple build system for ocaml-based iptables 
Signed-off-by: Ian Campbell <ian.campbell@docker.com>
 2016-07-12 10:26:39 +01:00
Justin Cormack
c3fd109bc9 Merge pull request #265 from dsheets/transfused-mknod-reg 
transfused: add mknod reg file event actuation message
 2016-07-12 10:18:29 +01:00
David Sheets
ef98586c22 transfused: add mknod reg file event actuation message 
Signed-off-by: David Sheets <dsheets@docker.com>
 2016-07-11 16:26:00 -07:00
Justin Cormack
906bbe75b1 Merge pull request #264 from dsheets/sysctl-inotify-watches 
sysctl: set a large fs.inotify.max_user_watches limit
 2016-07-11 22:38:47 +01:00
David Sheets
d376e85e47 sysctl: set a large fs.inotify.max_user_watches limit 
Needed by Ruby guard and Dropbox. See https://forums.docker.com/t/running-guard-with-docker-compose-fails-due-to-inotify-limit/17096

Signed-off-by: David Sheets <dsheets@docker.com>
 2016-07-11 14:37:52 -07:00
Justin Cormack
c55d6a0269 Merge pull request #262 from dsheets/linux-module-unload 
linux: allow kernel module unloading
 2016-07-11 19:53:21 +01:00
David Sheets
dcfe76be64 linux: allow kernel module unloading 
The ability to unload kernel modules helps with rapid development of kernel
modules or Moby-integrated functionality. It has no negative side effects
as far as I am aware.

Signed-off-by: David Sheets <dsheets@docker.com>
 2016-07-11 11:48:46 -07:00
Justin Cormack
4afe7ec9ae Merge pull request #260 from justincormack/userns 
Fix user namespace support
 2016-07-11 14:58:55 +01:00
Justin Cormack
5d86bfcfe0 Fix user namespace support 
fix #153

For now, just create the default remap user, rather than trying
to fix the command emulation. The existing code in docker is not
ideal, as it is GNU specific, try to find a better option for
1.13.

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
 2016-07-11 14:47:23 +01:00
Justin Cormack
049f3ff9a6 remove syslog fix, as now upstream 
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
 2016-07-11 14:31:25 +01:00
Justin Cormack
b7eec4c824 Merge pull request #258 from dsheets/remove-slash-Mac 
Remove /Mac in docker init and transfused init
 2016-07-11 12:29:06 +01:00
David Sheets
11f965ce7b Remove /Mac in docker init and transfused init 
Replace /Mac with /host_docker_app and replace driverDir with just driver.

Signed-off-by: David Sheets <dsheets@docker.com>
 2016-07-08 14:36:26 -07:00
Justin Cormack
f6b9c74450 Merge pull request #257 from justincormack/sysctl 
Add a custom sysctl file
 2016-07-08 18:18:29 +01:00
Justin Cormack
e771c02218 Add a custom sysctl file 
This increases resource limits that have been generally requested.

See #232

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
 2016-07-08 18:16:05 +01:00
Justin Cormack
baaf857c9d Merge pull request #256 from justincormack/tests 
Add some more docker tests, including running image
 2016-07-08 16:57:34 +01:00
Justin Cormack
f349515701 Add some more docker tests, including running image 
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
 2016-07-08 16:54:18 +01:00
Justin Cormack
e6f4364f07 Merge pull request #251 from dsheets/transfused-export-suitability 
transfused: distinguish export requests from mount requests
 2016-07-08 16:30:04 +01:00
Justin Cormack
ab365e38a0 Merge pull request #255 from justincormack/e1000 
add e1000 drivers, allows qemu default setup to find an ethernet, and…
 2016-07-08 16:28:24 +01:00
Justin Cormack
6f2755c32d Merge pull request #254 from rneugeba/patches-up 
linux: properly update kernel patches to v4.4.14
 2016-07-08 16:28:16 +01:00
Justin Cormack
7d605926f0 add e1000 drivers, allows qemu default setup to find an ethernet, and used frequently in emulated environments 
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
 2016-07-08 16:26:16 +01:00
Rolf Neugebauer
6125e66e5c linux: properly update kernel patches to v4.4.14 
When we updated from 4.4.10 to 4.4.14 we copied the patches over.
This changeset properly updates the patches so that they apply cleanly.
0039-VSOCK-do-not-disconnect-socket-when-peer-has-shutdow.patch was
removed as it made it into 4.4.14 already.

Compile tested only

For reference the patches were generated from:
https://github.com/rneugeba/linux-stable/tree/v4.4.14-moby

Signed-off-by: Rolf Neugebauer <rolf.neugebauer@docker.com>
 2016-07-08 16:10:51 +01:00
Justin Cormack
da60050917 Merge pull request #253 from justincormack/test 
Initial test hooks
 2016-07-08 15:47:15 +01:00