starred/cli
1
0
Fork 0
mirror of https://github.com/docker/cli.git synced 2026-09-28 02:06:53 -04:00
Code Issues Packages Projects Releases Wiki Activity
12,276 Commits 15 Branches 323 Tags
a3f91aac4f72c6d9f8a2da62bcdc1754971cc4b9
Commit Graph
12276 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Alexander Morozov e5912031f0 Merge pull request #9597 from icecrime/9467-chown_regression 
Fix permissions on ADD/COPY
Upstream-commit: 5ca4ba9ed0fcf7df0ee40e4212d0415e112080e7
Component: engine
 2014-12-10 11:47:33 -08:00
Arnaud Porterie 5231d38261 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>
Upstream-commit: cfc24769a26e825e4267cbfdd59af807e27508b9
Component: engine
 2014-12-10 11:09:03 -08:00
Michael Crosby 6d8465a765 Merge pull request #9582 from Mic92/tls_interactive_exec 
Fix interactive TLS postContainersAttach
Upstream-commit: b905f88ee55d562cf3b8a780fc03f51eddf391c8
Component: engine
 2014-12-10 10:37:50 -08:00
Michael Crosby 7f9567ff56 Merge pull request #9099 from vbatts/vbatts-tarsum_spec 
pkg/tarsum: specification on TarSum checksum algorithm
Upstream-commit: 428c263a6c2a0606a5eed25beaf2ef93da14a4b7
Component: engine
 2014-12-10 10:24:48 -08:00
Jörg Thalheim 3f619723e5 Fix interactive TLS postContainersAttach 
related to 266a1044deb9a085ed43dccdc6

Signed-off-by: Jörg Thalheim <joerg@higgsboson.tk>
Upstream-commit: a25168d28d552c33988c1a0f3d6a54355c246566
Component: engine
 2014-12-10 08:57:38 +01:00
Jessie Frazelle 5dee012669 Merge pull request #9588 from LK4D4/remove_stderr_from_build 
Use Set for stderr "logs" job in builder
Upstream-commit: 3076115e2c313402aa91af1366ada66fab8a9112
Component: engine
 2014-12-09 19:48:29 -08:00
Alexandr Morozov 3ecd658560 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>
Upstream-commit: a62cbdeb47e5e504e670c546ad8bec45e696f370
Component: engine
 2014-12-09 19:08:24 -08:00
Michael Crosby f19d3d8426 Merge pull request #9318 from shishir-a412ed/doc-cpu-share 
Enhanced description for 'docker run' command, -c/--cpu-shares flag
Upstream-commit: fb810d18bd27636097baec0eb8db85d1596cb0e5
Component: engine
 2014-12-09 17:21:09 -08:00
Alexander Morozov 541ed3f16d Merge pull request #9537 from icecrime/9476-tty_stdin_redirect 
Forbid client piping to tty enabled container
Upstream-commit: fa7e01794f6fafb92579487fd3324ab13fa12123
Component: engine
 2014-12-09 15:17:44 -08:00
Arnaud Porterie 1d39a69298 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>
Upstream-commit: 67e3ddb75ff27b8de0022e330413b4308ec5b010
Component: engine
 2014-12-09 14:30:49 -08:00
Brian Goff b4787aa54e Add test for exec tty stdin close 
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
Upstream-commit: 243a640d3e593ee11e31ac55a4df8c887c2b09c9
Component: engine
 2014-12-09 14:30:49 -08:00
Alexander Morozov b9ffeb9e2c Merge pull request #9575 from brahmaroutu/lxcconf_9501 
User should get error message on wrong config
Upstream-commit: 26872872892268923ea8160ea1151f232270bcf5
Component: engine
 2014-12-09 14:10:38 -08:00
Srini Brahmaroutu 6ca414da06 User should get error message on wrong config 
closes #9501

Signed-off-by: Srini Brahmaroutu <srbrahma@us.ibm.com>
Upstream-commit: 8dcbd6ab636e756736cef5408710ff97fd207370
Component: engine
 2014-12-09 21:52:07 +00:00
Alexandr Morozov 66843cd423 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
Upstream-commit: 994e4a1c69c5f48eeba679437fdd7b7ed7ab0fc5
Component: engine
 2014-12-09 23:16:03 +02:00
Arnaud Porterie a5d4e8f098 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>
Upstream-commit: 0de96a81636e27a6b7cf3a34a62419545d030234
Component: engine
 2014-12-09 14:56:17 -05:00
Michael Crosby 023722e3bb 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
Upstream-commit: c8fc8768b672b06bd0cf38d65da8ba03016b85b2
Component: engine
 2014-12-09 14:56:17 -05:00
