github/linuxkit
1
0
Fork 0
mirror of https://github.com/linuxkit/linuxkit.git synced 2026-01-16 16:31:21 +00:00
Code Issues Projects Releases Wiki Activity
917 Commits 1 Branch 31 Tags
bce39e0eb028ec3a8c2ea404e882b4bf80d2b8fd
Commit Graph

711 Commits

Author SHA1 Message Date
Justin Cormack
99c2a09403 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
abb968c538 Add AWS build support 
Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>
 2016-07-18 11:08:44 -07:00
Justin Cormack
67b2a00853 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
3d6ba289d1 fix arm build 
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
 2016-07-15 17:02:14 +01:00
Justin Cormack
85ed0cef64 Merge pull request #293 from justincormack/inittabfix 
do not remove inittab in clean
 2016-07-15 16:52:30 +01:00
Justin Cormack
07fb25c8eb 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
a6e5d9fdfa clean up trailing slashes 
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
 2016-07-15 16:23:33 +01:00
Justin Cormack
6848ddd58e capture containerd logs 
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
 2016-07-15 15:11:06 +01:00
Justin Cormack
96489524e7 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
092ec97a88 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
252077a4ba 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
498c481700 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
37cd71fa0d Merge pull request #281 from justincormack/containerd 
Add a system containerd
 2016-07-14 12:32:07 +01:00
Justin Cormack
220f3df37a 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
9bbf27cb66 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
34bd1e9322 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
39d3ac8429 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
bf4ced07d0 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
907d1f8c0c 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
9c0a1387ea 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
261544cf02 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
1977888b18 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
c09905199a 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
b499b52d48 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
782c7f737b Merge pull request #269 from rneugeba/kernel-up 
kernel: Update to 4.4.15
 2016-07-12 10:42:59 +01:00
Rolf Neugebauer
9d5797cdd3 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
17d110d770 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
55a2becfb4 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
d0876fb05e iptables: add a TODO 
Signed-off-by: David Scott <dave.scott@docker.com>
 2016-07-12 10:26:42 +01:00
David Scott
12fbe114f6 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
3c6ad76461 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
3183d9c72a 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
a294b0f9b0 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
dfb97863c9 /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
80b234dd3e 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
0c471bdc09 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
20fc67092a 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
026bfeb17e 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
bd33169d49 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
7fb90b6af5 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
0c9603708c remove syslog fix, as now upstream 
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
 2016-07-11 14:31:25 +01:00
David Sheets
8473eb56f2 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
51563eb677 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
09e60eee16 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
839b58e19c 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
94d603971c 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
c8b5ffcef0 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
f829fef36b 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
44d68b268a Initial test hooks 
Beginning of a proper test suite, using qemu. Test just runs docker
for now, will add further integration tests.

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
 2016-07-08 15:44:04 +01:00
Justin Cormack
b3cfed22f4 Merge pull request #250 from djs55/vsock-ulimit 
proxy-vsockd: bump the max number of file descriptors
 2016-07-06 14:52:01 +01:00