beenull/moby
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
27153 commits 14 branches 412 tags 338 MiB
Commit graph

27153 commits

This branch
This branch
All branches
Author SHA1 Message Date
Stephen J Day
9d7be9df8f tlsconfig: move Clone into proper package 
Signed-off-by: Stephen J Day <stephen.day@docker.com>
 2016-09-09 12:05:17 -07:00
Phil Estes
cf58eb437c Merge pull request #22049 from boucher/docker-checkpoint-restore 
Implement containerd API for checkpoints
 2016-09-09 13:36:55 -04:00
Daniel Nephin
81090c9455 Merge pull request #26443 from dnephin/move_trust_client 
Move image trust related cli methods into the image package
 2016-09-09 12:29:28 -04:00
boucher
67f607a02f Update checkpoint comments to be more accurate 
Signed-off-by: boucher <rboucher@gmail.com>
 2016-09-09 12:13:46 -04:00
John Howard
704049a691 Merge pull request #26438 from lixiaobing10051267/masterSystem 
docker daemon requires windows version info while low build
 2016-09-09 09:12:47 -07:00
Michael Crosby
c1f2776bf1 Merge pull request #26428 from darrenstahlmsft/AddToSymlink 
Don't attempt to evaluate drive root on Windows
 2016-09-09 09:09:24 -07:00
lixiaobing10051267
b4b9efd4c5 Specify the required version while the version not support daemon 
Signed-off-by: lixiaobing10051267 <li.xiaobing1@zte.com.cn>
 2016-09-09 23:04:45 +08:00
Daniel Nephin
e7c9694d76 Move image trust related cli methods into the image package. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2016-09-09 10:50:16 -04:00
Brian Goff
89bc5d54ca Merge pull request #26432 from stevvooe/dont-hide-context-errors 
client: don't hide context errors
 2016-09-09 08:53:43 -04:00
Justin Cormack
7c118f40cb Merge pull request #26424 from michael-holzheu/PR-s390x-bump-to-binary-go-1-7-1 
Dockerfile.s390x: Use binary go package
 2016-09-09 09:53:02 +01:00
boucher
6bc9a2d563 Update containerd to fix unkillable restored containers. 
Signed-off-by: boucher <rboucher@gmail.com>
 2016-09-08 21:31:56 -04:00
boucher
0dfbf960d7 Fix the clashing route syntax for checkpoint/container delete. 
Signed-off-by: boucher <rboucher@gmail.com>
 2016-09-08 21:31:56 -04:00
boucher
cb0ad4258b Fix typo 
Signed-off-by: boucher <rboucher@gmail.com>
 2016-09-08 21:31:56 -04:00
boucher
d8fef66b03 Initial implementation of containerd Checkpoint API. 
Signed-off-by: boucher <rboucher@gmail.com>
 2016-09-08 21:31:52 -04:00
Stephen J Day
8e5ef8af5c
client: don't hide context errors 
Instead of reformatting error from the request action, we wrap it,
allowing the cause to be recovered. This is important for consumers that
need to be able to detect context errors, such as `Cancelled` and
`DeadlineExceeded`.

Signed-off-by: Stephen J Day <stephen.day@docker.com>
 2016-09-08 17:47:43 -07:00
Michael Crosby
e345d67c4e Merge pull request #26422 from dnephin/move_api_client 
Move api/client -> cli/command
 2016-09-08 16:44:49 -07:00
Justin Cormack
da7a7f9b76 Merge pull request #26375 from cpuguy83/fix_apt_mirror_propagation 
Propagate BUILD_APT_MIRROR and consume in buil-deb
 2016-09-09 00:02:42 +01:00
Darren Stahl
fdce2a7775 Don't attempt to evaluate drive root on Windows 
Signed-off-by: Darren Stahl <darst@microsoft.com>
 2016-09-08 13:52:54 -07:00
Daniel Nephin
485881b038 Fix a test that expects whitespace at the end of the line. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2016-09-08 15:50:14 -04:00
Daniel Nephin
9c2b935812 Replace api/client imports with cli/command in experimental files. 
Using

git grep -l 'client\.DockerCli' cli/command/stack/ | xargs sed -i -e 's/client\.DockerCli/command\.Dockercli/g'

Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2016-09-08 15:46:48 -04:00
Daniel Nephin
0640a14b4f Move api/client -> cli/command 
Using
  gomvpkg
     -from github.com/docker/docker/api/client
     -to github.com/docker/docker/cli/command
     -vcs_mv_cmd 'git mv {{.Src}} {{.Dst}}'

Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2016-09-08 15:46:29 -04:00
Brian Goff
93e8aff1bc Merge pull request #26406 from AkihiroSuda/fix-make-manpages 
client: transport: fix tlsconfig Clone() on different Golang versions
 2016-09-08 15:37:54 -04:00
Alexander Morozov
d959e7fac4 Merge pull request #26107 from dnephin/client_cleanup 
Shrink the DockerCLI type
 2016-09-08 12:18:46 -07:00
Michael Crosby
46d2256370 Merge pull request #26423 from AkihiroSuda/md2man106-1 
update go-md2man to v1.0.6
 2016-09-08 11:38:29 -07:00
