docker
/
docs
mirror of https://github.com/docker/docs.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
2,925 Commits 25 Branches 28 Tags 827 MiB
Commit Graph

2925 Commits

Author SHA1 Message Date
Victor Vieux a213794b55 Merge pull request #2114 from vieux/GOOS_dockerfile 
Add GOOS buildarg in dockerfile
 2016-04-12 21:59:32 -07:00
Victor Vieux 418118057d Add GOOS buildarg in dockerfile 
Signed-off-by: Victor Vieux <vieux@docker.com>
 2016-04-12 17:14:22 -07:00
Nishant Totla 767c182562 Merge pull request #2113 from kencochrane/doc_typo_fix 
Fixed a couple typos in the docs
 2016-04-12 14:42:01 -07:00
Ken Cochrane 08cacffd97
Fixed a couple typos in the docs 
Signed-off-by: Ken Cochrane <KenCochrane@gmail.com>
 2016-04-12 17:26:30 -04:00
Dongluo Chen 4ff0b10435 Merge pull request #2103 from dongluochen/bump-v1.2.0-rc3 
Bump version to v1.2.0-rc3
 2016-04-08 15:10:47 -07:00
Dong Chen 621cf86cfb Bump version to v1.2.0-rc3 
Signed-off-by: Dong Chen <dongluo.chen@docker.com>
 2016-04-08 14:54:53 -07:00
Victor Vieux 6404badef1 Merge pull request #2102 from nishanttotla/fix-httpclientandscheme-signature 
Returning and handling error from HTTPClientAndScheme
 2016-04-08 14:37:00 -07:00
Nishant Totla 1dee9cb3f0 Returning and handling error from HTTPClientAndScheme 
Signed-off-by: Nishant Totla <nishanttotla@gmail.com>
 2016-04-08 13:36:06 -07:00
Alexandre Beslic 42fc136b39 Merge pull request #2095 from vieux/fix_cleanup_test_master 
fix restart docker in tests
 2016-04-07 17:28:40 -07:00
Alexandre Beslic 336719a774 Merge pull request #2089 from vieux/fix_possible_data_race 
fix possible data race with failure count
 2016-04-07 17:15:31 -07:00
Dongluo Chen 34d4cae503 Merge pull request #2050 from abronan/fix_session_consul_leader_failure 
Fix Consul Leader Election Failure on multi-server and leader soft-restart
 2016-04-07 14:18:52 -07:00
Victor Vieux aaa10d16b7 fix restart docker in tests 
Signed-off-by: Victor Vieux <vieux@docker.com>
 2016-04-07 14:14:25 -07:00
Victor Vieux 69eabdc81f fix possible data race with failure count 
Signed-off-by: Victor Vieux <vieux@docker.com>
 2016-04-07 13:35:27 -07:00
Alexandre Beslic ac6341066d Fix Consul Leader Election Failure on multi-server 
This fixes an error with Consul which fails to see a new
swarm leader after a consul leader soft restart because
of session renewal and missing status update.

Signed-off-by: Alexandre Beslic <alexandre.beslic@gmail.com>
 2016-04-07 12:23:47 -07:00
Victor Vieux 75b3569594 Merge pull request #1995 from allencloud/validate-overcommitRatio-not-to-be-negative 
validate swarm.overcommit and add integration test for cluster options
 2016-04-06 18:26:19 -07:00
Sun Hongliang d403254ed2 1.validate cluster option swarm.overcommit 
2.change swarm.createretry's error info and add its integration test
Signed-off-by: Sun Hongliang <allen.sun@daocloud.io>
 2016-04-07 09:00:41 +08:00
Dongluo Chen 335b2edda3 Merge pull request #2093 from vieux/do_not_go_get_vet 
do not go get vet in travis
 2016-04-06 17:58:25 -07:00
Victor Vieux 6d2a411818 do not go get vet in travis 
Signed-off-by: Victor Vieux <vieux@docker.com>
 2016-04-06 17:48:17 -07:00
Victor Vieux ee30452059 Merge pull request #2080 from allencloud/log-warn-when-getting-engine-label-named-node 
send warn message if got an engine with label "node"
 2016-04-06 17:20:09 -07:00
Victor Vieux e7077ff5e3 Merge pull request #2074 from allencloud/log-err-when-remove-fails-in-rescheduling 
log err when remove container fails in rescheduling
 2016-04-06 11:13:05 -07:00
moxiegirl ba9b348bda Merge pull request #2046 from allencloud/fix-typos-in-docs 
fix typos in docs
 2016-04-06 09:17:02 -07:00
Sun Hongliang b6f646cacd log err when remove container fails in rescheduling 
Signed-off-by: Sun Hongliang <allen.sun@daocloud.io>
 2016-04-06 14:23:09 +08:00
Dongluo Chen 08090d51f8 Merge pull request #2090 from HackToday/fixolddoc 
Fix old NODE column
 2016-04-05 18:49:05 -07:00
Kai Qiang Wu(Kennan) 2a778b3600 Fix old NODE column 
Some fixes was missed in last PR.

Signed-off-by: Kai Qiang Wu(Kennan) <wkqwu@cn.ibm.com>
 2016-04-06 01:39:39 +00:00
Victor Vieux 1f61d438de Merge pull request #2088 from HackToday/fixolddoc 
Fix doc for NODE column
 2016-04-05 17:48:49 -07:00
