docker/cli
1
0
Fork 0
mirror of https://github.com/docker/cli.git synced 2026-01-23 15:21:32 +03:00
Code Activity
5,871 Commits 12 Branches 297 Tags
efeecbbbfbefb3285c1903ade7ff702ca858d73e
Commit Graph

5871 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Zilin Du
d17d5e16ae replace 127.0.0.1 by the assigned IP address in the container's /etc/hosts file. 
Upstream-commit: 7d95d300abd9d9cc811713e53fd41adec66f2e00
Component: engine
 2013-10-08 14:29:22 -07:00
Tianon Gravi
eb4a3a8402 Swap contrib MAINTAINERS 
Upstream-commit: 4fda3314d871a28e33b0d901d6ca3a6d987c8dfa
Component: engine
 2013-10-08 15:15:58 -06:00
Jonathan Rudenberg
6dfdc03073 Fix some error cases where a HTTP body might not be closed 
Refs #2126
Upstream-commit: e906485b07fbf32a2c38495651d907af6b229962
Component: engine
 2013-10-08 15:35:00 -04:00
Victor Vieux
bbfd951535 fix rm -v 
Upstream-commit: 1daf242c8bafa0447c099b0e49826667a8155c5c
Component: engine
 2013-10-08 16:35:47 +00:00
Johan Rydberg
537fcd112e Use correct auth config when logging in. 
Upstream-commit: 967010ae8c7eb2f6482a9245b42731b7ead61e4b
Component: engine
 2013-10-08 06:46:29 +02:00
Sven Dowideit
4878575100 use empty string so TempDir uses the OS's temp dir automatically (Closes #2117) 
Upstream-commit: d03022b9ca5e658e551ab3b9907da946b11a0b4c
Component: engine
 2013-10-08 13:24:20 +10:00
Andy Rothfusz
aa13b96b8a Insert popularity and boost docs results. 
Upstream-commit: 6d67ac2a1b93d6c95881cb2f17250a7a8279def6
Component: engine
 2013-10-07 17:51:07 -07:00
Solomon Hykes
22bcf655f6 Merge pull request #2103 from tianon/clean-out-fixme 
Clean out a few outdated FIXME items
Upstream-commit: 2d425af1b1675cfc6399d99a2b00f8efc219d7a9
Component: engine
 2013-10-07 15:19:01 -07:00
Andy Rothfusz
e57acec080 Merge pull request #2106 from mastahyeti/api_1.5_docs_whitespace 
Cleanup whitespace in API 1.5 docs
Upstream-commit: ed19693f50dec769daaa1d2c4dd702d0421e5d6c
Component: engine
 2013-10-07 13:23:55 -07:00
Tianon Gravi
e8211a620d Fix contrib/mkimage-debian.sh apt caching prevention 
Upstream-commit: ee27444098aa91d69f8df6dd07139b9637719b1d
Component: engine
 2013-10-07 13:41:10 -06:00
Andy Rothfusz
aca42d0e27 Merge pull request #2109 from shamrin/patch-4 
[docs] use angle brackets in MAINTAINER example email
Upstream-commit: 194c1dbbd81571da12b66831f3bb29be8913f0ea
Component: engine
 2013-10-07 12:18:44 -07:00
Alexey Shamrin
c5b5b5d5ad [docs] use angle brackets in MAINTAINER example email 
Upstream-commit: a9eac7eab4c9867114c94cace52d1c889c249293
Component: engine
 2013-10-07 20:29:54 +04:00
Ben Toews
a8d55bfe7b Cleanup whitespace in API 1.5 docs 
remove whitespace on blank lines
Upstream-commit: 7c28683f08a485916e748713b0697ea3eb84a9e2
Component: engine
 2013-10-06 19:52:18 -06:00
Daniel Mizyrycki
8cca5d988d Merge pull request #2061 from dotcloud/1948-test-detach 
testing, issue #1948: Increase TestRunDetach timeout
Upstream-commit: c18e849451a3f48cecb82a5747f131e310cb0433
Component: engine
 2013-10-06 13:26:44 -07:00
Tianon Gravi
0722c6f3b0 Clean out a few outdated FIXME items 
Upstream-commit: a665517151911866285e5a72164c5f2d2f31ba65
Component: engine
 2013-10-06 13:55:26 -06:00
Nick Stinemates
567344fa64 Add Developer Certificate of Origin Text 
We purposely chose to license Docker under the Apache 2.0 license. This is a well-known
license, which is popular for its permissive and flexible properties, while still
encouraging a collaborative community. It also makes certain representations with regard
to contributions, and the rights given to contributors, the project, people who use Docker,
people who modify Docker, etc.

This approach to contributions is inspired by the popular Linux Developer
"Certificate of Origin". This approach makes it simple for new contributors to get started,
and avoids bureaucracy in tracking contributions and contributors.

