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
14,901 Commits 12 Branches 297 Tags
5a2fc18d125bbe8447d4a7fb60f86ab76faeee50
Commit Graph

14901 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jessie Frazelle
5a2fc18d12 Merge pull request #12556 from icecrime/update_release_checklist 
Update release checklist
Upstream-commit: 23ec4cab60c749bef7222beb131fa54aed1d9ad4
Component: engine
 2015-04-20 16:31:40 -07:00
Arnaud Porterie
77ca39f0a0 Early API version bump 
Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com>
Upstream-commit: a8253ec7e7ec13c81d5195ddfe3cf2571ce6afff
Component: engine
 2015-04-20 15:52:26 -07:00
Arnaud Porterie
9d30ecdb29 Merge pull request #9381 from lebauce/default-gateway 
Proposal: Allow specifying a default gateway for bridge networking
Upstream-commit: 9838242db1890ae82dd63a6aae134147c74933ef
Component: engine
 2015-04-20 15:50:35 -07:00
Jessie Frazelle
d19796473e Merge pull request #12416 from ya7ya/patch-1 
adding elementary OS to install script
Upstream-commit: d5dc565432424eaf301687f9409a984246456e79
Component: engine
 2015-04-20 14:50:16 -07:00
Phil Estes
e0b5db7169 Merge pull request #12450 from brahmaroutu/integration_test3_12255 
Port test from integration tests - test low memory on create
Upstream-commit: 435643545c4b2c90e2a0a264527f6cc190d925cb
Component: engine
 2015-04-20 17:27:17 -04:00
moxiegirl
d92e1d8ce7 Merge pull request #12559 from moxiegirl/fix-12555-rnotes 
Adding in 1.60 release notes
Upstream-commit: 27fc39fdc07db415478f4478a3681b8f1fbff27b
Component: engine
 2015-04-20 14:18:48 -07:00
Mary Anthony
3d767d2ff0 Adding in 1.60 release notes 
Updating with thaJetzah's comments
Adding in Fred's copy edits

Signed-off-by: Mary Anthony <mary@docker.com>
Upstream-commit: 1f4ef5192c05723e231acc47813c4c8455a0166b
Component: engine
 2015-04-20 13:31:22 -07:00
moxiegirl
9bc2d6ce93 Merge pull request #12414 from draghuram/projectdoc 
Improve documentation in "project" directory.
Upstream-commit: f85eb4baadd810b27ff9bff0d23361afc6d08153
Component: engine
 2015-04-20 13:16:20 -07:00
Alexander Morozov
d6cf7ae01f Merge pull request #12009 from duglin/AddConfig 
Migrate .dockercfg to .docker/config.json and support for HTTP Headers
Upstream-commit: 08ef006d178b7a869c9dfc05c8b887316a856445
Component: engine
 2015-04-20 13:12:17 -07:00
Doug Davis
44c88b9112 Add .docker/config.json and support for HTTP Headers 
This PR does the following:
- migrated ~/.dockerfg to ~/.docker/config.json. The data is migrated
  but the old file remains in case its needed
- moves the auth json in that fie into an "auth" property so we can add new
  top-level properties w/o messing with the auth stuff
- adds support for an HttpHeaders property in ~/.docker/config.json
  which adds these http headers to all msgs from the cli

In a follow-on PR I'll move the config file process out from under
"registry" since it not specific to that any more. I didn't do it here
because I wanted the diff to be smaller so people can make sure I didn't
break/miss any auth code during my edits.

Signed-off-by: Doug Davis <dug@us.ibm.com>
Upstream-commit: 18c9b6c6455f116ae59cde8544413b3d7d294a5e
Component: engine
 2015-04-20 13:05:24 -07:00
Alexander Morozov
9d60a63dde Merge pull request #12561 from sergeyevstifeev/12549-fix-test-requires-network 
Add missing testRequires(t, Network)
Upstream-commit: cfe7c9c1b24a965985eb54d10fa114e339a95e0b
Component: engine
 2015-04-20 12:58:30 -07:00
