p4u1/docker-cli
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
8,300 Commits 2 Branches 295 Tags
f45c8a5e2568ba2f23ad2174a6e5bd03c7ccdb00
Commit Graph

7654 Commits

Author SHA1 Message Date
Victor Vieux
f45c8a5e25 Merge pull request #5782 from unclejack/fix_5270 
Upstream-commit: 8eef1be29e763db58a22d336b71d97c076a11199
Component: engine
 2014-05-19 10:36:10 -07:00
Michael Crosby
6d2d044bd5 Merge pull request #5670 from jmccrohan/master 
client: Remove docker new version check 
Upstream-commit: b50c9a185c2278daea5be5a9012cf20d548150a4
Component: engine
 2014-05-19 10:26:58 -07:00
Michael Crosby
6d8b321053 Merge pull request #5864 from shykes/pr_out_make_cristian_maintainer_of_integration_cli_he_wrote_it 
Make Cristian maintainer of integration-cli (he wrote it)
Upstream-commit: 15a94fdcbb1ff1a6cf5f02248eb7ca92e6bf9ee9
Component: engine
 2014-05-19 10:26:18 -07:00
Michael Crosby
383cab0f3d Merge pull request #5907 from vmarmol/caps 
Don't drop CAP_FOWNER in the container.
Upstream-commit: a3a26cd349cc5f2776195e50c8857cd13dc15e22
Component: engine
 2014-05-19 10:06:29 -07:00
Michael Crosby
1bd174defc Merge pull request #5865 from crosbymichael/add-all-caps 
Add the rest of the caps so that they are retained in privilged mode
Upstream-commit: 265de539ff4a6fc54c5bf72c8c67d00a533d7f55
Component: engine
 2014-05-19 09:56:55 -07:00
Michael Crosby
5b3405364b Merge pull request #5880 from LK4D4/fix_uid_overflow_#5647 
Check uid ranges
Upstream-commit: 66e7cf24b754b9de441669c50b37801706c0a557
Component: engine
 2014-05-19 09:55:36 -07:00
Victor Marmol
4feffb64a0 Don't drop CAP_FOWNER in the container. Also sorts the list of allowed 
capabilities.

Docker-DCO-1.1-Signed-off-by: Victor Marmol <vmarmol@google.com> (github: vmarmol)
Upstream-commit: 0abad3ae2290a2b051b8fdaceab17a1ee41ecfb9
Component: engine
 2014-05-19 16:52:39 +00:00
Michael Crosby
f3abdf9b7d Add the rest of the caps so that they are retained in privilged mode 
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
Upstream-commit: e1c7abe8905d4cc034f1ed49e9d102846e412424
Component: engine
 2014-05-19 16:43:31 +00:00
James Turnbull
5fad0a836d Merge pull request #5884 from brandon-rhodes/master 
Expand the Advanced Networking page to all options
Upstream-commit: e5422e212f7929207b5df891b3358995755b0e80
Component: engine
 2014-05-19 03:35:48 -04:00
James Turnbull
059730a575 Merge pull request #5834 from waitingkuo/patch-1 
Update ubuntulinux.md
Upstream-commit: 59e37784ee3c2235b0e5919b5dca8f3c2a4c0b66
Component: engine
 2014-05-19 03:34:14 -04:00
Brandon Rhodes
399e34e6ec Expand the Advanced Networking page to all options 
For issue #5658 this rewrite of the networking page explains what every
single option (unless I missed one!) does both for the Docker server and
also the Docker client when submitting a "docker run".  I somehow
thought that, when I was done, there would be a lot more about setting
up topologies like I did for my Foundations of Python Network
Programming network of Docker containers.  More about making routers and
firewalls that NAT and so forth.  But, at least for this draft, I think
that setting up subnets and setting up point-to-point links is most of
what Docker users will need unless they are doing something exotic.

We can always expand later.

Docker-DCO-1.1-Signed-off-by: Brandon Rhodes <brandon@rhodesmill.org> (github: brandon-rhodes)

Improve networking.md documentation per @jamtur01

Besides catching some typos and awkward sentences, @jamtur01 had several
more thorough changes to suggest:

 *  He illustrated the correct way to delimit "Note" paragraphs in
     Docker documentation.

 *  He helped point out where I was presuming an Ubuntu host running
    Docker, so that I could re-word those sections to be specific that
    the advice only applied to Ubuntu (these mostly related to how to
    set server-wide options and restart the server).

 *  He is happy to have "Ethernet" capitalized even where Linux
    documentation would render it with an ugly lower-case first letter.

