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

31655 commits

This branch
This branch
All branches
Author SHA1 Message Date
Sebastiaan van Stijn
bce494f7a2 Merge pull request #31830 from dnephin/refactor-cli-state 
Small cleanup now that we have multiple details about the server stored on the cli
 2017-03-29 13:36:32 +02:00
Sebastiaan van Stijn
1b2f07a2f1 Merge pull request #31501 from thtanaka/update-oracle-selinux 
Update oracle linux selinux to match docker upstream
 2017-03-29 13:15:28 +02:00
Vincent Demeester
0937dadfdf Merge pull request #32196 from vdemeester/fix-windowsrs1-integration 
Fix TestAPIDockerAPIVersion on windows
 2017-03-29 12:45:31 +02:00
Sebastiaan van Stijn
d54c8baca4 Merge pull request #32198 from FengtuWang/wrong_usage 
fix wrong usage in script of integration test
 2017-03-29 12:42:47 +02:00
Sebastiaan van Stijn
6263c3cf2e Merge pull request #32058 from tophj-ibm/flaky-token-test 
Fix flaky test TestPushMisconfiguredTokenServiceResponseError
 2017-03-29 12:30:16 +02:00
Fengtu Wang
a42e72814f fix wrong usage in script of integration test 
Signed-off-by: Fengtu Wang <wangfengtu@huawei.com>
 2017-03-29 18:23:06 +08:00
Sebastiaan van Stijn
a1099010b0 Merge pull request #32085 from aboch/bd 
Do not panic on redundant UpdateAttachment
 2017-03-29 12:04:05 +02:00
Sebastiaan van Stijn
d9c4261964 Merge pull request #32187 from tianon/tini-version-parsing 
Update "tini --version" parsing to be more forgiving of Tini's output format (release build vs git build)
 2017-03-29 12:01:03 +02:00
Vincent Demeester
4180211d80 Merge pull request #32186 from aaronlehmann/cluster-omitempty 
api: Omit Cluster, Nodes, and Managers from swarm info when unavailable
 2017-03-29 10:38:52 +02:00
Vincent Demeester
cf19bd44af Merge pull request #29228 from dnephin/add-entrypoint-to-service-cli 
Add entrypoint flags to service cli.
 2017-03-29 10:38:33 +02:00
Vincent Demeester
02faf807a2 Merge pull request #32167 from miaoyq/print-a-err-return 
The returned err should be printed
 2017-03-29 10:36:05 +02:00
Vincent Demeester
8c7fdddf48
Fix TestAPIDockerAPIVersion on windows 
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
 2017-03-29 10:28:51 +02:00
Vincent Demeester
1f7fd19cec Merge pull request #32175 from vdemeester/fix-30201 
Fix TestTrustedIsolatedCreate – clean trust folder at the end of the test
 2017-03-29 09:15:51 +02:00
Sebastiaan van Stijn
2c1f6e812a Merge pull request #32189 from vieux/17.03.1-changelog 
backport 17.03.1 CHANGELOG
 2017-03-29 08:23:43 +02:00
Yanqiang Miao
87d0a3ad89 The returned err should be printed 
Signed-off-by: Yanqiang Miao <miao.yanqiang@zte.com.cn>
 2017-03-29 09:00:50 +08:00
Sebastiaan van Stijn
0c59283fc3 Merge pull request #32183 from JimGalasyn/delete-h1 
Delete extraneous H1 title
 2017-03-29 01:42:20 +02:00
Victor Vieux
d5cbaa96f6 backport 17.03.1 CHANGELOG 
Signed-off-by: Victor Vieux <victorvieux@gmail.com>
 2017-03-28 16:15:05 -07:00
Tianon Gravi
87f9362975 Update "tini --version" parsing to be more forgiving of Tini's output format (release build vs git build) 
Signed-off-by: Andrew "Tianon" Page <admwiggin@gmail.com>
 2017-03-28 15:18:39 -07:00
Aaron Lehmann
3894254ddd api: Omit Cluster, Nodes, and Managers from swarm info when unavailable 
Currently these fields are included in the response JSON with zero
values. It's better not to include them if the information is
unavailable (for example, on a worker node).

This turns Cluster into a pointer so that it can be left out.

Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
 2017-03-28 14:20:25 -07:00
Sebastiaan van Stijn
8098bf3896 Merge pull request #32185 from ewindisch/mailmap 
Update Erica in mailmap
 2017-03-28 22:02:35 +02:00
Erica Windisch
88535f9733 Update Erica in mailmap 
Fix my name and email address.

Signed-off-by: Erica Windisch <erica@windisch.us>
 2017-03-28 19:55:08 +00:00
Sebastiaan van Stijn
78e0ad7953 Merge pull request #32142 from vdemeester/integration-cli-package-2 
[test-integration] Migrate some more tests to `cli` package
 2017-03-28 21:37:07 +02:00
Daniel Nephin
d3ea30de10 Add entrypoint flags to service cli. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2017-03-28 11:24:19 -07:00
Brian Goff
c7c7f36da7 Merge pull request #32169 from thaJeztah/fix-non-swarm-prune 
Fix docker system prune failing with Swarm mode disabled
 2017-03-28 14:07:25 -04:00
