Commit Graph

7412 Commits

Author SHA1 Message Date
O.S. Tezer 370b935b49 Merge pull request #5177 from jbbarth/docs-add-common-errors-for-test-suite
Docs: add some example log lines that indicate a lack of memory when running the test suite
2014-04-12 21:03:24 +03:00
O.S. Tezer 1f7e97e951 Merge pull request #5178 from jbbarth/docs-improve-ubuntulinux-accounting-section
Docs: improve installation/ubuntulinux memory and swap accounting section
2014-04-12 20:32:26 +03:00
Jean-Baptiste Barth 0a0e49d406 Docs: improve installation/ubuntulinux memory and swap accounting section
Docker-DCO-1.1-Signed-off-by: Jean-Baptiste Barth <jeanbaptiste.barth@gmail.com> (github: jbbarth)
2014-04-12 10:57:19 +00:00
Jean-Baptiste Barth 26845ef1ae Docs: add some example log lines that indicate a lack of memory when running the test suite
Docker-DCO-1.1-Signed-off-by: Jean-Baptiste Barth <jeanbaptiste.barth@gmail.com> (github: jbbarth)
2014-04-12 02:09:06 +00:00
James Turnbull 931f065560 Merge pull request #5164 from jsimonelis/patch-2
terms update: FQIN must include a tag
2014-04-11 06:47:28 -07:00
Justin Simonelis 69fbf8e31f terms update: FQIN must include a tag
change: A fully qualified image name must include a tag.

Recommitting changes for PR: https://github.com/dotcloud/docker/pull/5145
since SvenDowideit suggested I would need to sign my commit for it to be accepted.

Docker-DCO-1.1-Signed-off-by: Justin Simonelis <justin.p.simonelis@gmail.com> (github: jsimonelis)
2014-04-11 08:51:50 -04:00
Tianon Gravi 28e7e81479 Merge pull request #5072 from tianon/hack-set-e-consistently
Update bundlescripts to use "set -e" consistently
2014-04-10 13:37:36 -06:00
Tianon Gravi feae37c171 Merge pull request #5071 from tianon/minor-man-formatting-consistency
Fix a few minor man formatting consistency issues
2014-04-10 13:13:37 -06:00
Victor Vieux f66082a443 Merge pull request #5093 from danielnorberg/do-not-create-bridge
net: do not create -b/--bridge specified bridge
2014-04-10 11:17:02 -07:00
Victor Vieux bcc3857fa0 Merge pull request #4990 from vbatts/vbatts-server_show_info
docker daemon: show info about the server
2014-04-10 11:14:09 -07:00
Victor Vieux b8c10d8af2 Merge pull request #5143 from kzys/ns-nil
Avoid "invalid memory address or nil pointer dereference" panic
2014-04-10 11:07:35 -07:00
O.S. Tezer a521388863 Merge pull request #4821 from jimenez/3903-add_event_end_timestamp-feature
Adding timestamp end to events endpoint. Modifying api docs.
2014-04-10 20:54:53 +03:00
Victor Vieux 897bf5439d Merge pull request #5140 from unclejack/build_immediate_cleanup
delete containers during build after every step
2014-04-10 10:49:13 -07:00
Isabel Jimenez 66dd4ea4e2 Adding timestamp end to events endpoint. Modifying api docs.
Docker-DCO-1.1-Signed-off-by: Isabel Jimenez <contact@isabeljimenez.com> (github: jimenez)
2014-04-10 10:43:21 -07:00
Daniel Norberg d4746d3ea0 bridge driver: clean up error returns
Docker-DCO-1.1-Signed-off-by: Daniel Norberg <daniel.norberg@gmail.com> (github: danielnorberg)
2014-04-10 11:26:48 -04:00
Daniel Norberg 336199a877 net: do not create -b/--bridge specified bridge
If the bridge specified using -b/--bridge doesn't
exist, fail instead of attempting to create it.