To indicate accordance, each individual contribution to the Project is signed off by the
developer, using his or her real name, email address, and github handle in the format below:

	Docker-DCO-1.0-Signed-off-by: Joe Smith <joe.smith@email.com>
Upstream-commit: 821a82ac6ceffd7001b80769ba23b81a7e4a81ad
Component: engine
 2013-10-04 14:27:26 -07:00
Ken Cochrane
345077d21b added initial draft of the Docker infrastructure doc 
Upstream-commit: 0d3c899528f00f222080915e800388f5d2821861
Component: engine
 2013-10-04 15:12:40 -04:00
Andy Rothfusz
d54ac9648d Merge pull request #2084 from makeusabrew/patch-1 
Fix help text for -v option
Upstream-commit: 863eebe7bd7d5f9ac9f49619643078ea540154ff
Component: engine
 2013-10-04 09:29:56 -07:00
Victor Vieux
7bc3cd3dbe Merge pull request #2087 from alexlarsson/device-mapper-test 
Device mapper test branch update
Upstream-commit: f6913592a12b0ae98b4f2c9132da7101f74b859a
Component: engine
 2013-10-04 07:54:43 -07:00
Alexander Larsson
b3baf515e4 Tests: Initialize devicemapper early to avoid it happening in a test 
This can take a while and may cause some tests to timeout
Upstream-commit: aaf1f73bcc2c594f07254a98ff77de3cc6351e92
Component: engine
 2013-10-04 15:47:43 +02:00
Alexander Larsson
a29076830e hack: Don't just run the "TestRunHostname" test 
Upstream-commit: 9b65c7cf49feacad61cdcd11d2b002319a6b6bae
Component: engine
 2013-10-04 15:38:47 +02:00
Alexander Larsson
850aea64f1 Remove overly spewy Debugf 
Upstream-commit: f7e374fb3a51bd25e61ae6c4343838a0ca756fba
Component: engine
 2013-10-04 15:36:30 +02:00
Nick Payne
d30e1ed4d3 Fix help text for -v option 
Upstream-commit: 3c5350ba922dd6611dab714db82cdd2d0210f5c5
Component: engine
 2013-10-04 10:26:57 +01:00
Tianon Gravi
3e9f502097 Merge pull request #1876 from asbjornenge/master 
Added Dockerfile.tmLanguage to contrib
Upstream-commit: c52c95f97fe3a596d3114be88d5593f6fb8dba34
Component: engine
 2013-10-03 23:52:37 -07:00
Asbjørn Enge
531e0dc8b0 Added Dockerfile.tmLanguage to contrib 
Upstream-commit: 85a51396657945613141abb8a521e118db15afe3
Component: engine
 2013-10-04 08:45:15 +02:00
Guillaume J. Charmes
baed3230a9 Small fixes 
Upstream-commit: f29c500d8d480547874425ba98a9381fdc9df89e
Component: engine
 2013-10-03 18:05:07 -07:00
Guillaume J. Charmes
ff1de35e89 Small fixes 
Upstream-commit: b8439987184df45ee9571f9eb9d607518d96aeb8
Component: engine
 2013-10-03 18:04:14 -07:00
Michael Crosby
52102a8dde Merge pull request #1832 from dotcloud/26-default_r_flag 
Autorestart containers by default
Upstream-commit: ad4b09cdb833e5ed423d033f5abb6a3b1d567082
Component: engine
 2013-10-03 15:59:58 -07:00
Victor Vieux
3ce3024fa4 keep -r, but default true 
Upstream-commit: e594c788e4f42d4878c1b3d16139db0291ed830c
Component: engine
 2013-10-03 22:42:35 +00:00
Victor Vieux
c5e3b824b5 add missing error check 
Upstream-commit: f84dc1e90858924f9fafe89e81005842a6b4f166
Component: engine
 2013-10-03 22:33:00 +00:00
Michael Crosby
c443ca5ca0 Merge pull request #1990 from modcloth-labs/more-tests-for-auth-registry-resolution 
Adding more tests around `auth.ResolveAuthConfig`
Upstream-commit: 826aaa0e9bb9625fc8a1accfcc566f06baf0223f
Component: engine
 2013-10-03 14:45:02 -07:00
Alexander Larsson
78b0694228 Make sure we mark the libdevmapper /dev/mapper/control fd CLOEXEC 
We do a hack to mark it such, because otherwise lxc-start will not
work.
Upstream-commit: 1a1be5a87c2169def7b0b0c29fc5cbac850a00a5
Component: engine
 2013-10-03 21:00:16 +02:00
Alexander Larsson
c413093856 Be better at cleaning up leftover from earlier test runs 
When running the test inside a docker container we sometimes are left with
leftover device nodes for device mapper devices that no longer exist.
We were panic:ing in this case, but with this change we just remove such
nodes.
Upstream-commit: 7b58e15b08349dba35bf3813f77a0b900c2e4df5
Component: engine
 2013-10-03 19:54:14 +02:00
