Commit Graph

6653 Commits

Author SHA1 Message Date
Carl X. Su 5e32c40795 Flag 'docker-js' as outdated 2014-03-05 20:16:41 +08:00
Tianon Gravi 6f2564350f Merge pull request #4455 from lsm5/systemd
Bump container limit via systemd conf file
2014-03-04 20:37:16 -07:00
Lokesh Mandvekar 291d5e642e bump open files and procs limit via unitfile
Docker-DCO-1.1-Signed-off-by: Lokesh Mandvekar <lsm5@redhat.com> (github: lsm5)

	modified:   contrib/init/systemd/docker.service
	modified:   contrib/init/systemd/socket-activation/docker.service
2014-03-04 22:29:51 -05:00
Victor Vieux e7055830ab Merge pull request #4460 from crosbymichael/add-shm-size
Add shm size cap to mount
2014-03-04 14:20:20 -08:00
Michael Crosby b07708c8de Add shm size cap to mount
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
2014-03-04 14:18:40 -08:00
Michael Crosby 19b898ad56 Merge pull request #4457 from creack/remove_loopback_mount
Remove loopback mount
2014-03-04 17:11:37 -05:00
Guillaume J. Charmes 57a47f5bbf
Remove /dev tmpfs mountpoint
Docker-DCO-1.1-Signed-off-by: Guillaume J. Charmes <guillaume.charmes@docker.com> (github: creack)
2014-03-04 13:21:22 -08:00
Guillaume J. Charmes c74a8b28cd
remove /run mountpoint
Docker-DCO-1.1-Signed-off-by: Guillaume J. Charmes <guillaume.charmes@docker.com> (github: creack)
2014-03-04 12:32:17 -08:00
Guillaume J. Charmes 39d58129c3
Remove loopback mount bind
Docker-DCO-1.1-Signed-off-by: Guillaume J. Charmes <guillaume.charmes@docker.com> (github: creack)
2014-03-04 12:30:52 -08:00
unclejack a0c465a333 Merge pull request #4456 from crosbymichael/change-veth-name
Change veth prefix back to veth
2014-03-04 21:51:44 +02:00
Michael Crosby 0cdf102638 Change veth prefix back to veth
Fixes #4453
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
2014-03-04 11:46:05 -08:00
Michael Crosby b63709c1f1 Merge pull request #4452 from crosbymichael/small-fixes-to-libcontainer
Add find tests and remove panic in DEBUG
2014-03-04 14:37:41 -05:00
unclejack ba8d8f0abb Merge pull request #4448 from alexlarsson/pivot_root
libcontainer: Use pivot_root instead of chroot
2014-03-04 19:59:16 +02:00
unclejack 17577a6dce Merge pull request #4418 from SvenDowideit/mention-expose-in-port-mapping-deprecation
make the port mapping deprecation error message more obvious
2014-03-04 19:44:06 +02:00
Michael Crosby 7e52445f2f Add find tests and remove panic in DEBUG
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
2014-03-04 08:55:12 -08:00
James Turnbull 20ddd34d05 Merge pull request #4438 from crosbymichael/update-docs
Update daemon docs for exec drivers
2014-03-04 07:56:30 -05:00
Alexander Larsson 5b5c884cc8 libcontainer: Use pivot_root instead of chroot
Instead of keeping all the old mounts in the container namespace and
just using subtree as root we pivot_root so that the actual root in
the namespace is the root we want, and then we unmount the previous
mounts.

This has multiple advantages:

* The namespace mount tree is smaller (in the kernel)
* If you break out of the chroot you could previously access the host
  filesystem. Now the host filesystem is fully invisible to the namespace.
* We get rid of all unrelated mounts from the parent namespace, which means
  we don't hog these. This is important if we later switch to MS_PRIVATE instead
  of MS_SLAVE as otherwise these mounts would be impossible to unmount from the
  parent namespace.