Sergey Evstifeev
3d762e6cee Add missing testRequires(t, Network) 
Fixes #12552

Signed-off-by: Sergey Evstifeev <sergey.evstifeev@gmail.com>
Upstream-commit: 716e21be2b9780306cc1ffe02b2a784e2dece94e
Component: engine
 2015-04-20 21:19:50 +02:00
Alexander Morozov
6f3b598444 Merge pull request #12453 from runcom/style-minor-fixes 
Add minor stylistic fixes
Upstream-commit: a7690076c955d242b4590fcf557f15e1029d0c8b
Component: engine
 2015-04-20 11:51:04 -07:00
Phil Estes
8301d9df26 Merge pull request #12545 from coolljt0725/remove_rudundant_enter 
Remove redundant `\n` in daemon/daemon.go
Upstream-commit: 490a0bd697168997f21bd354a647df6eab2bd051
Component: engine
 2015-04-20 14:32:27 -04:00
Phil Estes
bd79229dd5 Merge pull request #12554 from buddhamagnet/12553-cli-doc-correction 
12553 fix typo
Upstream-commit: 53edce79f16816a165b5be9cd4ee05501c103c6f
Component: engine
 2015-04-20 14:30:51 -04:00
Phil Estes
fe6999471c Merge pull request #12495 from LK4D4/apiserver_refactoring 
Refactoring of api/server for reduce engine usage
Upstream-commit: f0016c5917a2f7baba20060aa4edfef5fb1e0a05
Component: engine
 2015-04-20 14:10:34 -04:00
Srini Brahmaroutu
97fb2745d9 Port test from integration tests 
Addresses #12255
Signed-off-by: Srini Brahmaroutu <srbrahma@us.ibm.com>
Upstream-commit: 1a35b16b08ef5a8b0764e5a383f36d5572f20dfe
Component: engine
 2015-04-20 17:57:53 +00:00
buddhamagnet
e52ab0e055 fix typo 
Signed-off-by: buddhamagnet <buddhamagnet@gmail.com>
Upstream-commit: cdd5d5e4c3fe241d178c09edb521ae91689b55df
Component: engine
 2015-04-20 18:56:21 +01:00
Raghuram Devarakonda
cf21a7328b Improve documentation in "project" directory. 
Signed-off-by: Raghuram Devarakonda <draghuram@gmail.com>
Upstream-commit: fcdb1fbfa1e691bbdfb73a289ff84fbf6b26fad6
Component: engine
 2015-04-20 13:08:13 -04:00
Alexander Morozov
47e2254d8e Make all http handlers api.server.Server methods 
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
Upstream-commit: da7bca449652396dd8a4a0ff2e303d3d3c7a58a2
Component: engine
 2015-04-20 09:45:31 -07:00
Alexander Morozov
2e27fa9e39 Make API server datastructure 
Added daemon field to it, will use it later for acces to daemon from
handlers

Signed-off-by: Alexander Morozov <lk4d4@docker.com>
Upstream-commit: d9ed3165228b60cb89c31d0d66b99e01ab83eb3e
Component: engine
 2015-04-20 08:13:39 -07:00
Alexander Morozov
932b7d41ce Make daemon initialization in main goroutine 
It is simplifies code and lead to next refactoring step, where daemon
will be incorporated to some structure which represents API.

Signed-off-by: Alexander Morozov <lk4d4@docker.com>
Upstream-commit: 181fea24aac7499a3d6dc0c8c9de67e6c0036140
Component: engine
 2015-04-20 08:13:39 -07:00
Alexander Morozov
3ad142821c Merge pull request #12537 from hqhq/hq_remove_unused_function 
remove unused function in server_unit_test.go
Upstream-commit: b5584ec24a6c711a842605dd9fbf5535e77ae878
Component: engine
 2015-04-20 07:51:53 -07:00
Alexander Morozov
6d0917e016 Merge pull request #12534 from Mashimiao/delete-unused-function-from-drive 
clenaup: delete unused function getEnv
Upstream-commit: d2ce1076a453ac1c016e5637eabae1d8f26cda9e
Component: engine
 2015-04-20 07:50:06 -07:00
