Commit Graph

8239 Commits

Author SHA1 Message Date
44fdfa90b2 Merge pull request #5396 from lalyos/5370-infinite-loop-caused-by-symlink
5370 infinite loop caused by symlink
Upstream-commit: 23062e55fd0eb75f28ff74e3de46bc3e15b0280f
Component: engine
2014-05-16 11:28:37 -07:00
c2681da5e2 Merge pull request #5841 from unclejack/run_pull_latest
run: pull only latest when no tag specified
Upstream-commit: 808d28033b981188a3856098e9e3d6b96a9b9a53
Component: engine
2014-05-16 11:21:29 -07:00
1bc76e2712 Merge pull request #5842 from alexlarsson/dm-cleanup-tests
devicemapper: Remove non-general tests
Upstream-commit: dbd6f10b3d1aa4b2e85e3a2536a5fd4b754c1deb
Component: engine
2014-05-16 11:08:04 -07:00
4549210429 Merge pull request #5837 from proppy/patch-2
server/buildfile: correct daemon.Create comments
Upstream-commit: 2b3b03b596a773fed0527a4617deb834ecd000e8
Component: engine
2014-05-16 10:51:09 -07:00
c6f81b2d5f server/buildfile: correct daemon.Create comments
s/and start it//

Docker-DCO-1.1-Signed-off-by: Johan Euphrosine <proppy@google.com> (github: proppy)
Upstream-commit: 8b31824ad6118ed505b43443816c1492e3d81c8c
Component: engine
2014-05-16 10:50:02 -07:00
990bb5ea3a Merge pull request #5838 from timthelion/patch-1
Typo in execdrivers.go five => give
Upstream-commit: 021ac36a70048074e752988a7a8789c02c701b17
Component: engine
2014-05-16 10:49:44 -07:00
f1c91438e8 Merge pull request #5840 from unclejack/upstart_mounted
Update contrib/init/upstart to "start on local-filesystems"
Upstream-commit: 6dd4fa0b74fac2abf5ebf03c1cc89d5d7d03da1b
Component: engine
2014-05-16 10:16:34 -06:00
cdfe67b94e contrib/init/upstart: start on local-filesystems
This changes the upstart init script to start on `local-filesystems`.

Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com> (github: unclejack)
Upstream-commit: ba0c8292917560b45f840f187c2a8f452550705d
Component: engine
2014-05-16 19:12:59 +03:00
3e603cbd49 run: pull only latest when no tag specified
This makes Docker pull only the image tagged as latest when no tag has
been specified. This makes Docker pull only the image it'll run.

Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com> (github: unclejack)
Upstream-commit: b8e338144e90a6bb76110ab04cc216966640a3f4
Component: engine
2014-05-16 15:23:47 +03:00
e3a28edbe2 devmapper: Remove sys.go mocking framework
This is no longer needed, as the tests are gone.

Docker-DCO-1.1-Signed-off-by: Alexander Larsson <alexl@redhat.com> (github: alexlarsson)
Upstream-commit: 39d244a593aad63be58d8b2e452715e25135f255
Component: engine
2014-05-16 14:12:56 +02:00
2ef3480938 Typo in execdrivers.go five => give
Docker-DCO-1.1-Signed-off-by: Timothy Hobbs <timothyhobbs@seznam.cz> (github: timthelion)
Upstream-commit: 408f050d648da0b64d353146a1be59827d76bf70
Component: engine
2014-05-16 11:45:20 +00:00
de83ad1721 Merge pull request #5828 from SvenDowideit/pr_out_update_the_cli_md_docs_with_the_output_of_the_docker_command
Update the cli.md docs with the output of the docker command
Upstream-commit: c4fc591fbe5cdc7a3b02fe1cfa293d57ce020565
Component: engine
2014-05-16 12:10:55 +01:00
130a91328f devicemapper: Remove non-general tests
Now that we have the generic graphtest tests that actually tests
the driver we can remove the old mock-using tests. Almost all of
these tests were disabled anyway, and the four remaining ones
didn't really test much while at the same time being really
fragile and making the rest of the code more complex due to
the mocking setup.

