Tibor Vass
b7f352b0fb
Refactor of symlink tests to remove testdata dir
...
Signed-off-by: Tibor Vass <teabee89@gmail.com>
2014-12-11 16:26:01 -05:00
Tianon Gravi
fa3ec89515
Simplify FollowSymlinkInScope based on Go 1.3.3's EvalSymlinks
...
Signed-off-by: Andrew Page <admwiggin@gmail.com>
2014-12-11 16:26:01 -05:00
Vincent Batts
74bbb93571
Merge pull request #9258 from rhvgoyal/transaction-id-improvements
...
devmapper fix usage of pool transaction id
2014-12-11 12:58:18 -05:00
Vincent Batts
6700580bbc
Merge pull request #9604 from crosbymichael/registry-fruit-loops
...
Prevent infinite loop with var overshadowing
2014-12-11 10:36:47 -05:00
Michael Crosby
9a7a1e5be0
Refactor put image function's redirect loop
...
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2014-12-10 18:11:27 -08:00
Michael Crosby
3b4de1070f
Prevent loop with var overshadowing
...
Incase of a 3xx redirect the var was being overshowed and ever changed
causing an infinite loop.
Fixes #9480
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2014-12-10 17:43:21 -08:00
James Turnbull
eba451b659
Merge pull request #9566 from jfrazelle/btrfs-overlayfs
...
add note to docs about overlay + btrfs unsupported
2014-12-11 09:32:10 +11:00
Jessica Frazelle
340ea25ac1
add note to docs about overlay + btrfs
...
Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com> (github: jfrazelle)
2014-12-10 14:29:41 -08:00
Alexander Morozov
5ca4ba9ed0
Merge pull request #9597 from icecrime/9467-chown_regression
...
Fix permissions on ADD/COPY
2014-12-10 11:47:33 -08:00
Arnaud Porterie
cfc24769a2
Fix permissions on ADD/COPY
...
Fix a regression introduced in PR#9467 when a single file was added or
copied.
Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com>
2014-12-10 11:09:03 -08:00
Michael Crosby
b905f88ee5
Merge pull request #9582 from Mic92/tls_interactive_exec
...
Fix interactive TLS postContainersAttach
2014-12-10 10:37:50 -08:00
Michael Crosby
428c263a6c
Merge pull request #9099 from vbatts/vbatts-tarsum_spec
...
pkg/tarsum: specification on TarSum checksum algorithm
2014-12-10 10:24:48 -08:00
Jörg Thalheim
a25168d28d
Fix interactive TLS postContainersAttach
...
related to 266a1044de
Signed-off-by: Jörg Thalheim <joerg@higgsboson.tk>
2014-12-10 08:57:38 +01:00
Jessie Frazelle
3076115e2c
Merge pull request #9588 from LK4D4/remove_stderr_from_build
...
Use Set for stderr "logs" job in builder
2014-12-09 19:48:29 -08:00
Alexandr Morozov
a62cbdeb47
Use Set for stderr "logs" job in builder
...
Because engine implicitly adds his stder to job stderr
Signed-off-by: Alexandr Morozov <lk4d4@docker.com>
2014-12-09 19:08:24 -08:00
Michael Crosby
fb810d18bd
Merge pull request #9318 from shishir-a412ed/doc-cpu-share
...
Enhanced description for 'docker run' command, -c/--cpu-shares flag
2014-12-09 17:21:09 -08:00
Alexander Morozov
fa7e01794f
Merge pull request #9537 from icecrime/9476-tty_stdin_redirect
...
Forbid client piping to tty enabled container
2014-12-09 15:17:44 -08:00
Arnaud Porterie
67e3ddb75f
Forbid client piping to tty enabled container
...
Forbid `docker run -t` with a redirected stdin (such as `echo test |
docker run -ti busybox cat`). Forbid `docker exec -t` with a redirected
stdin. Forbid `docker attach` with a redirect stdin toward a tty enabled
container.
Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com>
2014-12-09 14:30:49 -08:00
Brian Goff
243a640d3e
Add test for exec tty stdin close
...
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
2014-12-09 14:30:49 -08:00
Alexander Morozov
2687287289
Merge pull request #9575 from brahmaroutu/lxcconf_9501
...
User should get error message on wrong config
2014-12-09 14:10:38 -08:00
Srini Brahmaroutu
8dcbd6ab63
User should get error message on wrong config
...
closes #9501
Signed-off-by: Srini Brahmaroutu <srbrahma@us.ibm.com>
2014-12-09 21:52:07 +00:00
Michael Crosby
bb24f99d74
Merge pull request #9356 from cc272309126/fix-exec-paused-container
...
Fix the issue that when docker exec a paused container, it will always
2014-12-09 11:01:44 -08:00
Michael Crosby
64ebffe7b6
Merge pull request #9467 from icecrime/9401-restrict_add_chown_scope
...
Reduce permissions changes scope after ADD/COPY
2014-12-09 10:40:23 -08:00
Michael Crosby
86efd1a102
Merge pull request #9447 from ashahab-altiscale/7687-lxc-cap-add-cap-drop
...
LXC CAP ADD CAP DROP IN TEMPLATE
2014-12-09 10:35:52 -08:00
Tianon Gravi
ca2ebaeafe
Merge pull request #9581 from vbatts/vbatts-fix_gh9138
...
contrib: fix the docker-device-tool
2014-12-09 09:30:37 -08:00
shishir-a412ed
2597bffe9a
Added description for 'docker run' command, -c/--cpu-shares flag
...
Signed-off-by: Shishir Mahajan <shishir.mahajan@redhat.com>
2014-12-09 09:55:56 -05:00
James Turnbull
c587a3faf6
Merge pull request #9558 from philips/fixup-typo-in-systemd-article
...
docs: docker.service not services
2014-12-09 23:10:17 +11:00
James Turnbull
74b29e8b45
Merge pull request #9559 from philips/use-dropins-in-systemd-article
...
docs: use systemd drop-ins instead of copying
2014-12-09 23:09:52 +11:00
unclejack
f568b282fe
Merge pull request #9573 from crosbymichael/flush-stdin
...
Flush stdin from within chroot archive
2014-12-09 01:54:01 +02:00
Fred Lifton
03d1622ab8
Merge pull request #9522 from SvenDowideit/add-some-cap-add-examples
...
Add some cap add examples
2014-12-08 15:50:25 -08:00
Michael Crosby
d1535131d2
Flush stdin from within chroot archive
...
This makes sure that we don't buffer in memory and that we also flush
stdin from diff as well as untar.
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2014-12-08 15:41:07 -08:00
Tibor Vass
c9285a08b1
Merge pull request #9539 from flynn/chroot-untar-empty-archive-slow
...
Fix chroot untar for zero padded archive from slow reader
2014-12-08 17:59:21 -05:00
Alexander Morozov
0d94196999
Merge pull request #9567 from jfrazelle/8333-net-link-error
...
Throw error when container links to --net host container
2014-12-08 14:36:44 -08:00
Jessica Frazelle
6743be44ca
Running a container that links to a container with --net host
...
should throw an error.
Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com> (github: jfrazelle)
2014-12-08 11:33:18 -08:00
Jessie Frazelle
58ce0146e1
Merge pull request #9512 from duglin/Issue9404
...
Make 'docker build' send non-err output to stdout
2014-12-08 11:08:13 -08:00
Arnaud Porterie
12252e39a0
Merge pull request #9489 from crosbymichael/info-root
...
Return docker's root dir in docker -D info
2014-12-08 09:05:00 -08:00
Brandon Philips
2d51d71561
docs: use systemd drop-ins instead of copying
...
Copying the entire docker service file isn't necessary to add an
environment variable, instead use a drop-in configuration file. The nice
side-effect is that the user gets any vendor updates to the
docker.service file.
Signed-off-by: Brandon Philips <brandon.philips@coreos.com>
2014-12-07 18:45:50 -08:00
Brandon Philips
e0792e7ece
docs: remove a trailing whitespace
...
Signed-off-by: Brandon Philips <brandon.philips@coreos.com>
2014-12-07 18:45:43 -08:00
Brandon Philips
1ae7be716e
docs: docker.service not services
...
Minor but important typo in the new systemd guide introduced in #9347 .
Signed-off-by: Brandon Philips <brandon.philips@coreos.com>
2014-12-07 18:35:37 -08:00
Jessie Frazelle
53d5299a40
Merge pull request #9497 from icecrime/86580-tls_interactive_exec
...
Fix interactive exec over TLS
2014-12-06 13:12:06 -08:00
Arnaud Porterie
f91a79e071
Merge pull request #9543 from ErikDubbelboer/racefix
...
Removed race condition
2014-12-06 09:08:36 -08:00
Erik Dubbelboer
46b1194d99
Removed race condition
...
If two interrupts were fired really quickly interruptCount could have been incremented twice before the LoadUint32 making cleanup not being called at all.
Signed-off-by: Erik Dubbelboer <erik@dubbelboer.com>
2014-12-06 22:52:19 +08:00
Lewis Marshall
c128c134d7
Fix chroot untar for zero padded archive from slow reader
...
Signed-off-by: Lewis Marshall <lewis@lmars.net>
2014-12-06 02:44:31 +00:00
Abin Shahab
fdf7457683
LXC CAP ADD CAP DROP IN TEMPLATE
...
Added cap-drop and cap-add in lxc template
Docker-DCO-1.1-Signed-off-by: Abin Shahab <ashahab@altiscale.com> (github: ashahab-altiscale)
2014-12-05 23:08:22 +00:00
Alexander Morozov
984b072a37
Merge pull request #9479 from jlhawn/tarsum_test_fix
...
Correct TarSum benchmarks: 9kTar and 9kTarGzip
2014-12-05 14:47:54 -08:00
Michael Crosby
654da4e151
Return docker's root dir in docker -D info
...
This adds the docker daemon's root directory to docker info when running
in debug mode. This allows the user to view the root directory where
docker is writing and storing state.
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2014-12-05 12:13:25 -08:00
Jessie Frazelle
52a52909a8
Merge pull request #9488 from crosbymichael/update-libcontainer-dec3
...
Update libcontainer to 53eca435e63db58b06cf796d3a9
2014-12-05 12:05:06 -08:00
Michael Crosby
2525a04594
Merge pull request #9493 from SvenDowideit/note-lxc-conf-pitfall
...
Note that using -lxc-conf to change things Docker manages has pitfalls
2014-12-05 11:16:19 -08:00
Michael Crosby
8bfe4d906e
Merge pull request #9528 from SvenDowideit/add-license-to-docs
...
Add Apache license and link to the docs
2014-12-05 11:15:47 -08:00
Sven Dowideit
522e631096
I was talking to someone whom i listen to, and she noted that our docs don't mention the license
...
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>
2014-12-05 21:06:11 +10:00