Justin Cormack
a66043b100
Merge pull request #287 from justincormack/upstream-securetty
...
Use upstream /etc/securetty
2016-07-15 11:59:13 +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
b7df210754
Merge pull request #286 from justincormack/waitsock
...
wait for system containerd to start
2016-07-15 11:41:53 +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
5edb4c5fb4
Merge pull request #285 from justincormack/waitsock
...
Wait for docker to finish starting up before terminateing init script
2016-07-15 11:30:38 +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
Justin Cormack
5c32d68d13
Merge pull request #279 from ncopa/kernel-build
...
improve kernel build makefile
2016-07-13 17:29:24 +01: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
2590c9de9b
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
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
a14f34701e
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
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
Justin Cormack
84e90a538b
Merge pull request #275 from justincormack/quotes
...
modernise...
2016-07-12 16:16:42 +01:00
Justin Cormack
d4131e9bc0
modernise...
...
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2016-07-12 16:02:49 +01:00
Justin Cormack
cb027e6e3b
Merge pull request #274 from justincormack/posix
...
posixly correct
2016-07-12 15:45:23 +01:00
Justin Cormack
deb29a7f56
posixly correct
...
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2016-07-12 15:44:43 +01:00
Justin Cormack
df613f1f3f
Merge pull request #271 from rneugeba/init-fix
...
Fix transfused and docker init scripts
2016-07-12 15:09:37 +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
7529e51e61
Merge pull request #270 from justincormack/fixscript
...
clean up moby script, add undo option
2016-07-12 13:35:24 +01:00
Justin Cormack
df4eeaff80
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
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
Justin Cormack
45309f136d
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
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
Justin Cormack
bf1a0e0011
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
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
Justin Cormack
99ed8b733e
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
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
Justin Cormack
10d81ecdff
Merge pull request #262 from dsheets/linux-module-unload
...
linux: allow kernel module unloading
2016-07-11 19:53:21 +01: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
50ec41a232
Merge pull request #260 from justincormack/userns
...
Fix user namespace support
2016-07-11 14:58:55 +01: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