Docker-DCO-1.1-Signed-off-by: Alexander Larsson <alexl@redhat.com> (github: alexlarsson)
Upstream-commit: bd6fd25dfb4cf7aae0e5e382e3bf10c9b2caa5fb
Component: engine
2014-05-16 12:46:28 +02:00
e41b5598f3 Merge pull request #5497 from alexlarsson/generic-driver-tests
graphdriver: Add generic test framework for graph drivers
Upstream-commit: 08a7bcf5dbb093900ddfd1f300a8bbd97bced507
Component: engine
2014-05-15 17:21:09 -07:00
e6ed9607f5 Merge pull request #5454 from kzys/utime-omit
UTIME_OMIT is only available on Linux
Upstream-commit: 4353ee78e8614779012b2f24d79a46fa352739b8
Component: engine
2014-05-15 17:18:37 -07:00
091a0d0e78 Merge pull request #5461 from SvenDowideit/getmaintainers.sh
Upstream-commit: 87fc7130a4860e1eb46469329b37bb1ce9c9c744
Component: engine
2014-05-15 17:15:40 -07:00
b123613728 Merge pull request #5802 from shykes/pr_out_add_licensing_information_to_readme
Add Licensing information to README
Upstream-commit: 6297f333bdfe460dd2724d80c7c454ac694a8ed3
Component: engine
2014-05-16 10:08:46 +10:00
3f6b5f9920 Merge pull request #5732 from SvenDowideit/pr_out_the_last_remaining_raw_github_com_url_s
the last remaining raw.github.com URL's
Upstream-commit: 8da44c9b2a3f4ad56df28bd47699b552bdc68a5d
Component: engine
2014-05-16 10:01:14 +10:00
98235fb032 Update the cli.md docs with the output of the docker command
Docker-DCO-1.1-Signed-off-by: SvenDowideit <SvenDowideit@home.org.au> (github: SvenDowideit)
Upstream-commit: d35330bb7aa8473b92f6f45718aa6c38863cccc7
Component: engine
2014-05-16 10:00:20 +10:00
a00e014556 Merge pull request #5823 from proppy/archive-bufio
archive: use bufio for compression detection
Upstream-commit: 924aa984cf9ded2b49ccc9079ce69c96b3d64041
Component: engine
2014-05-15 16:08:21 -07:00
dba2ddd068 Fixes 5370 infinite/maxLoopCount loop for relative symlinks
use path.IsAbs() instead of checking if first char is '/'

Docker-DCO-1.1-Signed-off-by: Lajos Papp <lajos.papp@sequenceiq.com> (github: lalyos)
Upstream-commit: ad35d522dbfac124225e27f58bf07c61a34d78b5
Component: engine
2014-05-16 01:03:11 +02:00
1092af80f9 Defend against infinite loop when following symlinks
ideally it should never reach it, but there was already multiple issues with infinite loop
at following symlinks. this fixes hanging unit tests

Docker-DCO-1.1-Signed-off-by: Lajos Papp <lajos.papp@sequenceiq.com> (github: lalyos)
Upstream-commit: b51c366bfc963687b8cc14df614a2fc10bad6306
Component: engine
2014-05-16 00:47:20 +02:00
28ce705ffc Adding test case for symlink causes infinit loop, reproduces: dotcloud#5370
normally symlinks are created as either
ln -s /path/existing /path/new-name
or
cd /path && ln -s ./existing new-name

but one can create it this way
cd /path && ln -s existing new-name

this drives FollowSymlinkInScope into infinite loop