Kai Qiang Wu(Kennan) 8afd32a631 Fix doc for NODE column 
Swarm docker ps output nolonger have NODE column, So this updates the doc

Fixes: #2081
Signed-off-by: Kai Qiang Wu(Kennan) <wkqwu@cn.ibm.com>
 2016-04-06 00:41:55 +00:00
Victor Vieux d0cd5ea554 Merge pull request #2077 from nishanttotla/update-engine-api-backward-compat 
Updating apiClient version based on engine version
 2016-04-05 12:28:33 -07:00
Nishant Totla 012dffeee3 Updating apiClient version using server version 
Signed-off-by: Nishant Totla <nishanttotla@gmail.com>
 2016-04-05 11:25:17 -07:00
Nishant Totla cbb7c27621 Updating Godeps (engine-api) 
Signed-off-by: Nishant Totla <nishanttotla@gmail.com>
 2016-04-05 09:16:50 -07:00
Sun Hongliang 65a5d54727 send warn message if got an engine with label "node" 
Signed-off-by: Sun Hongliang <allen.sun@daocloud.io>
 2016-04-05 11:33:43 +08:00
Alexandre Beslic cdb3a59493 Merge pull request #2069 from vieux/increase_timeout 
increate timeout in 'leader election - rescheduling' test
 2016-04-04 12:07:13 -07:00
Sun Hongliang bb4a26f238 fix typos in docs 
Signed-off-by: Sun Hongliang <allen.sun@daocloud.io>
 2016-04-04 14:27:14 +08:00
Dongluo Chen 6006693add Merge pull request #2071 from dongluochen/bump-1.2.0-rc2 
Bump version to 1.2.0-rc2
 2016-04-01 16:09:28 -07:00
Dong Chen 4a256436fe Bump version to 1.2.0-rc2 
Signed-off-by: Dong Chen <dongluo.chen@docker.com>
 2016-04-01 16:00:23 -07:00
Nishant Totla ccb2bea9cf Merge pull request #2068 from vieux/engine_api_network_create 
use engine-api for network operations
 2016-04-01 13:53:45 -07:00
Victor Vieux 2906a670a3 Merge pull request #2060 from allencloud/fix-typos 
fix typos
 2016-03-31 15:50:05 -07:00
Victor Vieux 7c1dcadb98 Merge pull request #2065 from dongluochen/UpdateEngineApi 
Update engine-api
 2016-03-31 11:02:33 -07:00
Dong Chen b50529ccce Update engine-api. 
Signed-off-by: Dong Chen <dongluo.chen@docker.com>
 2016-03-31 09:52:19 -07:00
Sun Hongliang 07a47d54a4 fix typos 
Signed-off-by: Sun Hongliang <allen.sun@daocloud.io>
 2016-03-31 13:52:01 +08:00
Alexandre Beslic 248cc597c0 Merge pull request #2053 from allencloud/make-port-0-in-checkAddrFormat-invalid 
make port 0 invalid in checkAddrFormat
 2016-03-30 14:09:03 -07:00
Dongluo Chen d8bd5f9a53 Merge pull request #2056 from nishanttotla/image-list-engine-api 
Moving Image handling to engine-api
 2016-03-30 12:11:51 -07:00
Nishant Totla 8a003a5fa8 Reusing ImageListOptions for ImageFilterOptions 
Signed-off-by: Nishant Totla <nishanttotla@gmail.com>
 2016-03-30 11:00:05 -07:00
Nishant Totla ebdbefecda Updating image related unit tests to use engine-api 
Signed-off-by: Nishant Totla <nishanttotla@gmail.com>
 2016-03-30 10:15:35 -07:00
Nishant Totla 7de9f6ee62 Moving over images to use engine-api 
Signed-off-by: Nishant Totla <nishanttotla@gmail.com>
 2016-03-30 09:46:38 -07:00
Sun Hongliang e60b93aef3 make port 0 invalid in checkAddrFormat 
Signed-off-by: Sun Hongliang <allen.sun@daocloud.io>
 2016-03-30 19:47:42 +08:00
Dongluo Chen d2bbd6bc19 Merge pull request #2038 from allencloud/make-2xx-response-status-codes-compatile-with-docker 
make 2xx response status code compatible with docker engine
 2016-03-29 23:06:55 -07:00
Sun Hongliang 7402cf6354 make 2xx response status code compatible with docker 
1. POST /images/load    from 201 to 200
2. POST /images/{name:.*}/tag from 200 to 201
3. POST /containers/{name:.*}/rename from 200 to 204

Signed-off-by: Sun Hongliang <allen.sun@daocloud.io>
 2016-03-30 08:50:18 +08:00
Nishant Totla 2e9daede48 Merge pull request #1982 from MHBauer/apiClient-rmi 
use apiClient for various things
 2016-03-29 16:11:01 -07:00
Morgan Bauer 4516d1ae16
use apiClient for volumes management 
- create volume
 - list volumes

Signed-off-by: Morgan Bauer <mbauer@us.ibm.com>
 2016-03-29 15:01:27 -07:00
Morgan Bauer 0be5b31f27
use apiClient for listing networks in refresh 
Signed-off-by: Morgan Bauer <mbauer@us.ibm.com>
 2016-03-29 14:50:22 -07:00