Commit Graph

6668 Commits

Author SHA1 Message Date
Andy Rothfusz
bb0211ff30 Merge pull request #4449 from jamtur01/readme
Some fixes and 0.9.0 pre-req changes to the README.md
2014-03-05 12:28:32 -08:00
James Turnbull
046e6604e5 Some updates to the README.md
* Updated pre-reqs for 0.9.
* Fixed a couple of docker to Docker.
* Fixed the Docker build example to be correct.
* Reformatted a bunch of paragraphs

Docker-DCO-1.1-Signed-off-by: James Turnbull <james@lovedthanlost.net> (github: jamtur01)
2014-03-05 15:27:49 -05:00
unclejack
c05e095baa Merge pull request #4476 from vieux/improve_flags
Improve flags
2014-03-05 21:59:05 +02:00
Victor Vieux
069dc7f8c7 fix panic with only long flags or only one deprecatd
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com> (github: vieux)
2014-03-05 19:45:57 +00:00
Victor Vieux
089bf5e11e fix usage for completly deprecated flag
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com> (github: vieux)
2014-03-05 19:27:39 +00:00
Victor Vieux
7ec82aa727 Merge pull request #4471 from unclejack/fix_integration_test_deprecation_warnings
fix flag deprecation warnings in integration tests
2014-03-05 11:00:56 -08:00
Victor Vieux
9101686161 Merge pull request #4462 from jamtur01/langfix
Updated a variety of language and error messages
2014-03-05 10:22:51 -08:00
Victor Vieux
2a8c927f33 Merge pull request #4461 from jamtur01/capital
Consistently capitalize CLI options
2014-03-05 10:21:20 -08:00
Michael Crosby
858d0356fd Merge pull request #4278 from alexlarsson/system
Create pkg/system and move stuff there from archive
2014-03-05 12:32:35 -05:00
Michael Crosby
ad68ab19e0 Merge pull request #4465 from alexlarsson/private
libcontainer: Use MS_PRIVATE instead of MS_SLAVE
2014-03-05 12:16:18 -05:00
unclejack
35054601d8 fix flag deprecation warnings in integration tests
This removes three warnings in the integration tests:
Warning: '-viz' is deprecated, it will be removed soon. See usage.
Warning: '-tree' is deprecated, it will be removed soon. See usage.
Warning: '-cidfile' is deprecated, it will be removed soon. See usage.

Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com> (github: unclejack)
2014-03-05 16:43:03 +02:00
Alexander Larsson
d6114c0da0 Create pkg/system and move stuff there from archive
This is a package for generic system calls etc that for some reason
is not yet supported by "syscall", or where it is different enough
for the different ports to need portability wrappers.

Docker-DCO-1.1-Signed-off-by: Alexander Larsson <alexl@redhat.com> (github: alexlarsson)
2014-03-05 14:05:32 +01:00
Alexander Larsson
757b577572 libcontainer: Use MS_PRIVATE instead of MS_SLAVE
Now that we unmount all the mounts from the global namespace we can
use a private namespace rather than a slave one (as we have no need
for unmounts of inherited global mounts to propagate into the
container).

Docker-DCO-1.1-Signed-off-by: Alexander Larsson <alexl@redhat.com> (github: alexlarsson)
2014-03-05 09:40:54 +01: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
James Turnbull
9cbf22dee2 Updated a variety of language and error messages
In api/client.go updated:

1. Made api == API
2. Restated Docker daemon connection error to be clearer.
3. Changed use of "Impossible" in error messages.
4. Removed extra space in restart error message.
5. Fixed capitalization in three error messages.

Docker-DCO-1.1-Signed-off-by: James Turnbull <james@lovedthanlost.net> (github: jamtur01)
2014-03-04 20:52:48 -05:00
James Turnbull
725c7cd08a Made CLI option capitalization consistent in api/client.go
Docker-DCO-1.1-Signed-off-by: James Turnbull <james@lovedthanlost.net> (github: jamtur01)
2014-03-04 20:45:22 -05:00
James Turnbull
41bf38e44d Consistently capitalize CLI options
Docker-DCO-1.1-Signed-off-by: James Turnbull <james@lovedthanlost.net> (github: jamtur01)
2014-03-04 20:22: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