Docker-DCO-1.1-Signed-off-by: Lajos Papp <lajos.papp@sequenceiq.com> (github: lalyos)
Upstream-commit: 8b77a5b7aedb1168707f486ed540edf3e5de8819
Component: engine
2014-05-16 00:47:20 +02:00
b6abf23396 Merge pull request #5820 from joelhandwell/patch-1
changed deprecated option styles to supported ones
Upstream-commit: e5a5808f51e5e6fbd11aec2242ee7bd5991c201f
Component: engine
2014-05-16 00:40:16 +02:00
2a3784982d Merge pull request #5826 from tianon/add-cross-to-test
Add "cross" to the "test" Makefile target
Upstream-commit: 041dbcb7beba008392b2b36405638a7490b37d58
Component: engine
2014-05-15 15:35:18 -07:00
3bd2cdddb8 Add "cross" to the "test" Makefile target
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com> (github: tianon)
Upstream-commit: 8ec01f9dc1d18c532f60f1bfb6c0ab5eea378b3c
Component: engine
2014-05-15 16:21:17 -06:00
e8ae384f46 archive: use bufio for compression detection
Docker-DCO-1.1-Signed-off-by: Johan Euphrosine <proppy@google.com> (github: proppy)
Upstream-commit: 77c2b76e44f77eee2ca89ff551ac64f8c6b8bd23
Component: engine
2014-05-15 11:41:07 -07:00
4cab943cdb changed deprecated option styles to supported ones
-name and -rm to --name and --rm
Upstream-commit: 10a320818e875547c83fecea32cd73231248acf8
Component: engine
2014-05-15 10:50:59 -04:00
3c12725112 Merge pull request #5816 from unclejack/docs_run_cache
docs: explain when RUN cache gets invalidated
Upstream-commit: 5dfe7c43d47276fd0b63993058fbcc424370329a
Component: engine
2014-05-15 19:54:15 +10:00
f038890332 docs: explain when RUN cache gets invalidated
This adds a few lines to the RUN Dockerfile docs to explain how to
bypass the RUN caching and how ADD can also invalidate the cache for
these instructions.

Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com> (github: unclejack)
Upstream-commit: 239d1ef301eb8d9b2b1e8469489b25ff3708f47f
Component: engine
2014-05-15 12:32:01 +03:00
3f28a1f79c Merge pull request #5762 from SvenDowideit/pr_out_add_some_more_specific_help_for_dockerfile_build_contexts
Add some more specific help for Dockerfile build contexts.
Upstream-commit: 8887e0063014228dbf3ff85083019adca4537ec0
Component: engine
2014-05-15 11:03:22 +10:00
24c85b9176 Merge pull request #5706 from vieux/remove_add_string
Upstream-commit: 8d213e91b3ef0ed77d43ec20d378be01dfe7ed5c
Component: engine
2014-05-14 17:31:52 -07:00
e368cbc7ba Merge pull request #5800 from jamtur01/paras
Updated a bunch of formatting in the docs/sources/use files
Upstream-commit: db4d534b5b3697b5c72dd0e11f9ad343015815e4
Component: engine
2014-05-15 01:58:14 +02:00
d3d3386204 Add some more specific help for Dockerfile build contexts.
I've copy and pasted the error message so its googlable.