This is consistent with the docker documentation
on -b/--bridge: "Attach containers to a pre
existing network bridge". 

It is also less surprising in an environment where
the operator expected the bridge to be properly
set up before docker starts and expects docker to
fail fast if the bridge was not up instead of
masking this error and coming up in some
potentially broken state.

With this patch, docker still creates docker0 if
needed and no bridge was explicitly specified.

Docker-DCO-1.1-Signed-off-by: Daniel Norberg <daniel.norberg@gmail.com> (github: danielnorberg)
2014-04-10 11:11:17 -04:00
Guillaume J. Charmes 7dd9c208fd Merge pull request #5069 from tianon/hack-make-ubuntu-man
Add contrib/man to our generated deb
2014-04-10 08:04:04 -07:00
Guillaume J. Charmes 4a88e111d0 Merge pull request #5087 from vbatts/vbatts-save_permissions
docker save: fix filemode permissions
2014-04-10 08:00:37 -07:00
Guillaume J. Charmes 042a50a8fe Merge pull request #5131 from crosbymichael/shm-mode
Change shm mode to 1777
2014-04-10 07:50:32 -07:00
Guillaume J. Charmes 5b242c95da Merge pull request #5115 from alexlarsson/fix-libcontainer-network-rhel6
Fix libcontainer network support on rhel6
2014-04-10 07:45:12 -07:00
Guillaume J. Charmes ec9190cdd2 Merge pull request #5133 from crosbymichael/revert-hairpin
Revert "Support hairpin NAT without going through docker server"
2014-04-10 07:06:35 -07:00
James Turnbull 49e87d1932 Merge pull request #5050 from SvenDowideit/add-some-words-to-cli
add some more text to the cli docs
2014-04-10 07:05:19 -07:00
James Turnbull 0bc479c48b Merge pull request #5109 from jonathanpa/master
Update mac.rst to add homebrew instructions.
2014-04-10 06:42:54 -07:00
Kato Kazuyoshi c5226d94fa Avoid "invalid memory address or nil pointer dereference" panic
libcontainer.GetNamespace returns nil on FreeBSD because
libcontainer.namespaceList is empty. In this case, Namespaces#Get should
return nil instead of being panic.

Docker-DCO-1.1-Signed-off-by: Kato Kazuyoshi <kato.kazuyoshi@gmail.com> (github: kzys)
2014-04-10 22:07:29 +09:00
Sven Dowideit e625cee28d add some more text to the cli docs
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@fosiki.com> (github: SvenDowideit)
2014-04-10 12:52:46 +00:00
unclejack 7931be5cba delete containers during build after every step
This commit changes the way docker build cleans up containers.
Containers get cleaned up right away after they've been committed and
they've become an image.

When the build fails, only the last container of the failing step is
left behind.

Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com> (github: unclejack)
2014-04-10 14:46:42 +03:00
Jonathan Pares 057d347eaf Update mac.rst to add homebrew instructions.
Explain how to install boot2docker and docker by using homebrew.

Docker-DCO-1.1-Signed-off-by: Jonathan Pares <jonathanpa@users.noreply.github.com> (github: jonathanpa)
2014-04-10 09:48:36 +02:00
Michael Crosby 14e1a2345d Merge pull request #5134 from tianon/fix-mtab-symlink-error
Fix spurious mtab symlink error when /etc doesn't exist yet
2014-04-09 17:54:29 -07:00
Victor Vieux 8d25eef5ef Merge pull request #5127 from crosbymichael/update-apparmor
Check for apparmor enabled on host to populate profile
2014-04-09 17:04:13 -07:00
Tianon Gravi b298960aed Update bundlescripts to use "set -e" consistently
"set -e" is already inherited here from make.sh, but explicit is always better than implicit (hence the "set -e" in the first place!)

Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com> (github: tianon)
2014-04-09 12:11:06 -06:00
Victor Vieux 7c37cae17d Merge pull request #5102 from shykes/api-cleanup-tests
Make remote API unit tests easier to read and write
2014-04-09 10:27:03 -07:00
Tianon Gravi 3d9cd1e5f1 Fix spurious mtab symlink error when /etc doesn't exist yet
symlink /proc/mounts /var/lib/docker/btrfs/subvolumes/1763d6602b8b871f0a79754f1cb0a31b3928bb95de5232b1b8c15c60fa1017f6-init/etc/mtab: no such file or directory

Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com> (github: tianon)
2014-04-09 11:13:54 -06:00
James Turnbull 407b11c26b Merge pull request #5104 from crosbymichael/update-dns-vf-docs
Update dns and volumes-from docs
2014-04-09 06:55:52 -07:00
Alexander Larsson 59c1b2880b Fix libcontainer network support on rhel6
It seems that netlink in older kernels, including RHEL6, does not
support RTM_SETLINK with IFLA_MASTER. It just silently ignores it, reporting
no error, causing netlink.NetworkSetMaster() to not do anything yet
return no error.

