Tibor Vass
053e3db35e
Merge pull request #528 from andrewhsu/ven
...
vndr github.com/docker/docker to 84144a8 to fix stuff
Upstream-commit: f697de32b9
Component: cli
2017-09-12 17:52:55 -07:00
Andrew Hsu
e18e2f39e3
vndr github.com/docker/docker to 84144a8 to fix stuff
...
Signed-off-by: Andrew Hsu <andrewhsu@docker.com >
Upstream-commit: 850b46e67c
Component: cli
2017-09-12 17:27:15 -07:00
Sébastien HOUZÉ
6e9f643bb2
Reset idPair during build to avoid cache busting
...
Signed-off-by: Sébastien HOUZÉ <cto@verylastroom.com >
Upstream-commit: 7e407610d4
Component: cli
2017-09-13 02:04:03 +02:00
Victor Vieux
eae7cc4c29
Merge pull request #516 from andrewhsu/v
...
vndr docker/docker to ea220e7 to bring in fix for arm
Upstream-commit: b60413264d
Component: cli
2017-09-12 16:01:04 -07:00
Yong Tang
ca1972776d
Merge pull request #34826 from cezarsa/usagefix
...
Fix variable shadowing causing LayersSize to be reported as 0
Upstream-commit: 84144a8c66c1bb2af8fa997288f51ef2719971b4
Component: engine
2017-09-12 15:51:26 -07:00
Andrew Hsu
baffbb54c8
remove unused vndr github.com/docker/libtrust
...
Signed-off-by: Andrew Hsu <andrewhsu@docker.com >
Upstream-commit: 536da4a07a
Component: cli
2017-09-12 13:48:21 -07:00
Andrew Hsu
fda4a38658
vndr golang.org/x/sys to 07c1829
...
To satisfy requirements of the vndr of docker/docker
Signed-off-by: Andrew Hsu <andrewhsu@docker.com >
Upstream-commit: 50696bbf72
Component: cli
2017-09-12 12:11:18 -07:00
Cezar Sa Espinola
55cb898a72
Fix variable shadowing causing LayersSize to be reported as 0
...
Signed-off-by: Cezar Sa Espinola <cezarsa@gmail.com >
Upstream-commit: 313bc1e339fa4292d9ef5bc74acc82436eab7e1e
Component: engine
2017-09-12 14:11:11 -03:00
Daniel Nephin
18c29c5c5f
Add gosimple linter
...
Update gometalinter
Signed-off-by: Daniel Nephin <dnephin@docker.com >
Upstream-commit: f7f101d57ef8cbf2d8723a18b7d723c5c5dd04b6
Component: engine
2017-09-12 12:09:59 -04:00
Yong Tang
1d65628454
Merge pull request #34754 from Microsoft/jjh/read-only
...
LCOW: VHDX boot to readonly.
Upstream-commit: 969b76d85f93e214cbc44f25a3f44b67cb0dc078
Component: engine
2017-09-12 08:35:21 -07:00
Sebastiaan van Stijn
52611dee7a
Merge pull request #34796 from donutloop/fix_typos_in_locker_example
...
Fix typos in Locker example
Upstream-commit: 099b4de391696b740779bfcb8322b4f4186e297e
Component: engine
2017-09-12 15:48:23 +02:00
Sebastiaan van Stijn
a300c8a80f
Update deprecated.md for "api-enable-cors"
...
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: 7c69bf1d24
Component: cli
2017-09-12 12:47:57 +02:00
Sebastiaan van Stijn
3e4a18de4d
Remove deprecated --enable-api-cors flag
...
The `--enable-api-cors` flag was deprecated in f3dd2db4ff7de1399a49af928cd3eae4fccf8764,
and marked for removal in docker 17.09 through 85f92ef3590b386ea17e3948262725a2d3ce4db5.
This patch removes the deprecated flag.
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: 7d4eab554379524c2421a7ecd3319d1d087d1de2
Component: engine
2017-09-12 12:43:34 +02:00
Daniel Nephin
ee7b60968b
Cleanup client not found errors.
...
And fix remove calls to return a notFound error
Signed-off-by: Daniel Nephin <dnephin@docker.com >
Upstream-commit: 81bb9978ab5ac99e84a5bf62d0d469f0aec1d506
Component: engine
2017-09-11 19:53:18 -04:00
Andrew Hsu
7f5ba34576
Merge pull request #48 from seemethere/remove_version_dependency_from_package_building
...
Removes engine VERSION dependency
Upstream-commit: 3c05e034e76cb3025a9f10cf6086fed312dc7670
Component: packaging
2017-09-11 13:19:31 -07:00
Eli Uriegas
528c150b8c
Removes engine VERSION dependency
...
Signed-off-by: Eli Uriegas <eli.uriegas@docker.com >
Upstream-commit: 89d8a83e20172e66c16c6ddbc46f43e5f67f7045
Component: packaging
2017-09-11 12:11:59 -07:00
Misty Stanley-Jones
99e268ef3c
Merge pull request #508 from docker/revert-493-patch-1
...
Revert "Change sshfs by cloudstor on Installing and using a plugin"
Upstream-commit: 04390f8a74
Component: cli
2017-09-11 11:25:50 -07:00
Vincent Demeester
599a2ae3b1
Merge pull request #521 from dnephin/add-albers-to-maintainers
...
Add albers to maintainers
Upstream-commit: d0bda815d2
Component: cli
2017-09-11 19:47:20 +02:00
Daniel Nephin
591014017f
Add albers to maintainers.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com >
Upstream-commit: 92cf825238
Component: cli
2017-09-11 11:22:10 -04:00
Yong Tang
2c45bc6a92
Merge pull request #34770 from dnephin/fix-client-with-empty-id
...
Fix volume inspect with empty ID
Upstream-commit: 63a9ea58eb4c704ed7d7dab950f12f708cf220f7
Component: engine
2017-09-11 07:01:50 -07:00
Vincent Demeester
8e2757c531
Merge pull request #421 from thaJeztah/refactor-docker-info
...
Refactor/cleanup of docker info
Upstream-commit: e77dc2232e
Component: cli
2017-09-11 15:25:02 +02:00
Sebastiaan van Stijn
033298b8f6
Refactor/cleanup of docker info
...
Some mild refactoring of the docker info command;
- Use `fmt.Fprinln()` instead of `fmt.Fprintf()` where possible
- Rename `fprintfIfNotEmpty()` to `fprintlnNonEmpty()`, and removed
return variables, because they were not used. `fprintlnNonEmpty()`
now uses fmt.Fprintln()` instead of `fmt.Fprintf()`, because
formatting was not used.
- Use `fprintlnNonEmpty()` to get rid of some `if` statements
- Extract printing Swarm-related information to a `printSwarmInfo()` function
- Change `Http Proxy` and `Https Proxy` to `HTTP Proxy` / `HTTPS Proxy`
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: 6f1b510843
Component: cli
2017-09-11 15:13:06 +02:00
Sebastiaan van Stijn
95956aa7ef
Merge pull request #519 from gesellix/typo-configration
...
[docs] Fix typo in configration.
Upstream-commit: 202205365a
Component: cli
2017-09-11 14:57:08 +02:00
Tobias Gesellchen
1b8f2ad866
[docs] Fix typo in configration.
...
Signed-off-by: Tobias Gesellchen <tobias@gesellix.de >
Upstream-commit: f8ed8d22c6
Component: cli
2017-09-10 23:12:29 +02:00
Marcel Edmund Franke
e388be9473
Fix typos in Locker example
...
Signed-off-by: Marcel Edmund Franke <marcel.edmund.franke@gmail.com >
Upstream-commit: 6d3bc28289c265a65879a7f28264e6bacb95fbe1
Component: engine
2017-09-10 11:34:19 +02:00
Yong Tang
af0adf66d4
Merge pull request #34790 from dnephin/add-ineffassign-linter
...
Add ineffassign linter
Upstream-commit: 13fec0607394f7c6da0148f8d513b6fcbf7cce61
Component: engine
2017-09-09 15:41:55 -07:00
Andrew Hsu
4b9c2f5fd5
vndr docker/docker to ea220e7 to bring in fix for arm
...
Primarily to bring in fix for "Clear Architecture field in platform
constraint for arm architectures".
Signed-off-by: Andrew Hsu <andrewhsu@docker.com >
Upstream-commit: ef027b6d72
Component: cli
2017-09-08 16:27:56 -07:00
Daniel Nephin
fdd3e06a77
Add ineffassign linter
...
Also enable GC in linting to reduce memory usage.
Signed-off-by: Daniel Nephin <dnephin@docker.com >
Upstream-commit: 09652bf8789142a5a5a1de2d41590300761b4954
Component: engine
2017-09-08 18:23:21 -04:00
Victor Vieux
30a4e0ab8e
Merge pull request #510 from dnephin/add-parse-log-details
...
Use a local copy of ParseLogDetails
Upstream-commit: aae519d0f6
Component: cli
2017-09-08 11:38:24 -07:00
Victor Vieux
fbd21afa80
Merge pull request #511 from dnephin/fix-end-of-line-whitespace-tests
...
Use golden files for tests that expect end-of-line whitespace
Upstream-commit: d3d9b38d55
Component: cli
2017-09-08 11:37:28 -07:00
Victor Vieux
94dd311bdc
Merge pull request #495 from dnephin/container-run-e2e
...
Add en e2e test for `container run`
Upstream-commit: cc517f2d8a
Component: cli
2017-09-08 11:36:32 -07:00
Daniel Nephin
9211237d01
Merge pull request #34767 from dnephin/deprecate-some-client
...
Cleanup client/ interface
Upstream-commit: 96255ba07ae7de2bb2a18567c478b63d5ac74ee4
Component: engine
2017-09-08 13:29:10 -04:00
pnagy
b363a8f8a7
sort secrets and configs to ensure idempotence
...
`docker stack deploy` keeps restarting services it doesn't need to (no changes)
because the entries' order gets randomized at some previous (de)serialization.
Maybe it would be worth looking into this at a higher level and ensure
all (de)serialization happens in an ordered collection.
This quick fix sorts secrets and configs (in place, mutably) which ensures the
same order for each run.
Based on
https://github.com/moby/moby/pull/30506
Fixes
https://github.com/moby/moby/issues/34746
Signed-off-by: Peter Nagy <xificurC@gmail.com >
Upstream-commit: 27e8bdf32b
Component: cli
2017-09-08 16:09:48 +02:00
John Howard
66ae0e70f8
Merge pull request #34771 from Microsoft/jjh/hcsshim
...
Revendor Microsoft/hcsshim @ v0.6.4
Upstream-commit: 8ec484ff4bef7698cc4b3ba8195dd182c2af8045
Component: engine
2017-09-07 14:51:07 -07:00
Daniel Nephin
d7ed53048b
Use golden files for tests that expect end-of-line whitespace
...
Signed-off-by: Daniel Nephin <dnephin@docker.com >
Upstream-commit: 51587de1c4
Component: cli
2017-09-07 17:50:44 -04:00
Brian Goff
b543555e86
Merge pull request #34761 from dnephin/fix-mount-create-api-test
...
Some cleanup of mount create API test
Upstream-commit: bf3a8bddeb5e1ae04b6f73bfe811372ee3e78e36
Component: engine
2017-09-07 17:09:19 -04:00
Brian Goff
58743c32f5
Merge pull request #34756 from dnephin/better-filters
...
Improve docs and interface for api/types/filters
Upstream-commit: c8400bf24dcea8e160d6b614d996b0f659c7d8d9
Component: engine
2017-09-07 17:00:59 -04:00
John Howard
810209d155
Revendor Microsoft/hcsshim @ v0.6.4
...
Signed-off-by: John Howard <jhoward@microsoft.com >
Upstream-commit: e47c626e0a5e7285782620c027b3d5195c643a5a
Component: engine
2017-09-07 12:08:40 -07:00
Victor Vieux
f1b816d854
Merge pull request #34685 from dnephin/remove-bundle-version
...
Remove version from bundle path
Upstream-commit: f69188aec9f74a946422a256c14bf8efc82f20d4
Component: engine
2017-09-07 11:53:53 -07:00
Yong Tang
2e7d5b113f
Merge pull request #34757 from dnephin/fix-test-run-environment
...
Fix TestRunEnvironment
Upstream-commit: d76f0d4e0694f5adcaab327e801ee8553620c5b3
Component: engine
2017-09-07 11:28:57 -07:00
Daniel Nephin
5899c64938
Fix volume inspect with empty ID
...
Signed-off-by: Daniel Nephin <dnephin@docker.com >
Upstream-commit: 5ac298fd0e5c065483653970be587626026971c2
Component: engine
2017-09-07 13:46:23 -04:00
Misty Stanley-Jones
56f259f37d
Revert "Change sshfs by cloudstor on Installing and using a plugin"
...
Signed-off-by: Misty Stanley-Jones <misty@docker.com >
Upstream-commit: eb77961399
Component: cli
2017-09-07 10:15:59 -07:00
Daniel Nephin
0d3330814c
Use a local copy of ParseLogDetails
...
It's being removed from client/
Signed-off-by: Daniel Nephin <dnephin@docker.com >
Upstream-commit: a747389bf4
Component: cli
2017-09-07 12:50:25 -04:00
Yong Tang
d7504f67d1
Merge pull request #34738 from wgliang/optimization1
...
Optimize some wrong usage and spelling
Upstream-commit: 2dcb77b24c80dd95b52358c92436f68f2a33eb01
Component: engine
2017-09-07 09:45:14 -07:00
Daniel Nephin
980d05f2ea
Cleanup client/ interface
...
- Remove ParseLogDetails, this is not part of the client. Moved to docker/cli
- Deprecate ParseHost and replace with ParseHostURL
- Deprecate redundant IsErr helpers
Signed-off-by: Daniel Nephin <dnephin@docker.com >
Upstream-commit: 54242cd067c234960d1295a67271475f9d099f22
Component: engine
2017-09-07 12:32:38 -04:00
Vincent Demeester
5f49aab36a
Merge pull request #34687 from tych0/bump-runc
...
bump runc version
Upstream-commit: a68ee8c8950b1923c3a92b9cec0d9a723897111d
Component: engine
2017-09-07 14:52:18 +02:00
Vincent Demeester
6f155f233b
Merge pull request #34021 from nishanttotla/dont-set-architecture-constraint
...
Clear Architecture field in platform constraint for arm architectures
Upstream-commit: ea220e70a13963da544645376cd9331021eec6b4
Component: engine
2017-09-07 11:18:12 +02:00
Vincent Demeester
a8b7a6b071
Merge pull request #34730 from simonferquel/fix-TestEventsOOMDisableTrue-flakkyness
...
Events CLI tests: fix flakyness of TestEventsOOMDisableTrue
Upstream-commit: 72eb1d0a47488d279df2b80bfd3f6091eaff66a7
Component: engine
2017-09-07 11:16:37 +02:00
Liron Levin
3aa4929239
Plugable secret backend
...
This commit extends SwarmKit secret management with pluggable secret
backends support.
Following previous commits:
1. docker/swarmkit@eebac27434
2. docker/docker@08f7cf0526
Added driver parameter to `docker secret` command.
Specifically:
1. `docker secret create [secret_name] --driver [driver_name]`
2. Displaying the driver in
```
$ docker secret ls
$ docker secret inspect [secret_name]
$ docker secret inspect [secret_name] -pretty
```
Signed-off-by: Liron Levin <liron@twistlock.com >
Upstream-commit: 0ee9e05d8f
Component: cli
2017-09-07 11:10:44 +03:00
wangguoliang
eec1d4ef54
Optimize some wrong usage and spelling
...
Signed-off-by: wgliang <liangcszzu@163.com >
Upstream-commit: 94cefa21459a0c620e5a9c2da04df6d3a43dae17
Component: engine
2017-09-07 09:44:08 +08:00