Docker-DCO-1.1-Signed-off-by: Brandon Rhodes <brandon@rhodesmill.org> (github: brandon-rhodes)

Improve networking.md per ideas from @SvenDowideit

A response to a bit of further discussion of pull request #5884.
Upstream-commit: ca9c35cdf772ddb121447b3877dbcf8caa4c5cdb
Component: engine
 2014-05-18 21:58:39 -04:00
James Turnbull
a370795c17 Merge pull request #5883 from jamtur01/debianinst 
Added basic Debian installation page
Upstream-commit: 3b96078856b935bf634eab0c4c449dce34cfdf7e
Component: engine
 2014-05-18 19:02:48 -04:00
James Turnbull
dc955f4ca7 Fixed sudo section to match Debian installation doc 
Docker-DCO-1.1-Signed-off-by: James Turnbull <james@lovedthanlost.net> (github: jamtur01)
Upstream-commit: f8974b5cfc87f7775019e3df2d09ad68f2119772
Component: engine
 2014-05-18 18:55:58 -04:00
James Turnbull
35afe10f75 Added basic Debian installation page 
Docker-DCO-1.1-Signed-off-by: James Turnbull <james@lovedthanlost.net> (github: jamtur01)
Upstream-commit: 88afc8992f2ebd2fd95d87dfff720ff946183975
Component: engine
 2014-05-18 18:55:36 -04:00
Adam Singer
876c525e4c removing grep command that depends on perl, better for boot2docker 
Docker-DCO-1.1-Signed-off-by: Adam Singer <financeCoding@gmail.com> (github: financeCoding)
Upstream-commit: 7f9178c6d15417ed8b32976b7ca075422c8160da
Component: engine
 2014-05-18 10:02:39 -07:00
Alexandr Morozov
823bf4bfec Check uid ranges 
Fixes #5647
Docker-DCO-1.1-Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com> (github: LK4D4)
Upstream-commit: 72d1e40c4a3b190319cfa5cb44b5e6f1694100fc
Component: engine
 2014-05-18 20:49:08 +04:00
O.S. Tezer
fc1241ce1d Merge pull request #5882 from jamtur01/ubfix 
Fixed description and keywords on Ubuntu installation docs
Upstream-commit: f65db7c565ed736e26fc9daa30b1bc526351e70b
Component: engine
 2014-05-18 17:26:29 +01:00
Adam Singer
3103867f6f command line nit 
Upstream-commit: 21e36ab36cd0beb192ce95469639f659b4877641
Component: engine
 2014-05-17 22:04:41 -07:00
Jonathan McCrohan
95b5064ed6 client: Rip out HTTP check from docker version 
For background to this change please see:
https://github.com/dotcloud/docker/issues/4802
https://github.com/dotcloud/docker/pull/5670

Docker-DCO-1.1-Signed-off-by: Jonathan McCrohan <jmccrohan@gmail.com> (github: jmccrohan)
Upstream-commit: 3cec63d56f9de6332aa3f33502695283d4feb054
Component: engine
 2014-05-18 02:22:22 +01:00
Jonathan McCrohan
32ad2ac698 client: rearrange docker version output 
Rearrange docker version output so that server output matches client
output

Docker-DCO-1.1-Signed-off-by: Jonathan McCrohan <jmccrohan@gmail.com> (github: jmccrohan)
Upstream-commit: 82712ed67ef9c189ccc8837ef8469272c91f6fcf
Component: engine
 2014-05-18 01:49:58 +01:00
James Turnbull
d0caec517c Fixed description and keywords on Ubuntu installation docs 
Docker-DCO-1.1-Signed-off-by: James Turnbull <james@lovedthanlost.net> (github: jamtur01)
Upstream-commit: a52db7d8802f3cfd8a88e1bcf0a25f59458f7558
Component: engine
 2014-05-17 22:18:08 +02:00
James Turnbull
72f6d9b1b0 Merge pull request #5850 from rhatdan/fixmanpage 
Add description of --volume read-only/read-write to docker-run man page.
Upstream-commit: 9405a58e99636f7d21e1442b90d3b4a9fdcac5bb
Component: engine
 2014-05-17 10:50:18 +02:00
O.S. Tezer
96be0f9c84 Merge pull request #5832 from stevenburgess/documentation_cli_fix 
Refactor b.tar -> busybox.tar
Upstream-commit: 4dabca90464f572f5a9ebeae3bdba8e77f6a353b
Component: engine
 2014-05-17 09:42:20 +01:00