Lewis Marshall 9f19621ed8 Fix chroot untar for zero padded archive from slow reader 
Signed-off-by: Lewis Marshall <lewis@lmars.net>
Upstream-commit: f2008c535943669a4db89e3b9927a75121effbd5
Component: engine
 2014-12-09 14:56:16 -05:00
unclejack ed1287419c validate image ID properly & before load 
Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com>
Upstream-commit: acf1720b3f6035f0ab2c9658371ae8302851ffa3
Component: engine
 2014-12-09 14:56:16 -05:00
Arnaud Porterie 94c64ce8e8 Add integration test for xz path issue 
Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com>

Conflicts:
	integration-cli/docker_cli_build_test.go
Upstream-commit: 0e9a7bc3cea20db258176b6f923c2b9cd009334f
Component: engine
 2014-12-09 14:56:16 -05:00
Michael Crosby ea53874af1 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
Upstream-commit: 313a1b7620910e47d888f8b0a6a5eb06ad9c1ff2
Component: engine
 2014-12-09 14:56:16 -05:00
Michael Crosby 12026cb912 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
Upstream-commit: 62d83404b5f4c9ecdc21e8cab2306a933ce0cdbc
Component: engine
 2014-12-09 14:56:16 -05:00
Cristian Staretu 0e2e573fb5 Add build tests covering extraction in chroot 
Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com>
Upstream-commit: aef842e7dfb534aba22c3c911de525ce9ac12b72
Component: engine
 2014-12-09 14:56:16 -05:00
unclejack 41c7d48d95 integ-cli: add test for links in volumes 
Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com>
Upstream-commit: e629e255d89759ade9b46fecf413c2ba6765f7dd
Component: engine
 2014-12-09 14:56:16 -05:00
unclejack 7e26fea20c integ-cli: add build test for absolute symlink 
Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com>
Upstream-commit: 134f8e6b474d07e12712e0f2d55b901246e6482e
Component: engine
 2014-12-09 14:56:16 -05:00
Tibor Vass d423a092c7 Add another symlink breakout test 
Signed-off-by: Tibor Vass <teabee89@gmail.com>
Upstream-commit: 1cd89729d59948a4bdc9d6c8a4ab01cedaeb193f
Component: engine
 2014-12-09 14:56:16 -05:00
Tibor Vass edee2c60d1 symlink: add more tests 
Signed-off-by: Tibor Vass <teabee89@gmail.com>
Upstream-commit: 566146bc13efb6f8b1e6d4a41382f80546ac1782
Component: engine
 2014-12-09 14:56:16 -05:00
Tibor Vass 14630dbebf symlink: cleanup names and break big test into multiple smaller ones 
Signed-off-by: Tibor Vass <teabee89@gmail.com>
Upstream-commit: 1ebafeb635eead4d3eedf4b5bbaf7e1e2d760086
Component: engine
 2014-12-09 14:56:16 -05:00
Tibor Vass a8db79a140 Refactor of symlink tests to remove testdata dir 
Signed-off-by: Tibor Vass <teabee89@gmail.com>
Upstream-commit: 18193ae0a3a1fb506e7855c5e2e02c2c2d4c1a3e
Component: engine
 2014-12-09 14:56:16 -05:00
Tianon Gravi d44e0801be Simplify FollowSymlinkInScope based on Go 1.3.3's EvalSymlinks 
Signed-off-by: Andrew Page <admwiggin@gmail.com>
Upstream-commit: cd745d5c6e012ff603f25e1314cfb4c0b09e906c
Component: engine
 2014-12-09 14:56:16 -05:00
Michael Crosby bb5a33c82a Merge pull request #9356 from cc272309126/fix-exec-paused-container 
Fix the issue that when docker exec a paused container, it will always
Upstream-commit: bb24f99d741cd8d6a8b882afc929c15c633c39cb
Component: engine
 2014-12-09 11:01:44 -08:00
Michael Crosby 9923dcade2 Merge pull request #9467 from icecrime/9401-restrict_add_chown_scope 
Reduce permissions changes scope after ADD/COPY
Upstream-commit: 64ebffe7b6e4a6732b3b6f56585bc8d01f4f8ed0
Component: engine
 2014-12-09 10:40:23 -08:00
Michael Crosby 281b2a944f Merge pull request #9447 from ashahab-altiscale/7687-lxc-cap-add-cap-drop 
LXC CAP ADD CAP DROP IN TEMPLATE
Upstream-commit: 86efd1a1022b900951459d5eba2eb81caacc770a
Component: engine
 2014-12-09 10:35:52 -08:00
Tianon Gravi 2ecd40b772 Merge pull request #9581 from vbatts/vbatts-fix_gh9138 
contrib: fix the docker-device-tool
Upstream-commit: ca2ebaeafe96f1e7e05177058a2a3723c979f830
Component: engine
 2014-12-09 09:30:37 -08:00