We fix this by introducing and using AddToBridge() in a very similar manner
to CreateBridge(), which use the old ioctls directly.

This fixes https://github.com/dotcloud/docker/issues/4668

Docker-DCO-1.1-Signed-off-by: Alexander Larsson <alexl@redhat.com> (github: alexlarsson)
2014-04-09 15:44:18 +02:00
Michael Crosby 63c303eecd Revert "Support hairpin NAT without going through docker server"
This reverts commit b39d02b611.

Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
2014-04-09 11:55:08 +00:00
Michael Crosby 986cf931c3 Change shm mode to 1777
Fixes #5126
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
2014-04-09 10:53:32 +00:00
Michael Crosby 87f0d63fb2 Check for apparmor enabled on host to populate profile
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
2014-04-09 10:22:17 +00:00
Michael Crosby a43a600a2c Update dns and volumes-from docs
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
2014-04-08 19:17:30 -07:00
Tianon Gravi 566d49c9ca Merge pull request #5022 from tianon/make-validate
Add "make validate" for both local and CI gofmt and DCO verification
2014-04-08 19:17:30 -06:00
Solomon Hykes 1e6f21dc9e Make remote API unit tests easier to read and write
Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com> (github: shykes)
2014-04-08 18:14:47 -07:00
Guillaume J. Charmes b602d6ca40 Merge pull request #5101 from unclejack/merge_release_v0.10.0
Merge release v0.10.0
2014-04-08 16:09:47 -07:00
unclejack e8aa24c71a Change version to v0.10.0
Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com> (github: unclejack)
2014-04-09 02:02:19 +03:00
unclejack e128a606e3 Merge pull request #5079 from unclejack/bump_v0.10.0
Bump version to v0.10.0
2014-04-09 01:56:01 +03:00
unclejack dc9c28f51d Bump version to v0.10.0
Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com> (github: unclejack)
2014-04-09 00:49:33 +03:00
Victor Vieux 5fbc47f253 Merge pull request #5090 from crosbymichael/remove-vf
Remove volumesfrom from the config
2014-04-08 14:46:07 -07:00
Michael Crosby b4f2821e6d Make volumes-from a slice instead of string split
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
2014-04-08 21:45:06 +00:00
Michael Crosby af9746412b Move volumesfrom to hostconfig
This also migrates the volumes from integration tests into the new cli
integration test framework.
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
2014-04-08 21:45:06 +00:00
Guillaume J. Charmes a10c17ad11 Merge pull request #5095 from crosbymichael/remove-ghost-test
Remove restart ghost test
2014-04-08 14:40:42 -07:00
Michael Crosby 9839688db3 Merge pull request #5089 from creack/replace_existing_docker_apparmor_profile
Backup current docker apparmor profile and replace it with the new one
2014-04-08 14:36:11 -07:00
Solomon Hykes b28ef0e984 Merge pull request #5096 from vieux/remove_double_warning
remove double deprecation warning
2014-04-08 14:23:11 -07:00