Docker-DCO-1.1-Signed-off-by: SvenDowideit <SvenDowideit@home.org.au> (github: SvenDowideit)
Upstream-commit: ed703fc8be652eee65319a774ffbe95a07a03242
Component: engine
2014-05-15 09:41:05 +10:00
696f897a6d Merge pull request #5801 from jamtur01/fixups
Minor fixups to the Docs README
Upstream-commit: d9e3d88082b86f5baa703587023ff7a960ebfda7
Component: engine
2014-05-15 09:38:52 +10:00
82867e529b Updated a bunch of formatting in the docs/sources/use files
Docker-DCO-1.1-Signed-off-by: James Turnbull <james@lovedthanlost.net> (github: jamtur01)
Upstream-commit: 2269472f3ad09de59ba15185b9558b91f1ecb0b5
Component: engine
2014-05-15 01:26:36 +02:00
146c81311e Merge pull request #5809 from crosbymichael/move-cgroups
Move cgroups package into libcontainer
Upstream-commit: 6ff6aad9b8686b607f388bc1c27ed60cc0ef7cea
Component: engine
2014-05-14 16:06:32 -07:00
1aafe01162 Remove the cgroups maintainer file
We don't need this because it is covered by the libcontainer MAINTAINERS
file
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
Upstream-commit: b22d10e3c541c46cebe7da44fd2f521c4bc653f4
Component: engine
2014-05-14 16:01:45 -07:00
e3935841e4 Merge pull request #5772 from unclejack/improve_commit_performance
process directories in parallel in ChangesDirs
Upstream-commit: b0578d0ac75e432ed5cbcc3e9572f364eb13662c
Component: engine
2014-05-14 15:49:11 -07:00
910f9d50e2 Move cgroups package into libcontainer
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
Upstream-commit: 3b7a19def609c8fbadc6559e7f47f8a5a7769a5b
Component: engine
2014-05-14 15:21:44 -07:00
c707e115bd Merge pull request #5657 from tianon/sysvinit-should-start
Add "Should-Start" cgroupfs-mount and cgroup-lite to sysvinit-debian init script
Upstream-commit: 8904dfe08217c82a3985d85448dafe8917cb0c41
Component: engine
2014-05-14 16:05:32 -06:00
65c03fb72f Merge pull request #5807 from crosbymichael/dev-symlinks
Setup standard /dev symlinks
Upstream-commit: 76f09c2ecf06d81b885124bcb3d605096f75f562
Component: engine
2014-05-14 14:17:33 -07:00
9e5b34ae82 Merge pull request #5806 from icecrime/5766-events_endless_newlines
Issue #5766 - Check channel closed state in /events loop
Upstream-commit: 49deffe6fe53b8a83a75a78cb80f5ec8d205c8eb
Component: engine
2014-05-14 14:09:26 -07:00
77c903866a Merge pull request #5805 from joelhandwell/patch-2
changed deprecated -name option to --name
Upstream-commit: 343c24a5faa6b92897349eca212f04260a48886c
Component: engine
2014-05-14 22:09:17 +01:00
9fb5971b01 Merge pull request #5804 from joelhandwell/patch-1
changed deprecated -rm option to --rm
Upstream-commit: 79be9f8d7f316f222f0482e233b6e0d2691e214f
Component: engine
2014-05-14 22:08:01 +01:00
4f88a0b2f2 process directories in parallel in ChangesDirs
This commit lowers the total time spent in ChangesDirs to half during a
commit.

Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com> (github: unclejack)
Upstream-commit: 359f8aca29bf0e7fca757fa73e1d5565ed2d16f7
Component: engine
2014-05-15 00:03:33 +03:00
66a02eb50b Setup standard /dev symlinks
After copying allowed device nodes, set up "/dev/fd", "/dev/stdin",
"/dev/stdout", and "/dev/stderr" symlinks.

Docker-DCO-1.1-Signed-off-by: Bernerd Schaefer <bj.schaefer@gmail.com> (github: bernerdschaefer)
[rebased by @crosbymichael]
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
Upstream-commit: 2bc34036b9106318f8564ee36b696ad070b02573
Component: engine
2014-05-14 13:59:13 -07:00
785f4eb416 Check channel closed state in /events loop
When listener channel is closed, it becomes always available for
reading: select becomes an active loop which writes default-constructed
events (i.e: empty strings).

Fixes #5766.

Docker-DCO-1.1-Signed-off-by: Arnaud Porterie <arnaud.porterie@gmail.com> (github: icecrime)
Upstream-commit: 8699f53e6a033a7b5b55a2b6356da7c6e220d01f
Component: engine
2014-05-14 22:35:04 +02:00
1394048dd1 Merge pull request #5783 from LK4D4/fix_duplicate_ip_allocation_#5729
Fix duplicate ip allocation
Upstream-commit: 17a1f470ae3e6f1d7a7c4545983e37bfcfe981ab
Component: engine
2014-05-14 13:32:27 -07:00
68f263f160 changed deprecated -name option to --name
changed deprecated -name option to --name
Upstream-commit: 2d622df835f8c80b213a68bbceef21fb003a9a6a
Component: engine
2014-05-14 16:24:08 -04:00