JimGalasyn
8d0c05cfe4 Delete extraneous H1 title 
Signed-off-by: JimGalasyn <jim.galasyn@docker.com>
 2017-03-28 10:56:26 -07:00
Sebastiaan van Stijn
d386f813e0 Merge pull request #32176 from thaJeztah/add-albers-to-maintainers 
Add Harald Albers to maintainers
 2017-03-28 17:29:38 +02:00
Sebastiaan van Stijn
c19ba877e0 Merge pull request #32178 from thaJeztah/add-john-stephens-to-maintainers 
Add John Stephens to maintainers
 2017-03-28 17:29:02 +02:00
Sebastiaan van Stijn
a5a0d752a1 Merge pull request #32177 from thaJeztah/add-evan-to-maintainers 
add Evan Hazlett to maintainers
 2017-03-28 17:28:30 +02:00
Sebastiaan van Stijn
cfbde0b422
Add John Stephens to maintainers 
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2017-03-28 16:46:37 +02:00
Sebastiaan van Stijn
3c7fedc2fd
add Evan Hazlett to maintainers 
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2017-03-28 16:39:56 +02:00
Sebastiaan van Stijn
5cd4e96cd5
Add Harald Albers to maintainers 
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2017-03-28 16:38:23 +02:00
Sebastiaan van Stijn
4f2ed03092 Fix docker system prune failing with Swarm mode disabled 
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2017-03-28 16:35:24 +02:00
Sebastiaan van Stijn
8f4f85dd5b
Add NetworkManager and ClusterStatus interfaces 
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2017-03-28 16:35:14 +02:00
Brian Goff
b6cb416051 Merge pull request #30652 from rhatdan/selinux 
If caller specifies label overrides, don't override security options
 2017-03-28 10:24:47 -04:00
Vincent Demeester
16377f4d16
Fix issue #30201 – clean trust folder at the end of the test 
This test doesn't clean the folder where it stores it's config (and
the trust folder), and thus, it fails if we run it more than
once (could also affect other tests at some point).

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
 2017-03-28 16:12:41 +02:00
Vincent Demeester
917cb0d9d0 Merge pull request #31683 from AkihiroSuda/it-on-swarm-easy-analysis 
integration-cli-on-swarm: new CLI flag: -keep-executor
 2017-03-28 15:50:52 +02:00
Vincent Demeester
eeaa6c96d8
[test-integration] Migrate some more tests to cli package 
Add some required command operators to the `cli` package, and update
some tests to use this package, in order to remove a few functions
from `docker_utils_test.go`

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
 2017-03-28 15:17:31 +02:00
Vincent Demeester
a048e131be Merge pull request #32086 from tripdubroot/32000-Update-push.md-doc 
Updated push.md with progress bar info
 2017-03-28 14:02:10 +02:00
Vincent Demeester
bd811aa4fd Merge pull request #31021 from mstanleyjones/31009_dockerd_experimental 
Update docs for experimental features
 2017-03-28 14:01:05 +02:00
Sebastiaan van Stijn
b385a9156e Merge pull request #31901 from davidxia/fix-docs 
[docs] Fix incorrect `docker inspect` example
 2017-03-28 14:00:05 +02:00
Sebastiaan van Stijn
4df350b8c7 Merge pull request #30810 from allencloud/make-secret-ls-support-filter 
make secret ls support filters in CLI
 2017-03-28 13:43:19 +02:00
Misty Stanley-Jones
9fd27bf1a9
Update docs for experimental features 
Signed-off-by: Misty Stanley-Jones <misty@docker.com>
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2017-03-28 13:25:11 +02:00
Sebastiaan van Stijn
0f8a3dafa4 Merge pull request #32034 from gpflaum/30841-fix-toc-deprecated 
Fix indenting in deprecated engine features toc
 2017-03-28 13:09:47 +02:00
Sebastiaan van Stijn
7c7cc0bbdc Merge pull request #31911 from allencloud/specify-max-size-for-secret-in-doc 
specify max size for secret in doc
 2017-03-28 12:59:19 +02:00
Sebastiaan van Stijn
54805701bd Merge pull request #32112 from vdemeester/carry-ref-inspect-detail 
Add details for inspect command usage
 2017-03-28 12:49:57 +02:00
EG Noriega
59ef08c878
Add details for inspect command usage 
Signed-off-by: Eric G. Noriega <egnoriega@users.noreply.github.com>
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
 2017-03-28 11:04:10 +02:00
Vincent Demeester
95510551ce Merge pull request #32156 from cpuguy83/index_copy_new_slice 
Don't pass reference to mutable slice
 2017-03-28 10:23:08 +02:00
Vincent Demeester
1c7a3d3e6c Merge pull request #32152 from darrenstahlmsft/RevertWaitOOBE 
Windows: Revert change to wait for OOBE
 2017-03-28 10:22:03 +02:00
Vincent Demeester
35e5975b90 Merge pull request #30763 from ripcurld0/fix_30714 
Fix the create API when fromSrc has a bad URL
 2017-03-28 10:20:59 +02:00
Vincent Demeester
99aaf6b923 Merge pull request #31709 from dnephin/better-errors 
Replace fmt.Errorf() with errors.Errorf() in the cli
 2017-03-28 10:17:46 +02:00