Commit Graph

6839 Commits

Author SHA1 Message Date
74f0d78beb Enable construction of TruncIndex from id array.
Fixes #5166

Current graph.restore is essentially O(n^2 log n) due to how
suffixarray creation works.

Rather than create/append/create new this supports creation from a seed
array of ids.

Functional testing shows this eliminates the hang on Creating image
graph reported on list.

Docker-DCO-1.1-Signed-off-by: Paul Nasrat <pnasrat@gmail.com> (github: pnasrat)
Upstream-commit: 4f169c2db512d2ea9ed5729df375896a1ee90347
Component: engine
2014-04-11 16:39:58 -04:00
575a5da6a2 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)
Upstream-commit: 69fbf8e31f0b74c61c7e7fe1bd34bbb1aaf813b6
Component: engine
2014-04-11 08:51:50 -04:00
3b78fa93c6 Merge pull request #5072 from tianon/hack-set-e-consistently
Update bundlescripts to use "set -e" consistently
Upstream-commit: 28e7e814795fce2a75e4767a6707a6e4d03fa8b6
Component: engine
2014-04-10 13:37:36 -06:00
7d2033488c Merge pull request #5071 from tianon/minor-man-formatting-consistency
Fix a few minor man formatting consistency issues
Upstream-commit: feae37c171e22f1d17cabe1559cd0262606d0e8d
Component: engine
2014-04-10 13:13:37 -06:00
403efcd6f1 Merge pull request #5093 from danielnorberg/do-not-create-bridge
net: do not create -b/--bridge specified bridge
Upstream-commit: f66082a4438f53a0cd9466e12aac324f5acaed64
Component: engine
2014-04-10 11:17:02 -07:00
a7fdc7bba3 Merge pull request #4990 from vbatts/vbatts-server_show_info
docker daemon: show info about the server
Upstream-commit: bcc3857fa0b283530469065d455027514743a1e2
Component: engine
2014-04-10 11:14:09 -07:00
4ea377c1c7 Merge pull request #5143 from kzys/ns-nil
Avoid "invalid memory address or nil pointer dereference" panic
Upstream-commit: b8c10d8af254a6200de642e246b5a0d9de0dfca8
Component: engine
2014-04-10 11:07:35 -07:00
a6fc08c279 Merge pull request #4821 from jimenez/3903-add_event_end_timestamp-feature
Adding timestamp end to events endpoint. Modifying api docs.
Upstream-commit: a521388863502014bdea80585b7272a854191244
Component: engine
2014-04-10 20:54:53 +03:00
42eaf397ba Merge pull request #5140 from unclejack/build_immediate_cleanup
delete containers during build after every step
Upstream-commit: 897bf5439d83b5255cdcc53e8a888740919b9d04
Component: engine
2014-04-10 10:49:13 -07:00
825d583586 Adding timestamp end to events endpoint. Modifying api docs.
Docker-DCO-1.1-Signed-off-by: Isabel Jimenez <contact@isabeljimenez.com> (github: jimenez)
Upstream-commit: 66dd4ea4e280e4acc133872401bf8a79c80510f3
Component: engine
2014-04-10 10:43:21 -07:00
8a00f43f92 bridge driver: clean up error returns
Docker-DCO-1.1-Signed-off-by: Daniel Norberg <daniel.norberg@gmail.com> (github: danielnorberg)
Upstream-commit: d4746d3ea0b8d4888b21b808237199ae22525b07
Component: engine
2014-04-10 11:26:48 -04:00
6bee2b968e 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)
Upstream-commit: 336199a877014143bac462e98cae7f59525a0556
Component: engine
2014-04-10 11:11:17 -04:00
98f471928f Merge pull request #5069 from tianon/hack-make-ubuntu-man
Add contrib/man to our generated deb
Upstream-commit: 7dd9c208fdb4ea3083783437843ea27c7c8a077b
Component: engine
2014-04-10 08:04:04 -07:00
0c1b844ea4 Merge pull request #5087 from vbatts/vbatts-save_permissions
docker save: fix filemode permissions
Upstream-commit: 4a88e111d094ed40894e304b15e03f90ff920350
Component: engine
2014-04-10 08:00:37 -07:00
39bbc0e47b Merge pull request #5131 from crosbymichael/shm-mode
Change shm mode to 1777
Upstream-commit: 042a50a8fe1e54ce602d1c517091381c209eabf3
Component: engine
2014-04-10 07:50:32 -07:00
b4f2aeb444 Merge pull request #5115 from alexlarsson/fix-libcontainer-network-rhel6
Fix libcontainer network support on rhel6
Upstream-commit: 5b242c95da303ee26d3119678340050670fed45a
Component: engine
2014-04-10 07:45:12 -07:00
9ad3dcddb0 Merge pull request #5133 from crosbymichael/revert-hairpin
Revert "Support hairpin NAT without going through docker server"
Upstream-commit: ec9190cdd253a011881f646c8d6140cb1f0fcf9d
Component: engine
2014-04-10 07:06:35 -07:00
b874685c9d Merge pull request #5050 from SvenDowideit/add-some-words-to-cli
add some more text to the cli docs
Upstream-commit: 49e87d1932e9ac44ecfc2a5cd4257e3b3d9972e0
Component: engine
2014-04-10 07:05:19 -07:00
5f4face051 Merge pull request #5109 from jonathanpa/master
Update mac.rst to add homebrew instructions.
Upstream-commit: 0bc479c48b61ffef9978a7b771ebd8e6cbd7334f
Component: engine
2014-04-10 06:42:54 -07:00
9a57be369c 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)
Upstream-commit: c5226d94fab4e261fe2407262d9b5177326d4062
Component: engine
2014-04-10 22:07:29 +09:00
ed316755af add some more text to the cli docs
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@fosiki.com> (github: SvenDowideit)
Upstream-commit: e625cee28dc62d7fbc5172e0e9c01708e2bd7fc4
Component: engine
2014-04-10 12:52:46 +00:00
116769b466 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)
Upstream-commit: 7931be5cba784b36a145af7ed0153ade6474dabd
Component: engine
2014-04-10 14:46:42 +03:00
c176d6dfb2 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)
Upstream-commit: 057d347eafaea9a0044b70e516ace504904a5ba4
Component: engine
2014-04-10 09:48:36 +02:00
bc56d5d95c Merge pull request #5134 from tianon/fix-mtab-symlink-error
Fix spurious mtab symlink error when /etc doesn't exist yet
Upstream-commit: 14e1a2345d606290ba9405a1b813e3f4bb9c2df1
Component: engine
2014-04-09 17:54:29 -07:00
dce753ef81 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)
Upstream-commit: b298960aed8155e7dbedb6602cdbb42eacee83f7
Component: engine
2014-04-09 12:11:06 -06:00
3ae166e5de Merge pull request #5102 from shykes/api-cleanup-tests
Make remote API unit tests easier to read and write
Upstream-commit: 7c37cae17d675aa72a2146e881aaa7e30f8d291e
Component: engine
2014-04-09 10:27:03 -07:00
ea28e6ce0e 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)
Upstream-commit: 3d9cd1e5f102d5e59011ec4baca2662f3dacbad4
Component: engine
2014-04-09 11:13:54 -06:00
ec4e3dca1c Merge pull request #5104 from crosbymichael/update-dns-vf-docs
Update dns and volumes-from docs
Upstream-commit: 407b11c26b194123693c777986071a17a4faf02b
Component: engine
2014-04-09 06:55:52 -07:00
7b99942ebd 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)
Upstream-commit: 59c1b2880be8fb9d9a632fa42a10097c1580591a
Component: engine
2014-04-09 15:44:18 +02:00
6caf919b33 Revert "Support hairpin NAT without going through docker server"
This reverts commit b39d02b611f1cc0af283f417b73bf0d36f26277a.

Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
Upstream-commit: 63c303eecdbaf4dc7967fd51b82cd447c778cecc
Component: engine
2014-04-09 11:55:08 +00:00
855754fa1c Change shm mode to 1777
Fixes #5126
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
Upstream-commit: 986cf931c38b8cdc51da44af0313502ca1156cfc
Component: engine
2014-04-09 10:53:32 +00:00
7d69f5cd99 Check for apparmor enabled on host to populate profile
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
Upstream-commit: 87f0d63fb2ede63d263d8e8285b83a7f7d12bbf3
Component: engine
2014-04-09 10:22:17 +00:00
8b91dd2d6d Update dns and volumes-from docs
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
Upstream-commit: a43a600a2cb516813a045e3b90e8a9ae81d8a783
Component: engine
2014-04-08 19:17:30 -07:00
71e18cf0d0 Merge pull request #5022 from tianon/make-validate
Add "make validate" for both local and CI gofmt and DCO verification
Upstream-commit: 566d49c9cafd5e64024e67d2ff1ebbcad6332cbf
Component: engine
2014-04-08 19:17:30 -06:00
39daf771d4 Make remote API unit tests easier to read and write
Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com> (github: shykes)
Upstream-commit: 1e6f21dc9e7b172b28d364741abb92540938c51a
Component: engine
2014-04-08 18:14:47 -07:00
233e6b1346 Change version to v0.10.0
Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com> (github: unclejack)
Upstream-commit: e8aa24c71a53b27d68e2468aaa3be056596b88ed
Component: engine
2014-04-09 02:02:19 +03:00
cd024a8368 Bump version to v0.10.0
Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com> (github: unclejack)
Upstream-commit: dc9c28f51d669d6b09e81c2381f800f1a33bb659
Component: engine
2014-04-09 00:49:33 +03:00
7de0d1325f Make volumes-from a slice instead of string split
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
Upstream-commit: b4f2821e6d4ba6f6073365a244681df21f5d4472
Component: engine
2014-04-08 21:45:06 +00:00
ecfa4893ce 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)
Upstream-commit: af9746412b6070063f105ae97eba1f8fbd56bd22
Component: engine
2014-04-08 21:45:06 +00:00
77371c5426 Merge pull request #5095 from crosbymichael/remove-ghost-test
Remove restart ghost test
Upstream-commit: a10c17ad11dbe7da389d9bb2185e26ed56cd2204
Component: engine
2014-04-08 14:40:42 -07:00
6ef9e84239 Merge pull request #5089 from creack/replace_existing_docker_apparmor_profile
Backup current docker apparmor profile and replace it with the new one
Upstream-commit: 9839688db3f3470f71ea14f3f418cbb2300e6732
Component: engine
2014-04-08 14:36:11 -07:00
fbd324c9f0 remove double deprecation warning
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com> (github: vieux)
Upstream-commit: 9260c06f7a7cb172205dc45af96870ec0d02ebcd
Component: engine
2014-04-08 20:58:19 +00:00
e940d2f8fa Remove restart ghost test
We do not allow ghosts anymore and this test does not add any value
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
Upstream-commit: 77a04357a1b66b9e5b2bae2efc0192b927f926fe
Component: engine
2014-04-08 20:56:30 +00:00
352a05bd56 Merge pull request #5066 from crosbymichael/remove-dns-conf
Move DNS options to hostconfig
Upstream-commit: 795d6b8b150db03c62403ab5fbefa5ca7488c2bf
Component: engine
2014-04-08 13:44:26 -07:00
0ee492d819 Merge pull request #5088 from shykes/deprecate-commit-run
Early deprecation warning for 'docker commit --run'
Upstream-commit: 00e080fef695cb6bf9cc2704d0c9a3ccc3081495
Component: engine
2014-04-08 12:32:11 -07:00
61ed858da5 Merge pull request #5091 from jamtur01/fedora_install
Add Fedora installation to install.sh
Upstream-commit: c6046b40f0dfc624bb0cad78f24ed0c1174af7f1
Component: engine
2014-04-08 13:15:00 -06:00
904747ba78 Early deprecation warning for 'docker commit --run'
Warn users of the planned deprecation of 'docker commit --run', and hide
it from the docs and usage message. The option continues to work.