Victor Vieux
34abbb9020 Add test 
Upstream-commit: 1328be7c299417aa8c8740ac4901a978724afa9b
Component: engine
 2013-10-03 15:21:14 +00:00
Guillaume J. Charmes
7dc11f73be Random improvments 
Upstream-commit: 8b2f4aab232880cb0d7faa18ae12adb33f483b2c
Component: engine
 2013-10-02 20:18:15 -07:00
Tianon Gravi
788a1fc558 Update Dockerfile and hack to support compiling device-mapper code statically (using go1.2rc1) 
Upstream-commit: 06d0843a61843e6b16a56d518e21032a5652098b
Component: engine
 2013-10-03 10:32:47 -06:00
Victor Vieux
e87cd90363 rebase 
Upstream-commit: deb05a36e8cb0361c7900b128e594cd6db06ba73
Component: engine
 2013-10-03 15:49:28 +00:00
Victor Vieux
705988989e disable: don't create device nodes manually if udev is not availabile as we don't have it in dind 
Upstream-commit: 55189307d0ec6992f76572fae675bd371cc36cff
Component: engine
 2013-10-03 15:47:38 +00:00
Andy Rothfusz
716ed9c609 Fix #2017 Merge branch '2017-api-details' 
Upstream-commit: ff4f32d58f64ee7fc8bab26bc0dd410fb1c7dc5e
Component: engine
 2013-10-02 18:20:44 -07:00
Andy Rothfusz
0d5f83ca5f Merge branch 'hint-api-details' of git://github.com/cdunklau/docker into 2017-api-details 
Conflicts:
	docs/sources/api/docker_remote_api.rst
Upstream-commit: 462ac1efcfbbe32a57f1178b28d0bc1733b86675
Component: engine
 2013-10-02 18:18:46 -07:00
Solomon Hykes
6963be7e37 Merge pull request #2015 from dsissitka/1927 
Configured FPM to make /etc/init/docker.conf a config file.
Upstream-commit: 1332f400f7281aa726e4148b0831e5ccfec14a4d
Component: engine
 2013-10-02 18:18:16 -07:00
Solomon Hykes
02e5d0abf7 Merge pull request #2069 from philips/add-xz-to-runtime-dependencies 
fix(hack/PACKAGERS): add xz utils as a runtime dep
Upstream-commit: a292c04ddb3d61f17f191c2eb57d0e6af5c5baea
Component: engine
 2013-10-02 17:37:56 -07:00
Andy Rothfusz
6087f9fa5b Merge pull request #2060 from mastahyeti/patch-1 
Add `apt-get install curl` to Ubuntu docs
Upstream-commit: 37c4513cf91c73c01f8ebdf148c22f157499e592
Component: engine
 2013-10-02 16:46:00 -07:00
Andy Rothfusz
2727640067 Merge pull request #2063 from dhrp/doc-template-fix 
Doc template fix
Upstream-commit: b584c21ca419d81cdce86089bca3ee163540102e
Component: engine
 2013-10-02 16:31:47 -07:00
Andy Rothfusz
dfb1941bb6 Merge pull request #2073 from tianon/gentoo-no-more-1422-hack 
Remove Gentoo install notes about #1422 workaround
Upstream-commit: c92507341dce1ffcd4e59aca945e0e74dae57041
Component: engine
 2013-10-02 16:24:11 -07:00
Andy Rothfusz
e12efc74cd Merge pull request #2065 from kyleconroy/fix_ping_endpoint 
Fix Ping endpoint documentation
Upstream-commit: 9f0feaa2e1b69f085631ed8397471c125df9f0a1
Component: engine
 2013-10-02 16:22:49 -07:00
Ben Toews
742265d87b Update ubuntu docs to use wget instead of curl 
Ubuntu doesn't come with curl.

wget instead of curl

nicer wget syntax

remove /dev/null
Upstream-commit: 0f830aa431b513d5ac2ee4f9e1239d860bbb4a01
Component: engine
 2013-10-02 16:27:34 -06:00
Tianon Gravi
f1f4164997 Remove Gentoo install notes about #1422 workaround 
Upstream-commit: 5f05cb481760d551dcc3607b3c4dd48897b59cbd
Component: engine
 2013-10-02 16:06:22 -06:00
Michael Crosby
7e8f18e24f Merge pull request #2066 from tianon/vendor-bump-kr-pty 
Bump vendor kr/pty to commit 3b1f6487b (syscall.O_NOCTTY)
Upstream-commit: 4778039dd2724accdba870cdaf1315d34bb67831
Component: engine
 2013-10-02 14:44:07 -07:00
Guillaume J. Charmes
28014b74a7 Merge pull request #2014 from alexlarsson/allow_set_file_cap 
* Runtime: lxc: Allow set_file_cap capability in container
Upstream-commit: b180770b1de71f6863cfc6cfd3896a574348c018
Component: engine
 2013-10-02 14:38:50 -07:00