Commit Graph
7837 Commits
Author SHA1 Message Date
Michael Crosby f2bd1e6d7d Refactor container start to make it more manageable
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
Upstream-commit: c99ba05c844d4099b85c653edc0c0f5122ccb522
Component: engine
2014-04-14 06:46:34 +00:00
Michael Crosby 55d539294f Move network settings into separate file
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
Upstream-commit: f00ca72baa6c43de35d622caa728587a752d6e5e
Component: engine
2014-04-14 06:15:31 +00:00
Michael Crosby d953b1e434 Generate imports based on what is avaliable
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
Upstream-commit: 3061a6a2ab0395c626f9acaa2e5d9c17152b0475
Component: engine
2014-04-14 05:22:45 +00:00
Paul Nasrat 936bcbbb79 Add benchmark tests for TruncIndex.
Compare add vs new.

Some historical data in PR #5172.

Docker-DCO-1.1-Signed-off-by: Paul Nasrat <pnasrat@gmail.com> (github: pnasrat)
Upstream-commit: 84a76f27962d4f4b3871abe925ca17024bdeea73
Component: engine
2014-04-13 22:36:15 -04:00
Michael Crosby fbaa43b382 Ignore not exist errors for joining default subsystems
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
Upstream-commit: 184728e7bcf9af3224f53e8d5d38d44b08de24ec
Component: engine
2014-04-14 00:07:48 +00:00
Michael Crosby 4b3fd1c81f Ignore is not exist error
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
Upstream-commit: 6c26a87901d12188dfd9986d9211f6077a286f9d
Component: engine
2014-04-14 00:03:35 +00:00
Michael Crosby ebb2ad0565 Move apparmor to top level pkg
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
Upstream-commit: 052cc5a6378ee4bbe1ef79e5632e2439d68ddbde
Component: engine
2014-04-13 23:33:25 +00:00
Michael Crosby b85f5791ad Use apparmor_parser directly
The current load script does alot of things.  If it does not find the
parser loaded on the system it will just exit 0 and not load the
profile.  We think it should fail loudly if it cannot load the profile
and apparmor is enabled on the system.
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
Upstream-commit: 5f4bc4f916f433a4ba258980a6c2fbdbd76d64f3
Component: engine
2014-04-13 23:31:10 +00:00
Tianon Gravi 20850020f5 Merge pull request #5176 from unclejack/check_before_pulling
cli integ: don't fetch busybox if it exists
Upstream-commit: 2d20c92d29775f9c4c2fff3c4809d507138e1523
Component: engine
2014-04-13 09:28:30 -06:00
unclejack 103b32014b cli integ: don't fetch busybox if it exists
Don't make calls to the registry if the image exists already.

Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com> (github: unclejack)
Upstream-commit: 449f92f11ed34d4475fa24e2561b02cc263722bf
Component: engine
2014-04-13 15:06:15 +03:00
O.S. Tezer 031e906716 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
Upstream-commit: 370b935b4987c79eec769b0cc3788726a3f8abc9
Component: engine
2014-04-12 21:03:24 +03:00
O.S. Tezer 4df48cc2f4 Merge pull request #5178 from jbbarth/docs-improve-ubuntulinux-accounting-section
Docs: improve installation/ubuntulinux memory and swap accounting section
Upstream-commit: 1f7e97e951b32cc804f627257f3955263d4dfbbd
Component: engine
2014-04-12 20:32:26 +03:00
Jean-Baptiste Barth 2cd55701e9 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)
Upstream-commit: 0a0e49d406d10ce7c79952c78162768dd05ee875
Component: engine
2014-04-12 10:57:19 +00:00
Jean-Baptiste Barth 8d072a85fc 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)
Upstream-commit: 26845ef1ae97be3904b2fd85fa06f9a97ccee67c
Component: engine
2014-04-12 02:09:06 +00:00
Kato Kazuyoshi d4a5ca9f47 Fix utils.FollowSymlinkInScope's infinite loop bug
fs_test.go doesn't finish if Docker's code is placed under a directory
which has symlinks between / and the directory.
For example, the below doesn't finish before the change.

  /home -> usr/home
  FollowSymlinkInScope("/home/bob/foo/bar", "/home/bob/foo")