Lei Jitang
2f9e9a0229 Remove redundant '\n' in daemon.go and correct the warning messages for memory swap 
Signed-off-by: Lei Jitang <leijitang@huawei.com>
Upstream-commit: 2d5ede67c098dd11803d502865ab546388f2a553
Component: engine
 2015-04-20 22:00:03 +08:00
Sylvain Baubeau
6f062d5e99 Allow specifying a default gateway for bridge networking 
Signed-off-by: Sylvain Baubeau <sbaubeau@redhat.com>
Upstream-commit: acb6127c1a3f7054c25d1468b67f2eb269f4ecbf
Component: engine
 2015-04-20 15:13:30 +02:00
Brian Goff
5f9567a9e8 Merge pull request #12266 from HuKeping/rmjob-info 
Remove Job from Info API
Upstream-commit: dacc0507f08b54b506f832e100a1e27e389508e7
Component: engine
 2015-04-20 07:10:57 -04:00
Hu Keping
899b777d56 Remove Job from Info API 
Two main things
- Create a real struct Info for all of the data with the proper types
- Add test for REST API get info

Signed-off-by: Hu Keping <hukeping@huawei.com>
Upstream-commit: f4942ed864f00a31591ef0257a971ef41ddd4c70
Component: engine
 2015-04-20 18:14:06 +08:00
Ma Shimiao
8b9e25d786 clenaup: delete unused function getEnv 
Signed-off-by: Ma Shimiao <mashimiao.fnst@cn.fujitsu.com>
Upstream-commit: e607bb49c48e0478b07fceb640d3e765151050e4
Component: engine
 2015-04-20 16:32:42 +08:00
Qiang Huang
5848586647 remove unused function in server_unit_test.go 
After engine refactor, some functions are no longer used.

Signed-off-by: Qiang Huang <h.huangqiang@huawei.com>
Upstream-commit: 641a7ec9ad61a42b255d203b7791198431761104
Component: engine
 2015-04-20 16:27:47 +08:00
Alexander Morozov
a45474f68d Merge pull request #12524 from RickWieman/12523-remove-redundant-else 
Removes redundant else in registry/session.go
Upstream-commit: b7950b725b846564fc944279e9ae21f852b5dd94
Component: engine
 2015-04-19 22:08:50 -07:00
Rick Wieman
0b57229dc6 Removes redundant else in registry/session.go 
Fixes #12523

Signed-off-by: Rick Wieman <git@rickw.nl>
Upstream-commit: 5f2b051ec5a2f639857a1628f3c994fbfd0b3da0
Component: engine
 2015-04-19 23:58:55 +02:00
Brian Goff
523cbfc000 Merge pull request #12521 from runcom/else-nit 
Refactor else branches
Upstream-commit: 24b89b70986c547b2dae15c5cf737fb7e8e416f3
Component: engine
 2015-04-19 16:36:39 -04:00
Doug Davis
14bae8f05b Merge pull request #12358 from ZJU-SEL/remove_job_from_tag 
remove job from tag
Upstream-commit: b1d8ae3824d2902c86d63837b8d413952b546d62
Component: engine
 2015-04-19 16:02:28 -04:00
moxiegirl
cd0d00e4c3 Merge pull request #12518 from moxiegirl/fix-12516-registry-doc 
Docker Registry Server > Docker Registry
Upstream-commit: 2e58350bd6f8c80f4d545bc00d83127d76ab991d
Component: engine
 2015-04-19 07:14:09 -07:00
moxiegirl
253cd30553 Merge pull request #12512 from ankushagarwal/document-binaries 
Document the download location of Linux, Windows and Mac OS X binaries
Upstream-commit: 547ded5df7622d1caf2e096d5b32a21c44b17ae6
Component: engine
 2015-04-19 07:12:45 -07:00
Antonio Murdaca
af8b6cc8bb Refactor else branches 
Signed-off-by: Antonio Murdaca <me@runcom.ninja>
Upstream-commit: 8655214b3dc8abb4edbca3db3e04557e09a1149b
Component: engine
 2015-04-19 15:32:54 +02:00
