github/linuxkit
1
0
Fork 0
mirror of https://github.com/linuxkit/linuxkit.git synced 2026-05-11 07:39:44 +00:00
Code Issues Projects Releases Wiki Activity
947 Commits 1 Branch 32 Tags
0989e2caf4427bd2fc1e8540d2ae1a1e762d6ccf
Commit Graph

722 Commits

Author SHA1 Message Date
David Sheets
cae79c7ce3 kernel: make sure to gitignore vmlinux 
Signed-off-by: David Sheets <dsheets@docker.com>
 2016-07-20 15:40:54 +01:00
David Sheets
cdac4fde34 kernel: add vmlinux target to make kernel debugging easier 
With this patch, it is easy to get an unstripped kernel object to use with
gdb.

Signed-off-by: David Sheets <dsheets@docker.com>
 2016-07-20 15:37:04 +01:00
Justin Cormack
b4bba1fd65 Merge pull request #310 from justincormack/posixlyequal 
Posixly correct = not ==
 2016-07-20 14:20:52 +01:00
Justin Cormack
3c8c48f459 Posixly correct = not == 
See #161 #170 should be covered...

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
 2016-07-20 12:33:01 +01:00
Rolf Neugebauer
13d92bd082 Merge pull request #308 from justincormack/transfusedvmbus 
Only run transfused on mac platform
 2016-07-20 12:21:18 +01:00
Justin Cormack
db7bc9cb8c Only run transfused on mac platform 
See #301

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
 2016-07-20 12:11:39 +01:00
Justin Cormack
3601348fef use platform not vmbus consistently 
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
 2016-07-20 12:07:40 +01:00
Justin Cormack
878c3ab3af Remove rawtcp from diagnostics server 
See https://github.com/docker/moby/pull/303

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
 2016-07-20 11:46:54 +01:00
Nathan LeClaire
0de5faabc7 Re-write diagnostic server to support cloud/HTTP 
Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>
 2016-07-19 17:40:15 -07:00
Justin Cormack
85ee976d0d Merge pull request #284 from nathanleclaire/azure 
Add support for Azure (VHD) build to Moby
 2016-07-19 22:44:01 +01:00
Justin Cormack
3cd4f80032 Remove dnsfix 
This was there to workaround an issue with vmnet, not applicable now.
A user reported that they were getting unexpected 8.8.8.8 addresses
and it could possible be applied erroneously under some circumstances.

Signed-off-by: Justin Cormack <justin@specialbusservice.com>
 2016-07-19 10:04:09 +01:00
Nathan LeClaire
329476944a Add Azure provider support 
Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>
 2016-07-18 16:22:21 -07:00
Nathan LeClaire
aaa6cc05e7 Add AWS build support 
Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>
 2016-07-18 11:08:44 -07:00
Justin Cormack
3d3b67d0c3 Add conditional services based on mobyplatform 
Replaces https://github.com/docker/moby/pull/282

Use mobyplatform=xxx to specify platform in boot command

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
 2016-07-18 12:39:14 +01:00
Justin Cormack
7e495fb7a8 fix arm build 
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
 2016-07-15 17:02:14 +01:00
Justin Cormack
0f86d03edd Merge pull request #293 from justincormack/inittabfix 
do not remove inittab in clean
 2016-07-15 16:52:30 +01:00
Justin Cormack
43b9834123 do not remove inittab in clean 
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
 2016-07-15 16:51:57 +01:00
Justin Cormack
2cdf39c72f clean up trailing slashes 
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
 2016-07-15 16:23:33 +01:00
Justin Cormack
ceafadb6a4 capture containerd logs 
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
 2016-07-15 15:11:06 +01:00
Justin Cormack
b3b38aacc1 Use upstream /etc/securetty 
Now we modify the file if we use a different console, can use
upstream unmodified.

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
 2016-07-15 11:58:01 +01:00
Justin Cormack
94778bc174 Merge pull request #273 from ncopa/init-console 
add console options from boot cmdline to inittab
 2016-07-15 11:42:00 +01:00
Justin Cormack
5b0d4acfdc wait for system containerd to start 
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
 2016-07-15 11:38:05 +01:00
Justin Cormack
5b7ff1f6ef Wait for docker to finish starting up before terminateing init script 
This means dependent services can rely on docker being up.

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
 2016-07-15 11:29:32 +01:00
Justin Cormack
cd18b353a3 Merge pull request #281 from justincormack/containerd 
Add a system containerd
 2016-07-14 12:32:07 +01:00
Justin Cormack
0ec195786a Add a system containerd 
This adds an independent system containerd for running internal
containers.

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
 2016-07-14 12:28:44 +01:00
Natanael Copa
8e03b120c3 merge inittab.x86_64 and inittab.armhf 
with the login tty generated from boot cmdline the inittab will be equal
on all archs and platforms so we can merge and move to etc/

Signed-off-by: Natanael Copa <natanael.copa@docker.com>
 2016-07-13 18:48:26 +02:00
Natanael Copa
67c8361d54 fix initrd.img dependencies 
trigger rebuild if init or inittab was changed

Signed-off-by: Natanael Copa <natanael.copa@docker.com>
 2016-07-13 18:28:46 +02:00
Natanael Copa
dc47de083e remove getty from inittab 
Depend on specifying the console as a boot option

Signed-off-by: Natanael Copa <natanael.copa@docker.com>
 2016-07-13 18:28:28 +02:00
Natanael Copa
235ab00582 add console options from boot cmdline to inittab 
This will make sure that you get a login console that corresponds to the
boot option.

Signed-off-by: Natanael Copa <natanael.copa@docker.com>
 2016-07-13 18:27:09 +02: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
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
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
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
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
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
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
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
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