Docker-DCO-1.1-Signed-off-by: Alexander Larsson <alexl@redhat.com> (github: alexlarsson)
2014-03-04 12:44:08 +01:00
Andy Rothfusz fbc00df7a0 Merge pull request #4415 from iantruslove/patch-1
Fix minor typo
2014-03-03 17:58:03 -08:00
Michael Crosby 0f96a749ab Update daemon docs for exec drivers
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
2014-03-03 17:43:08 -08:00
Guillaume J. Charmes 0eeb146398 Merge pull request #4270 from DevTable/fixregistryauth
Fix registry auth and remove other hidden ping commands from client code
2014-03-03 17:34:21 -08:00
unclejack d761ebea6f Merge pull request #4382 from unclejack/fix_symlink_handling
handle symlinks for Docker's root dir & TMPDIR
2014-03-04 03:23:11 +02:00
Sven Dowideit 2275c83358 make the port mapping deprecation error message more obvious see 4075
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au> (github: SvenDowideit)
2014-03-04 10:45:26 +10:00
Tianon Gravi 52d212aa6e Merge pull request #4437 from SvenDowideit/tweak-DCO-hook-for-windows
Replace `echo -e` with the portable `{ echo; echo ...; }`
2014-03-03 17:43:37 -07:00
Sven Dowideit 4f29836f71 nope, echo -e isn't portable
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au> (github: SvenDowideit)
2014-03-04 10:40:36 +10:00
Guillaume J. Charmes 69c69059fc Merge pull request #4327 from crosbymichael/add-libcontainer
Add native execution driver to docker and make it the default
2014-03-03 16:34:20 -08:00
Michael Crosby 77766834a3 Merge pull request #12 from SvenDowideit/add-libcontainer-minor-doc-tweak
very minor spelling
2014-03-03 19:19:16 -05:00
Tianon Gravi 93c1a7b796 Merge pull request #4419 from SvenDowideit/tweak-DCO-hook-for-windows
Fix newlines echoing in DCO git hook contrib script
2014-03-03 17:14:08 -07:00
Sven Dowideit 2e71adac9f very minor spelling
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au> (github: SvenDowideit)
2014-03-04 10:12:12 +10:00
Sven Dowideit 43feb84203 it seems on MSWindows MSYS bash, echo n puts a literal \n (not a newline) into the commit message, so lets get more primitive
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au> (github: SvenDowideit)
2014-03-04 10:08:40 +10:00
Tianon Gravi b1267cb6ad Merge pull request #4435 from vieux/warning_makefile
Remove warnings from Makefile
2014-03-03 16:40:31 -07:00
Victor Vieux b9cb95c0a0 remove warnings from makefile
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com> (github: vieux)
2014-03-03 23:32:25 +00:00
Sven Dowideit fca4cf6f0a Merge pull request #4413 from jamtur01/exemption
Added documentation (and some cleanup) around small patch exemptions
2014-03-04 09:10:37 +10:00
Michael Crosby 5639b29b78 Merge pull request #4432 from vieux/fix_warning_as_error
fix warning can't docker run
2014-03-03 17:16:25 -05:00
Victor Vieux e23b4e5d15 fix warning can't docker run
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com> (github: vieux)
2014-03-03 22:07:42 +00:00
unclejack 611acf7a7c handle symlinks for Docker's root dir & TMPDIR
This removes the incomplete symlink handling from engine.go and it adds
it one place in docker.go.

It also enables handling symlinks for TMPDIR.

Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com> (github: unclejack)
2014-03-03 23:00:53 +02:00
unclejack aac9542a68 Merge pull request #4412 from crosbymichael/fix-env-clobber
Don't always just append env vars, replace defaults with ones from confi...
2014-03-03 22:52:03 +02:00
Victor Vieux 37d0ce42c6 Merge pull request #4385 from khia/json_format
Support json output in --format flag of docker inspect
2014-03-03 12:36:47 -08:00
Michael Crosby 5465fdf00f Factor out finalize namespace
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
2014-03-03 12:15:47 -08:00
Guillaume J. Charmes e070db75fe Merge pull request #4428 from vieux/add_warning_flags
add warning for deprecatd flags
2014-03-03 12:09:09 -08:00
Victor Vieux bb5ed45224 add warning for deprecatd flags
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com> (github: vieux)
2014-03-03 19:57:05 +00:00
Michael Crosby 2f35f8e2a8 Update readme to remove .nspid
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
2014-03-03 11:31:37 -08:00
unclejack 93f925c533 Merge pull request #4426 from vieux/prevent_grouping_--
prevent flag grouping with --
2014-03-03 21:30:49 +02:00
Victor Vieux cb3d27d01b prevent flag grouping with --
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com> (github: vieux)
2014-03-03 19:17:28 +00:00
Victor Vieux 23ec7e637c Merge pull request #4377 from vieux/fix_4358
fix fedora tty with apparmor
2014-03-03 11:10:09 -08:00
unclejack 7531f82c70 Merge pull request #4321 from vieux/docker_run_-it
Add support for docker run -it or docker images -qa
2014-03-03 20:52:10 +02:00
Victor Vieux 954a913c1f Merge pull request #2 from SvenDowideit/docker_run_-it_docs
add a little bit mentioning commandline option combinations

Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com> (github: vieux)
2014-03-03 18:48:47 +00:00
Victor Vieux 690fb50beb Merge pull request #4398 from philips/fix-socket-activation
fix(api): serve until the "acceptconnections" job
2014-03-03 10:19:51 -08:00
Michael Crosby 62d604a81e Merge pull request #4200 from alexlarsson/fix-fedora-tests
Fix fedora tests
2014-03-03 10:54:31 -05:00
Tianon Gravi ded2fb883d Merge pull request #4420 from unclejack/bump_to_go_1.2.1
Bump Go to 1.2.1 in the Dockerfile
2014-03-03 07:56:31 -07:00
Alexander Larsson 9e28c3e3f8 aufs: Skip tests if aufs not supported
This makes it possible to pass the rest of the testsuite without aufs in the kernel.

Docker-DCO-1.1-Signed-off-by: Alexander Larsson <alexl@redhat.com> (github: alexlarsson)
2014-03-03 15:11:49 +01:00