Michael Crosby
061cc41759 Merge pull request #26224 from q384566678/test-zhou 
Modify rename function use tips
 2016-09-08 11:22:21 -07:00
Michael Crosby
4e2d442901 Merge pull request #26119 from cpuguy83/lazily_load_fixtures 
Move some test fixtures to go
 2016-09-08 11:16:27 -07:00
Akihiro Suda
128cefc3bd client: transport: fix tlsconfig Clone() on different Golang versions 
Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp>
 2016-09-08 17:55:54 +00:00
Michael Holzheu
47f13d3b84 Dockerfile.s390x: Use binary go package 
We finally have a s390x binary tarball for go on "storage.googleapis.com".
So use this instead of bootstrapping with gccgo.

Signed-off-by: Michael Holzheu <holzheu@linux.vnet.ibm.com>
 2016-09-08 19:52:43 +02:00
Akihiro Suda
35ebc168e3 update go-md2man to v1.0.6 
Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp>
 2016-09-08 17:25:56 +00:00
Brian Goff
ba07661f0d Merge pull request #26405 from yongtang/26326-inspect-ulimit-with-daemon-default 
Fix Ulimits in `docker inspect` when daemon default exists
 2016-09-08 13:21:26 -04:00
Aaron Lehmann
bc06542a17 Merge pull request #25523 from dmcgowan/fsync-layer-filestore 
Update layer store to sync transaction files before committing
 2016-09-08 10:03:12 -07:00
Michael Crosby
d579e24ad2 Merge pull request #26397 from crosbymichael/rm-vendor-api 
Remove unused engine-api packages
 2016-09-08 10:00:51 -07:00
Daniel Nephin
6af6a3a538 Move holdHijackConnection to the container package. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2016-09-08 12:58:06 -04:00
Madhu Venugopal
719a640743 Merge pull request #25962 from mrjana/net 
Add support for docker run in swarm mode overlay
 2016-09-08 09:39:00 -07:00
Daniel Nephin
31d8c27e70 Move container util methods to the container package. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2016-09-08 12:38:52 -04:00
Daniel Nephin
bec81075bf Extract input stream into a new type. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2016-09-08 12:34:55 -04:00
Daniel Nephin
a0ab33124a Extract stream output handling to a new type. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2016-09-08 12:33:41 -04:00
Brian Goff
b1dfefc4bb Merge pull request #26205 from allencloud/fix-warnings-append 
add warnings when verifying container settings
 2016-09-08 12:10:37 -04:00
Vincent Demeester
7baa09faa0 Merge pull request #26252 from leslau/master 
Fixed custom daemon options on systemd docs still using -H fd://
 2016-09-08 17:15:13 +02:00
Brian Goff
28d18b8205 Merge pull request #25578 from rwilliams/conemu 
Force input stream ANSI emulation for ConEmu.
 2016-09-08 11:12:33 -04:00
Brian Goff
e96c0fafa0 Merge pull request #26228 from lixiaobing10051267/masterPluginRm 
check inconsistant command in docs/reference/commandline
 2016-09-08 11:09:18 -04:00
Brian Goff
4219c0018f Merge pull request #25777 from swernli/servicing_race 
Fixing race in Windows container servicing
 2016-09-08 10:42:15 -04:00
Yong Tang
7d705a7355 Fix ulimits in docker inspect when daemon default exists 
This fix tries to fix 26326 where `docker inspect` will not show
ulimit even when daemon default ulimit has been set.

This fix merge the HostConfig's ulimit with daemon default in
`docker inspect`, so that when daemon is started with `default-ulimit`
and HostConfig's ulimit is not set, `docker inspect` will output
the daemon default.

An integration test has been added to cover the changes.

This fix fixes 26326.

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
 2016-09-07 23:15:22 -07:00
Jana Radhakrishnan
99a98ccc14 Add support for docker run in swarm mode overlay 
This PR adds support for running regular containers to be connected to
swarm mode multi-host network so that:
    - containers connected to the same network across the cluster can
      discover and connect to each other.
    - Get access to services(and their associated loadbalancers)
      connected to the same network

Signed-off-by: Jana Radhakrishnan <mrjana@docker.com>
 2016-09-07 21:20:41 -07:00
Sven Dowideit
5be6ccc433 Merge pull request #24586 from farcaller/gcplogs 
Added optional flags to init gcp logger metadata
 2016-09-08 13:47:48 +10:00
Brian Goff
48c615f853 Merge pull request #25891 from Microsoft/jjh/processlist 
Windows: Docker top implementation
 2016-09-07 20:58:20 -04:00
Alexander Morozov
e482d8472b Merge pull request #26395 from unclejack/bump_go_to_1.7.1 
Dockerfile*: bump Go to 1.7.1
 2016-09-07 17:17:38 -07:00
Tõnis Tiigi
b890d475f7 Merge pull request #25806 from Microsoft/jjh-missingdigest 
Don't fail daemon start on missing layer
 2016-09-07 16:35:27 -07:00
John Howard
52f0474851 Windows: docker top implementation 
Signed-off-by: John Howard <jhoward@microsoft.com>
 2016-09-07 16:29:02 -07:00
Michael Crosby
c612147a53 Remove unused engine-api packages 
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
 2016-09-07 15:55:13 -07:00