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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
e2032febfb
Merge pull request #9543 from ErikDubbelboer/racefix
...
Removed race condition
Upstream-commit: f91a79e071db20e45fa61e0f606ce944121822c4
Component: engine
2014-12-06 09:08:36 -08:00
c21c1c5984
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 >
Upstream-commit: 46b1194d996f6535e657bcb88428303305d3fe68
Component: engine
2014-12-06 22:52:19 +08:00
6465d98afa
Fix chroot untar for zero padded archive from slow reader
...
Signed-off-by: Lewis Marshall <lewis@lmars.net >
Upstream-commit: c128c134d71d01c555a6354d2ae7f6964f93df90
Component: engine
2014-12-06 02:44:31 +00:00
84a6c7d576
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)
Upstream-commit: fdf745768350d2068aecd34734b38a2c27810132
Component: engine
2014-12-05 23:08:22 +00:00
93dd7fb297
Merge pull request #9479 from jlhawn/tarsum_test_fix
...
Correct TarSum benchmarks: 9kTar and 9kTarGzip
Upstream-commit: 984b072a37ee090bc24511137919211ec2fbb542
Component: engine
2014-12-05 14:47:54 -08:00
0703a67ce9
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 >
Upstream-commit: 654da4e151c449725b6996d47b7ff33767e87da9
Component: engine
2014-12-05 12:13:25 -08:00
d93f5cf597
Merge pull request #9488 from crosbymichael/update-libcontainer-dec3
...
Update libcontainer to 53eca435e63db58b06cf796d3a9
Upstream-commit: 52a52909a86581bc246eff00ca7b1fdffb770c09
Component: engine
2014-12-05 12:05:06 -08:00
2aeb9859a8
Merge pull request #9493 from SvenDowideit/note-lxc-conf-pitfall
...
Note that using -lxc-conf to change things Docker manages has pitfalls
Upstream-commit: 2525a04594eed2ca4e13e9ded83f406529bad299
Component: engine
2014-12-05 11:16:19 -08:00
5961d7dec3
Merge pull request #9528 from SvenDowideit/add-license-to-docs
...
Add Apache license and link to the docs
Upstream-commit: 8bfe4d906e7629eb78302a87b0109194627e63ed
Component: engine
2014-12-05 11:15:47 -08:00
8953683264
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 >
Upstream-commit: 522e6310967bcb4fadd99d76dc3205991ecae1ad
Component: engine
2014-12-05 21:06:11 +10:00
85c2d97483
Add a fuse example, combining both SYS_ADMIN and --device
...
inspired by #9448 and #9487
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@docker.com > (github: SvenDowideit)
Signed-off-by: Sven Dowideit <SvenDowideit@docker.com >
Upstream-commit: 5f2000944b0377f1e5ce86a887f495f1f295dd90
Component: engine
2014-12-05 16:42:48 +10:00