Solomon Hykes
da923b63c2 Make Cristian maintainer of integration-cli (he wrote it) 
Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com> (github: shykes)
Upstream-commit: ab6027324d1b31d3f8fb880a014091435b68dd07
Component: engine
 2014-05-16 19:03:08 -07:00
Michael Crosby
e1c7159b65 Merge pull request #5863 from vieux/pr5862 
Make libcontainer's CapabilitiesMask into a []string (Capabilities). + 	add support for CAP_FOWNER
Upstream-commit: cc84dd09676623961ef8dd2d7a415e10323ef9c3
Component: engine
 2014-05-16 18:23:50 -07:00
Victor Vieux
06d0a8ebde Merge pull request #5827 from vieux/fix_multiple_events_on_same_computer 
allow 2 docker events to be opened on the same computer over unix socket
Upstream-commit: 9e7757a3d25947d5ef8f8882baae0bacd6fb1f49
Component: engine
 2014-05-16 18:17:46 -07:00
Victor Vieux
cc28bc2288 add support for CAP_FOWNER 
Docker-DCO-1.1-Signed-off-by: Victor Vieux <vieux@docker.com> (github: vieux)
Upstream-commit: a0070f0c17b4f65bdfc5368b93d0fa8636eda03d
Component: engine
 2014-05-17 01:16:07 +00:00
Victor Marmol
e3742d2641 Make libcontainer's CapabilitiesMask into a []string (Capabilities). 
Docker-DCO-1.1-Signed-off-by: Victor Marmol <vmarmol@google.com> (github: vmarmol)
Upstream-commit: 92614928cecd48b241011e614fa856c4fdbac1f6
Component: engine
 2014-05-17 00:44:10 +00:00
Victor Vieux
0763a3738d Merge pull request #5761 from SvenDowideit/pr_out_tell_the_user_not_to_run_from_osx 
tell the user not to run -d from OSX
Upstream-commit: 704e9f9ff0e5af18938085298a0f6f69262d693a
Component: engine
 2014-05-16 16:52:08 -07:00
unclejack
d17f841625 add test for issue #5270 
Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com> (github: unclejack)
Upstream-commit: f5b1afae74a62ba9a4c89f3372dd6e5e5cb89dbf
Component: engine
 2014-05-17 02:38:29 +03:00
unclejack
237489fbeb use ValidateContextDirectory to validate context 
This commit makes the Docker cli client use ValidateContextDirectory
before attempting to create a tarball out of the context. This ensures
we avoid errors such as "unexpected EOF" during the upload of the
context.

This check is done before uploading any data and can save time and
bandwidth for remote Docker daemons.

Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com> (github: unclejack)
Upstream-commit: 33d5b38d62f48edcadbe239595e242300f3ecd27
Component: engine
 2014-05-17 02:38:29 +03:00
unclejack
e59443d033 add ValidateContextDirectory to utils/utils.go 
This commit adds a function which can be used to ensure all contents of
a directory can be accessed.

This function doesn't follow symlinks to check if they're pointing to
files which exist. Such symlinks can be useful later.

Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com> (github: unclejack)
Upstream-commit: 1dedcd0d376f57abae5cadd38116c1aca2821330
Component: engine
 2014-05-17 02:38:28 +03:00
unclejack
9195f7ed61 integcli: resolve full path to docker binary 
Setting dockerBinary to the full path of the Docker binary is a good
idea and this is now done in the test code.

Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com> (github: unclejack)
Upstream-commit: 46578a2359714e32d61af4efaeea86b7ff770359
Component: engine
 2014-05-17 02:38:28 +03:00
Guillaume J. Charmes
4d36898842 Merge pull request #5851 from proppy/archive-simple-detect 
archive: simplify DetectCompression
Upstream-commit: 6f651ec62bdb7b00dc286414c1807a4ae4216058
Component: engine
 2014-05-16 16:32:55 -07:00
Michael Crosby
add055e2b6 Merge pull request #5822 from creack/update_vendors 
Update archive/tar vendored
Upstream-commit: eb61a1f73a979cc12e5ec1e6f451ec4dc4e37817
Component: engine
 2014-05-16 16:31:37 -07:00
Johan Euphrosine
25b0a0131e archive: add missing bytes package 
Docker-DCO-1.1-Signed-off-by: Johan Euphrosine <proppy@google.com> (github: proppy)
Upstream-commit: 4a3aefbb5232433098c9d27423a10031eb17ff93
Component: engine
 2014-05-16 16:26:28 -07:00