Docker-DCO-1.1-Signed-off-by: Kato Kazuyoshi <kato.kazuyoshi@gmail.com> (github: kzys)
Upstream-commit: 0f724863468733847306f47835739f480a7fac63
Component: engine
2014-04-12 07:37:18 +09:00
Kato Kazuyoshi 82b2213679 Add the test to reproduce the issue even in "make test"
Docker-DCO-1.1-Signed-off-by: Kato Kazuyoshi <kato.kazuyoshi@gmail.com> (github: kzys)
Upstream-commit: e3e078ca2fc4ce76461a40533add9f33afcd1abe
Component: engine
2014-04-12 07:37:17 +09:00
Paul Nasrat 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
Alexander Larsson 5b7c5b263f Join memory and cpu cgroup in systemd too
Docker-DCO-1.1-Signed-off-by: Alexander Larsson <alexl@redhat.com> (github: alexlarsson)
Docker-DCO-1.1-Signed-off-by: Alexander Larsson <alexl@redhat.com> (github: crosbymichael)
Upstream-commit: 4ddfffcab3edf3d05ee8319e87410fe747979a04
Component: engine
2014-04-11 17:29:40 +00:00
Michael Crosby 9ba641b0ce Join cpuacct, freezer, perf_event, and blkio groups
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
Upstream-commit: 505184d2dcb5d21834bcb2b108564fbdab733953
Component: engine
2014-04-11 17:28:27 +00:00
Michael Crosby b455526c28 Setup cgroups for all subsystems
Fixes #5117
Fixes #5118
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
Upstream-commit: 031fcb31d3a81fbd5c5ab8d898d53fbd486413e6
Component: engine
2014-04-11 17:28:27 +00:00
James Turnbull 6e58c978fc Merge pull request #5164 from jsimonelis/patch-2
terms update: FQIN must include a tag
Upstream-commit: 931f0655606b14ef6fab1952d442691d1007f6ef
Component: engine
2014-04-11 06:47:28 -07:00
Justin Simonelis 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
Victor Vieux f3aecbde7d refactor build job to know only configFile
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com> (github: vieux)
Upstream-commit: b9731bccf2b2cc8c06ef8bdb41f72ca4791e63db
Component: engine
2014-04-10 22:29:03 +00:00
Tianon Gravi 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
Tianon Gravi 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
Victor Vieux 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
Victor Vieux 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
Victor Vieux 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
O.S. Tezer 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
Victor Vieux 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
Isabel Jimenez 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
Daniel Norberg 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
Daniel Norberg 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
Guillaume J. Charmes 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
Guillaume J. Charmes 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
Guillaume J. Charmes 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
Guillaume J. Charmes 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
Guillaume J. Charmes 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
James Turnbull 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
James Turnbull 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
Kato Kazuyoshi 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
Sven Dowideit 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
unclejack 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
Jonathan Pares 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
Michael Crosby 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
Victor Vieux 76697ab9bf Merge pull request #5127 from crosbymichael/update-apparmor
Check for apparmor enabled on host to populate profile
Upstream-commit: 8d25eef5efe3f0aa383d44b1ff91f2b966e746a5
Component: engine
2014-04-09 17:04:13 -07:00
Kato Kazuyoshi 5b3ff631ca Support FreeBSD on pkg/system/utimes_*.go
Implement system.LUtimesNano and system.UtimesNano. The latter might be
removed in future because it's basically same as os.Chtimes. That's why
the test is mainly focusing LUtimesNano.

Docker-DCO-1.1-Signed-off-by: Kato Kazuyoshi <kato.kazuyoshi@gmail.com> (github: kzys)
Upstream-commit: 1c90a4dd9a83526ca3837ab9231ff6a9af07e072
Component: engine
2014-04-10 07:34:37 +09:00
Kato Kazuyoshi d9e097fbe6 Unlike GNU find, FreeBSD's find needs a path before an expression
Docker-DCO-1.1-Signed-off-by: Kato Kazuyoshi <kato.kazuyoshi@gmail.com> (github: kzys)
Upstream-commit: 66baf56601f4fc1e8f5f2863d227283954b73a77
Component: engine
2014-04-10 07:13:41 +09:00
Kato Kazuyoshi 380ead943d Use LLVM Clang explicitly on FreeBSD
Docker-DCO-1.1-Signed-off-by: Kato Kazuyoshi <kato.kazuyoshi@gmail.com> (github: kzys)
Upstream-commit: 18bea2495d0bcc354a2538cb161081cb56e5c6f7
Component: engine
2014-04-10 07:13:41 +09:00
Tianon Gravi 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