23062e55fd
Merge pull request #5396 from lalyos/5370-infinite-loop-caused-by-symlink
...
5370 infinite loop caused by symlink
2014-05-16 11:28:37 -07:00
808d28033b
Merge pull request #5841 from unclejack/run_pull_latest
...
run: pull only latest when no tag specified
2014-05-16 11:21:29 -07:00
dbd6f10b3d
Merge pull request #5842 from alexlarsson/dm-cleanup-tests
...
devicemapper: Remove non-general tests
2014-05-16 11:08:04 -07:00
2b3b03b596
Merge pull request #5837 from proppy/patch-2
...
server/buildfile: correct daemon.Create comments
2014-05-16 10:51:09 -07:00
8b31824ad6
server/buildfile: correct daemon.Create comments
...
s/and start it//
Docker-DCO-1.1-Signed-off-by: Johan Euphrosine <proppy@google.com> (github: proppy)
2014-05-16 10:50:02 -07:00
021ac36a70
Merge pull request #5838 from timthelion/patch-1
...
Typo in execdrivers.go five => give
2014-05-16 10:49:44 -07:00
6dd4fa0b74
Merge pull request #5840 from unclejack/upstart_mounted
...
Update contrib/init/upstart to "start on local-filesystems"
2014-05-16 10:16:34 -06:00
ba0c829291
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)
2014-05-16 19:12:59 +03:00
b8e338144e
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)
2014-05-16 15:23:47 +03:00
39d244a593
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)
2014-05-16 14:12:56 +02:00
408f050d64
Typo in execdrivers.go five => give
...
Docker-DCO-1.1-Signed-off-by: Timothy Hobbs <timothyhobbs@seznam.cz> (github: timthelion)
2014-05-16 11:45:20 +00:00
c4fc591fbe
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
2014-05-16 12:10:55 +01:00
bd6fd25dfb
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)
2014-05-16 12:46:28 +02:00
08a7bcf5db
Merge pull request #5497 from alexlarsson/generic-driver-tests
...
graphdriver: Add generic test framework for graph drivers
2014-05-15 17:21:09 -07:00
4353ee78e8
Merge pull request #5454 from kzys/utime-omit
...
UTIME_OMIT is only available on Linux
2014-05-15 17:18:37 -07:00
87fc7130a4
Merge pull request #5461 from SvenDowideit/getmaintainers.sh
2014-05-15 17:15:40 -07:00
6297f333bd
Merge pull request #5802 from shykes/pr_out_add_licensing_information_to_readme
...
Add Licensing information to README
2014-05-16 10:08:46 +10:00
8da44c9b2a
Merge pull request #5732 from SvenDowideit/pr_out_the_last_remaining_raw_github_com_url_s
...
the last remaining raw.github.com URL's
2014-05-16 10:01:14 +10:00
d35330bb7a
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)
2014-05-16 10:00:20 +10:00
924aa984cf
Merge pull request #5823 from proppy/archive-bufio
...
archive: use bufio for compression detection
2014-05-15 16:08:21 -07:00
ad35d522db
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)
2014-05-16 01:03:11 +02:00
b51c366bfc
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)
2014-05-16 00:47:20 +02:00
8b77a5b7ae
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)
2014-05-16 00:47:20 +02:00
e5a5808f51
Merge pull request #5820 from joelhandwell/patch-1
...
changed deprecated option styles to supported ones
2014-05-16 00:40:16 +02:00
041dbcb7be
Merge pull request #5826 from tianon/add-cross-to-test
...
Add "cross" to the "test" Makefile target
2014-05-15 15:35:18 -07:00
8ec01f9dc1
Add "cross" to the "test" Makefile target
...
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com> (github: tianon)
2014-05-15 16:21:17 -06:00
77c2b76e44
archive: use bufio for compression detection
...
Docker-DCO-1.1-Signed-off-by: Johan Euphrosine <proppy@google.com> (github: proppy)
2014-05-15 11:41:07 -07:00
10a320818e
changed deprecated option styles to supported ones
...
-name and -rm to --name and --rm
2014-05-15 10:50:59 -04:00
5dfe7c43d4
Merge pull request #5816 from unclejack/docs_run_cache
...
docs: explain when RUN cache gets invalidated
2014-05-15 19:54:15 +10:00
239d1ef301
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)
2014-05-15 12:32:01 +03:00
8887e00630
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.
2014-05-15 11:03:22 +10:00
8d213e91b3
Merge pull request #5706 from vieux/remove_add_string
2014-05-14 17:31:52 -07:00
db4d534b5b
Merge pull request #5800 from jamtur01/paras
...
Updated a bunch of formatting in the docs/sources/use files
2014-05-15 01:58:14 +02:00
ed703fc8be
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)
2014-05-15 09:41:05 +10:00
d9e3d88082
Merge pull request #5801 from jamtur01/fixups
...
Minor fixups to the Docs README
2014-05-15 09:38:52 +10:00
2269472f3a
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)
2014-05-15 01:26:36 +02:00
6ff6aad9b8
Merge pull request #5809 from crosbymichael/move-cgroups
...
Move cgroups package into libcontainer
2014-05-14 16:06:32 -07:00
b22d10e3c5
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)
2014-05-14 16:01:45 -07:00
b0578d0ac7
Merge pull request #5772 from unclejack/improve_commit_performance
...
process directories in parallel in ChangesDirs
2014-05-14 15:49:11 -07:00
3b7a19def6
Move cgroups package into libcontainer
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
2014-05-14 15:21:44 -07:00
8904dfe082
Merge pull request #5657 from tianon/sysvinit-should-start
...
Add "Should-Start" cgroupfs-mount and cgroup-lite to sysvinit-debian init script
2014-05-14 16:05:32 -06:00
76f09c2ecf
Merge pull request #5807 from crosbymichael/dev-symlinks
...
Setup standard /dev symlinks
2014-05-14 14:17:33 -07:00
49deffe6fe
Merge pull request #5806 from icecrime/5766-events_endless_newlines
...
Issue #5766 - Check channel closed state in /events loop
2014-05-14 14:09:26 -07:00
343c24a5fa
Merge pull request #5805 from joelhandwell/patch-2
...
changed deprecated -name option to --name
2014-05-14 22:09:17 +01:00
79be9f8d7f
Merge pull request #5804 from joelhandwell/patch-1
...
changed deprecated -rm option to --rm
2014-05-14 22:08:01 +01:00
359f8aca29
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)
2014-05-15 00:03:33 +03:00
2bc34036b9
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)
2014-05-14 13:59:13 -07:00
8699f53e6a
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)
2014-05-14 22:35:04 +02:00
17a1f470ae
Merge pull request #5783 from LK4D4/fix_duplicate_ip_allocation_#5729
...
Fix duplicate ip allocation
2014-05-14 13:32:27 -07:00
2d622df835
changed deprecated -name option to --name
...
changed deprecated -name option to --name
2014-05-14 16:24:08 -04:00
Michael Crosby
Victor Vieux
Johan Euphrosine
Tianon Gravi
unclejack
Alexander Larsson
Timothy Hobbs
O.S. Tezer
Guillaume J. Charmes
Solomon Hykes
Sven Dowideit
SvenDowideit
lalyos
James Turnbull
Joel Handwell
Michael Crosby
Bernerd Schaefer
Arnaud Porterie