Brian Goff
9e36d6f575 Merge pull request #12432 from Mashimiao/optimize-code-to-clarify-loagic 
change code to clarify logic
Upstream-commit: 89092252f07604b7bc1f24fcf3314ed0d43916de
Component: engine
 2015-04-19 07:39:24 -04:00
Simei He
dd5f4141fe remove job from tag 
Signed-off-by: Simei He <hesimei@zju.edu.cn>
Upstream-commit: 99f6309b97041bf82cc845340734dc8e47977c8a
Component: engine
 2015-04-19 18:36:56 +08:00
Ankush Agarwal
714aa2e550 Document the download location of binaries 
Signed-off-by: Ankush Agarwal <ankushagarwal11@gmail.com>
Upstream-commit: 99251f60c2f554fc03ddc9e7b478de6bd5cf0b49
Component: engine
 2015-04-19 01:51:03 -07:00
Mary Anthony
d18c57d820 Docker Registry Server > Docker Registry 
Fixing registry index
Tested on beta and this redirect works

Signed-off-by: Mary Anthony <mary@docker.com>
Upstream-commit: 7b2b7df3866d0c0101e9367b7f4f63bfed5faac4
Component: engine
 2015-04-18 19:19:48 -07:00
moxiegirl
f90dca15af Merge pull request #12508 from Mic92/docs-speedup 
docs: speed up build by reducing build steps
Upstream-commit: 2bc3fb5149bdc3b63c338e76ed821d2d5444e9c1
Component: engine
 2015-04-18 10:41:31 -07:00
Jörg Thalheim
b527679d3d docs: speed up build by reducing build steps 
- should be also easier to maintain

Signed-off-by: Jörg Thalheim <joerg@higgsboson.tk>
Upstream-commit: bbe6df128802b22605f9eb079f105460ec78ac6f
Component: engine
 2015-04-18 13:28:52 +02:00
Doug Davis
9132395dda Merge pull request #12438 from ourcolorfuldays/fixtypo 
fix some typos
Upstream-commit: c158cdbe6f33667a49615c8ba1ff8e33e71d2228
Component: engine
 2015-04-18 07:17:55 -04:00
Arnaud Porterie
ad529b2798 Merge pull request #12466 from robertabbott/fix_dockerCmd 
Removed unnecessary error output from dockerCmd
Upstream-commit: 5fd378c0d1d97601c7cfab6a62bb8da031a0001d
Component: engine
 2015-04-17 15:15:34 -07:00
moxiegirl
ad230ae4a5 Merge pull request #12496 from moxiegirl/post-release-updates 
Updates to Compose docs and ENV vars
Upstream-commit: a313b729e48d0ca9d0085f407b136def162eaf4c
Component: engine
 2015-04-17 13:43:06 -07:00
Mary Anthony
f4a4f24956 Updates to Compose docs and ENV vars 
- Compose teamhad forgotten some documentation
- Updated ENV for Distribution also
- Forgot one of the readability sections

Signed-off-by: Mary Anthony <mary@docker.com>
Upstream-commit: 3a883672417fcb2b3ac0d57d992285849840bfb2
Component: engine
 2015-04-17 13:08:57 -07:00
Brian Goff
41c63ff3d3 Merge pull request #12490 from LK4D4/carry_12396 
remove job from pull and import
Upstream-commit: 055c6dbaefc61c597164aaedee4448bc32522b2e
Component: engine
 2015-04-17 15:26:30 -04:00
Brian Goff
8a7669d466 Merge pull request #12493 from kostickm/12491-update-message-graphdriver 
Updated message severity in graphdriver
Upstream-commit: 9922122fd467b3ba384801a059b05b00fd65998e
Component: engine
 2015-04-17 14:53:45 -04:00
Megan Kostick
26d411e68d Updated message severity in graphdriver 
Signed-off-by: Megan Kostick <mkostick@us.ibm.com>
Upstream-commit: cdc63ce5d032de593fc2fd13997311b316c0103b
Component: engine
 2015-04-17 10:56:12 -07:00