shishir-a412ed 1e5e5cb310 Added description for 'docker run' command, -c/--cpu-shares flag 
Signed-off-by: Shishir Mahajan <shishir.mahajan@redhat.com>
Upstream-commit: 2597bffe9a6538c2db73e2ce380294547b738e2e
Component: engine
 2014-12-09 09:55:56 -05:00
James Turnbull e7ab84e497 Merge pull request #9558 from philips/fixup-typo-in-systemd-article 
docs: docker.service not services
Upstream-commit: c587a3faf65c94b50fa1b56ba2af3ae3c547933f
Component: engine
 2014-12-09 23:10:17 +11:00
James Turnbull e3ad9c003c Merge pull request #9559 from philips/use-dropins-in-systemd-article 
docs: use systemd drop-ins instead of copying
Upstream-commit: 74b29e8b455ac37ad8b3c745b82033e9e7af9077
Component: engine
 2014-12-09 23:09:52 +11:00
unclejack fb1a7048bf Merge pull request #9573 from crosbymichael/flush-stdin 
Flush stdin from within chroot archive
Upstream-commit: f568b282feb16d6343fc4763170b882885ccd19d
Component: engine
 2014-12-09 01:54:01 +02:00
Fred Lifton b99dd269f2 Merge pull request #9522 from SvenDowideit/add-some-cap-add-examples 
Add some cap add examples
Upstream-commit: 03d1622ab82071bcfb10ac29d37a51aa5d77b5d5
Component: engine
 2014-12-08 15:50:25 -08:00
Michael Crosby a4b445d2e9 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>
Upstream-commit: d1535131d259bb8a980770d47c0865a1be4373e3
Component: engine
 2014-12-08 15:41:07 -08:00
Tibor Vass d19caad485 Merge pull request #9539 from flynn/chroot-untar-empty-archive-slow 
Fix chroot untar for zero padded archive from slow reader
Upstream-commit: c9285a08b161f31f37915f929252c9ba1a83ffa9
Component: engine
 2014-12-08 17:59:21 -05:00
Alexander Morozov b7760aec59 Merge pull request #9567 from jfrazelle/8333-net-link-error 
Throw error when container links to --net host container
Upstream-commit: 0d941969998baa42eab8ce05da7ee8b9d9885dc8
Component: engine
 2014-12-08 14:36:44 -08:00
Jessica Frazelle 3890e00172 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)
Upstream-commit: 6743be44ca9006cb7ca26cd3d8410877727a6313
Component: engine
 2014-12-08 11:33:18 -08:00
Jessie Frazelle 1c6f987783 Merge pull request #9512 from duglin/Issue9404 
Make 'docker build' send non-err output to stdout
Upstream-commit: 58ce0146e16e2e63b7a94d34a48722a9c7400c18
Component: engine
 2014-12-08 11:08:13 -08:00
Arnaud Porterie be5e940362 Merge pull request #9489 from crosbymichael/info-root 
Return docker's root dir in docker -D info
Upstream-commit: 12252e39a0abc188e1cd1fe9e921eef967308e1c
Component: engine
 2014-12-08 09:05:00 -08:00
Brandon Philips 9938c679ed 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>
Upstream-commit: 2d51d71561565987fc6a600234f2e2d15e0ecf31
Component: engine
 2014-12-07 18:45:50 -08:00
Brandon Philips 3c2c492c7f docs: remove a trailing whitespace 
Signed-off-by: Brandon Philips <brandon.philips@coreos.com>
Upstream-commit: e0792e7ece7a71da83c902a03654bda4797ab054
Component: engine
 2014-12-07 18:45:43 -08:00
Brandon Philips a6561f311c 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>
Upstream-commit: 1ae7be716eadf6efdc7ee033c83127e975222a76
Component: engine
 2014-12-07 18:35:37 -08:00
Neal McBurnett 245df65b49 Fixes #9555: sudo not needed with cert authn 
Signed-off-by: Neal McBurnett <neal@mcburnett.org>
Upstream-commit: ee1ba252187a7e1a80e3773fe9748410d01a39b8
Component: engine
 2014-12-07 14:31:35 -07:00
Barnaby Gray 16cbc8473e Update fish shell completions. 
Fixes #9550

Signed-off-by: Barnaby Gray <barnaby@pickle.me.uk>
Upstream-commit: 4f6cdb12ab64cf76f5a57cb1d24081882c61def3
Component: engine
 2014-12-07 12:40:29 +00:00
Jessie Frazelle 7f2911210b Merge pull request #9497 from icecrime/86580-tls_interactive_exec 
Fix interactive exec over TLS
Upstream-commit: 53d5299a40ad149be420bb87e5c97c616c1df821
Component: engine
 2014-12-06 13:12:06 -08:00