a25168d28d
Fix interactive TLS postContainersAttach
...
related to 266a1044de
2014-12-10 08:57:38 +01:00
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
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
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
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
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
243a640d3e
Add test for exec tty stdin close
...
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
2014-12-09 14:30:49 -08:00
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
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
994e4a1c69
Change path breakout detection logic in archive package
...
Fixes #9375
Signed-off-by: Alexandr Morozov <lk4d4@docker.com>
Conflicts:
integration-cli/docker_cli_cp_test.go
removed extra test
2014-12-09 23:16:03 +02:00
0de96a8163
Fix client-side HTTP hijacking over TLS
...
Properly CloseWrite() the client socket once done with stdin when using
TLS connection (this used to rely on an erroneous type assertion).
Fixes #8658 .
Fixes #8642 .
Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com>
Signed-off-by: Michael Crosby <crosby.michael@gmail.com>
2014-12-09 14:56:17 -05:00
c8fc8768b6
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>
Conflicts:
pkg/chrootarchive/diff.go
2014-12-09 14:56:17 -05:00
f2008c5359
Fix chroot untar for zero padded archive from slow reader
...
Signed-off-by: Lewis Marshall <lewis@lmars.net>
2014-12-09 14:56:16 -05:00
acf1720b3f
validate image ID properly & before load
...
Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com>
2014-12-09 14:56:16 -05:00
0e9a7bc3ce
Add integration test for xz path issue
...
Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com>
Conflicts:
integration-cli/docker_cli_build_test.go
2014-12-09 14:56:16 -05:00
313a1b7620
Decompress archive before streaming the unpack in a chroot
...
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
Conflicts:
pkg/archive/archive.go
pkg/chrootarchive/archive.go
2014-12-09 14:56:16 -05:00
62d83404b5
Update chroot apply layer to handle decompression outside chroot
...
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
Conflicts:
pkg/archive/diff.go
pkg/chrootarchive/archive.go
2014-12-09 14:56:16 -05:00
aef842e7df
Add build tests covering extraction in chroot
...
Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com>
2014-12-09 14:56:16 -05:00
e629e255d8
integ-cli: add test for links in volumes
...
Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com>
2014-12-09 14:56:16 -05:00
134f8e6b47
integ-cli: add build test for absolute symlink
...
Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com>
2014-12-09 14:56:16 -05:00
1cd89729d5
Add another symlink breakout test
...
Signed-off-by: Tibor Vass <teabee89@gmail.com>
2014-12-09 14:56:16 -05:00
566146bc13
symlink: add more tests
...
Signed-off-by: Tibor Vass <teabee89@gmail.com>
2014-12-09 14:56:16 -05:00
1ebafeb635
symlink: cleanup names and break big test into multiple smaller ones
...
Signed-off-by: Tibor Vass <teabee89@gmail.com>
2014-12-09 14:56:16 -05:00
18193ae0a3
Refactor of symlink tests to remove testdata dir
...
Signed-off-by: Tibor Vass <teabee89@gmail.com>
2014-12-09 14:56:16 -05:00
cd745d5c6e
Simplify FollowSymlinkInScope based on Go 1.3.3's EvalSymlinks
...
Signed-off-by: Andrew Page <admwiggin@gmail.com>
2014-12-09 14:56:16 -05:00
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
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
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
ca2ebaeafe
Merge pull request #9581 from vbatts/vbatts-fix_gh9138
...
contrib: fix the docker-device-tool
2014-12-09 09:30:37 -08:00
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
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
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
f568b282fe
Merge pull request #9573 from crosbymichael/flush-stdin
...
Flush stdin from within chroot archive
2014-12-09 01:54:01 +02:00
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
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
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
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
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
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
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
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
e0792e7ece
docs: remove a trailing whitespace
...
Signed-off-by: Brandon Philips <brandon.philips@coreos.com>
2014-12-07 18:45:43 -08:00
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
ee1ba25218
Fixes #9555 : sudo not needed with cert authn
...
Signed-off-by: Neal McBurnett <neal@mcburnett.org>
2014-12-07 14:31:35 -07:00
4f6cdb12ab
Update fish shell completions.
...
Fixes #9550
Signed-off-by: Barnaby Gray <barnaby@pickle.me.uk>
2014-12-07 12:40:29 +00:00
53d5299a40
Merge pull request #9497 from icecrime/86580-tls_interactive_exec
...
Fix interactive exec over TLS
2014-12-06 13:12:06 -08:00
f91a79e071
Merge pull request #9543 from ErikDubbelboer/racefix
...
Removed race condition
2014-12-06 09:08:36 -08:00
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
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
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
Jörg Thalheim
Jessie Frazelle
Alexandr Morozov
Michael Crosby
Alexander Morozov
Arnaud Porterie
Brian Goff
Srini Brahmaroutu
Michael Crosby
Lewis Marshall
unclejack
Cristian Staretu
Tibor Vass
Tianon Gravi
shishir-a412ed
James Turnbull
unclejack
Fred Lifton
Jessica Frazelle
Brandon Philips
Neal McBurnett
Barnaby Gray
Erik Dubbelboer
Abin Shahab