Note that an alternative to 'commit --run' is being implemented but is
not yet available. We are printing the warning anyway because on
the basis that it never hurts to give more advance warning.

The 'commit --run' flag is a leftover from the very early days of Docker,
and has several problems:

1) It is very user unfriendly. You have to pass a literal json dict
which is poorly documented and changes regularly (see PortSpecs vs
ExposedPorts). The merge behavior is not clear and also changes
regularly. it's not possible to unset a value.

2) It overlaps with the Dockerfile syntax. There are 2 ways to set
a default command, expose a port or change an env variable. Some
things can be done in a Dockerfile but not in --run. Some things
can be done in --run but not in a Dockerfile. It would be better
to push a single syntax, allow using it both in a file and via
the command line, and make improvements in a single place.

3) It exposes data structures which should not be publicly exposed.
There are several planned improvements to Docker which require moving
around the content and schema of the various Config, Image and Container
structures. The less of those we expose in public interfaces, the easier
it is to move things around without a reverse compatibility nightmare.

Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com> (github: shykes)
Upstream-commit: 168f8aba74d9c2996acec6fe1b93a2301523e305
Component: engine
2014-04-08 12:10:47 -07:00
4dd63976db Removed extra whitespace
Docker-DCO-1.1-Signed-off-by: James Turnbull <james@lovedthanlost.net> (github: jamtur01)
Upstream-commit: a2aa902ec194169431fea6784c4a7cdab25aaf24
Component: engine
2014-04-08 12:07:27 -07:00
1a88bac6fb Added Fedora installation method
Docker-DCO-1.1-Signed-off-by: James Turnbull <james@lovedthanlost.net> (github: jamtur01)
Upstream-commit: fa5223dab5b9f5cef2a0a341ee5065fec9c6d663
Component: engine
2014-04-08 12:07:16 -07:00
a63cb994eb Merge pull request #5073 from tianon/update-release-bundles
Update RELEASE_BUNDLES to include integration tests
Upstream-commit: 2204a27df08ffaa4ef3ca9ec158527d4a34440a7
Component: engine
2014-04-08 13:05:00 -06:00