Johan Euphrosine
1976c1713a archive: fix panic if len(source) < len(m) 
Docker-DCO-1.1-Signed-off-by: Johan Euphrosine <proppy@google.com> (github: proppy)
Upstream-commit: 67ce59a806007cd28d96fd11208c4a113d1b92e0
Component: engine
 2014-05-16 16:25:56 -07:00
Johan Euphrosine
c1c5dca31c archive: simplify DetectCompression 
Docker-DCO-1.1-Signed-off-by: Johan Euphrosine <proppy@google.com> (github: proppy)
Upstream-commit: 3118952e0a63b42b830fc846a56b891d14902976
Component: engine
 2014-05-16 16:25:56 -07:00
Victor Vieux
8003cf19d2 do not merge -i or -t options 
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com> (github: vieux)
Upstream-commit: 2c8b63cb754128a64083426e5c3e6016118e78df
Component: engine
 2014-05-16 22:31:16 +00:00
Victor Vieux
a03989227c add test 
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com> (github: vieux)
Upstream-commit: 366f084eb0864db6dcf5cc47e434b3c6f43500d7
Component: engine
 2014-05-16 22:23:32 +00:00
Victor Vieux
ed8430a340 Merge pull request #5571 from vieux/fix_race_docker_daemon 
Fix race docker daemon
Upstream-commit: 00ce30bc7473b389579a44e55a01c818ebae84e1
Component: engine
 2014-05-16 13:57:43 -07:00
Victor Vieux
4dfcc75b6e Merge pull request #5853 from proppy/update-tarfilter-comment 
archive: update TarFilter comments
Upstream-commit: 1adc2fa533ad86be3ff3e122feaa3d798f130a2e
Component: engine
 2014-05-16 13:06:12 -07:00
Victor Vieux
0eaa2babd7 Merge pull request #5436 from hobofan/master 
reapply Cmd value even if CmdAdd returns early
Upstream-commit: 4b587ac118284fbbc9b10c20319b2dd8c20d4b4f
Component: engine
 2014-05-16 12:45:23 -07:00
Johan Euphrosine
3f955b3cac archive: update TarFilter comments 
Docker-DCO-1.1-Signed-off-by: Johan Euphrosine <proppy@google.com> (github: proppy)
Upstream-commit: 311614952ea64315075d827c880debbdfb503640
Component: engine
 2014-05-16 12:44:42 -07:00
Dan Walsh
09681d4edc Add description of --volume read-only/read-write to docker-run man page. 
Docker-DCO-1.1-Signed-off-by: Dan Walsh <dwalsh@redhat.com> (github: rhatdan)
Upstream-commit: 2e0d47e5c4c63323623c38cf0ca8d63efab8b493
Component: engine
 2014-05-16 15:06:34 -04:00
Michael Crosby
538811ef9a Merge pull request #5833 from ActiveState/fix_nsinit_env_panic 
fix panic when passing empty environment
Upstream-commit: 62c3183fc88779479905df8c2f7561c46a08d2ee
Component: engine
 2014-05-16 12:03:26 -07:00
Sridhar Ratnakumar
919aaa7d95 fix panic when passing empty environment 
Docker-DCO-1.1-Signed-off-by: Sridhar Ratnakumar <github@srid.name> (github: srid)
Upstream-commit: d787f2731e4242f244e88f047032ad9650f1f8d7
Component: engine
 2014-05-16 11:55:34 -07:00
Victor Marmol
25e8afd42a Merge pull request #5810 from vmarmol/drop-caps 
Change libcontainer to drop all capabilities by default.
Upstream-commit: 01d10d6f13d62d74f850fea2a685b24b7983244e
Component: engine
 2014-05-16 11:51:41 -07:00
Michael Crosby
44fdfa90b2 Merge pull request #5396 from lalyos/5370-infinite-loop-caused-by-symlink 
5370 infinite loop caused by symlink
Upstream-commit: 23062e55fd0eb75f28ff74e3de46bc3e15b0280f
Component: engine
 2014-05-16 11:28:37 -07:00
Victor Vieux
c2681da5e2 Merge pull request #5841 from unclejack/run_pull_latest 
run: pull only latest when no tag specified
Upstream-commit: 808d28033b981188a3856098e9e3d6b96a9b9a53
Component: engine
 2014-05-16 11:21:29 -07:00