Madhu Venugopal
d156151ba1
Merge pull request #49 from aboch/nlo2
...
Add network create flags --scope, --config-only, --config-from
2017-05-17 20:08:23 -07:00
Alessandro Boch
f7415aa953
Vendor moby/moby @4874e0
...
Signed-off-by: Alessandro Boch <aboch@docker.com >
2017-05-17 19:55:09 -07:00
Sebastiaan van Stijn
74cc280521
Merge pull request #30 from nishanttotla/rename-trust-function
...
Moving docker service digest pinning to client side
2017-05-18 03:05:48 +02:00
Nishant Totla
39d03bb2bd
Adding a flag to allow disabling registry lookup
...
Signed-off-by: Nishant Totla <nishanttotla@gmail.com >
2017-05-17 17:55:11 -07:00
Nishant Totla
c61ea6f789
Service create/update set QueryRegistry appropriately
...
Signed-off-by: Nishant Totla <nishanttotla@gmail.com >
2017-05-17 17:39:35 -07:00
Alessandro Boch
b5e43fb5ec
Add support for config-only, config-from and scope options
...
- To promote a network to swarm mode
Signed-off-by: Alessandro Boch <aboch@docker.com >
2017-05-17 17:17:50 -07:00
Sebastiaan van Stijn
85c2330dfa
Merge pull request #80 from AkihiroSuda/adjust-docker-stats
...
[Carry moby/moby#32777 ] Adjusted docker stats memory output
2017-05-18 01:55:52 +02:00
Sebastiaan van Stijn
b3e7e1ff74
Merge pull request #101 from jlhawn/update_container_wait
...
Update `run` and `start` to use container wait API
2017-05-18 01:31:40 +02:00
Tibor Vass
63ecaf1d4f
Merge pull request #21 from aduermael/prune-security
...
prune commands : make sure label filters are considered
2017-05-17 16:23:27 -07:00
Josh Hawn
6eca53c7ae
Refactor holdHijackedConnection
...
It has been refactored to a hijackedIOStreamer type which has several
methods which are used to prepare input and handle streaming the input
and output separately.
Docker-DCO-1.1-Signed-off-by: Josh Hawn <josh.hawn@docker.com > (github: jlhawn)
2017-05-17 15:18:01 -07:00
Kenfe-Mickaël Laventure
8372ae744e
Merge pull request #92 from vdemeester/add-codecov
...
Add codecov configuration
2017-05-17 13:50:03 -07:00
Gaetan de Villele
1cc1f54d90
make system prune “--filter” flag available only for docker 17.04 (api v1.28) and newer
...
Signed-off-by: Gaetan de Villele <gdevillele@gmail.com >
2017-05-17 12:36:09 -07:00
John Stephens
b28c4822cc
Merge pull request #90 from dnephin/add-windows-autogen
...
Add windows resources to binary
2017-05-17 11:59:54 -07:00
Josh Hawn
38591f20d0
Update CLI package with containerWait changes
...
The docker/client package was updated to support the updated Container
Wait API functionality. The run and start commands have been updated to
use the new wait features.
Docker-DCO-1.1-Signed-off-by: Josh Hawn <josh.hawn@docker.com > (github: jlhawn)
2017-05-17 11:44:54 -07:00
Josh Hawn
4f9ac4899f
Update Vendor
...
Includes updates from docker/docker and imagespec
Docker-DCO-1.1-Signed-off-by: Josh Hawn <josh.hawn@docker.com > (github: jlhawn)
2017-05-17 11:44:54 -07:00
Daniel Nephin
3d655c090a
Merge pull request #87 from dnephin/add-watcher
...
Support running unit tests when files are saved
2017-05-17 10:19:10 -04:00
Brian Goff
ae1124abad
Merge pull request #42 from dperny/service-logs-support-details
...
Add support for details on service logs
2017-05-17 10:15:55 -04:00
Sebastiaan van Stijn
b3be2a0316
Merge pull request #96 from nishanttotla/vendor-swarmkit
...
Vendor swarmkit 998a47fb9c2b727c8a48d372309af0b3032051e2
2017-05-17 14:05:19 +02:00
Vincent Demeester
dee8e6ab2d
Merge pull request #95 from dnephin/use-check-redirect
...
Use CheckRedirect so that client behaves the same way with GO 1.8
2017-05-17 10:13:42 +02:00
Drew Erny
ebc0eff478
Add support for details on service logs
...
Adds CLI and client support for details on service logs. CLI component
of moby/moby#32996 .
Signed-off-by: Drew Erny <drew.erny@docker.com >
2017-05-16 16:53:58 -07:00
Sebastiaan van Stijn
5b19f39017
Merge pull request #89 from aaronlehmann/pretty
...
Add --pretty option to "secret inspect" and "config inspect"
2017-05-17 01:38:10 +02:00
Aaron Lehmann
62567078ff
Add --pretty option to "secret inspect" and "config inspect"
...
This adds a pretty template for both inspect subcommands. For configs,
it's particularly useful because it's a way to expose the config payload
in the CLI in a non-base64-encoded way.
Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com >
2017-05-16 15:12:20 -07:00
Nishant Totla
4ac30da2a9
Vendor swarmkit 998a47fb9c2b727c8a48d372309af0b3032051e2
...
Signed-off-by: Nishant Totla <nishanttotla@gmail.com >
2017-05-16 15:06:07 -07:00
Aaron Lehmann
c17acee8cf
Merge pull request #48 from cyli/root-rotation-cli
...
Synchronous CLI command for root CA rotation
2017-05-16 14:58:05 -07:00
Sebastiaan van Stijn
ebbab14224
Merge pull request #98 from aaronlehmann/logs-padding-underflow
...
service: Avoid underflow in logs padding calculation
2017-05-16 23:36:25 +02:00
Aaron Lehmann
51f698337d
Avoid loop when discarding contents of progress pipe
...
Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com >
2017-05-16 14:34:59 -07:00
Ying Li
103bfb2739
Re-vendor docker/docker.
...
Signed-off-by: Ying Li <ying.li@docker.com >
2017-05-16 14:31:19 -07:00
Ying Li
3fe8321d0c
Provide command line tool to view and rotate swarm's currently CA root certificate.
...
Signed-off-by: Ying Li <ying.li@docker.com >
2017-05-16 14:31:15 -07:00
Aaron Lehmann
37bf8ffc5a
Merge pull request #83 from cpuguy83/add_configs_to_compose
...
Add support for configs to compose format
2017-05-16 14:26:04 -07:00
Brian Goff
e574286ba2
Add support for configs to compose format
...
Signed-off-by: Brian Goff <cpuguy83@gmail.com >
2017-05-16 17:10:14 -04:00
Daniel Nephin
90809f8fd9
Merge pull request #71 from thaJeztah/add-credspec-to-compose
...
add credential-spec to compose
2017-05-16 16:45:06 -04:00
Aaron Lehmann
ab6bc5dce6
service: Avoid underflow in logs padding calculation
...
This command inserts a variable amount of padding in the log line:
padding := strings.Repeat(" ", f.padding-getMaxLength(task.Slot))
If the service is scaled up, or the slot numbers are noncontiguous, the
subtraction can underflow, causing a crash.
Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com >
2017-05-16 12:27:31 -07:00
Daniel Nephin
f9ab6a77b0
Use CheckRedirect so that client behaves the same way with GO 1.8
...
Signed-off-by: Daniel Nephin <dnephin@docker.com >
2017-05-16 11:48:00 -04:00
Vincent Demeester
f4b8aec86e
Add codecov configuration
...
Signed-off-by: Vincent Demeester <vincent@sbr.pm >
2017-05-16 16:53:35 +02:00
Daniel Nephin
329f4e29c5
Remove unused windows resourcefiles.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com >
2017-05-15 22:50:33 -04:00
Akihiro Suda
3c78bc775c
Fix float64 comparison in stats_helpers_test.go
...
Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp >
2017-05-16 02:13:00 +00:00
Sergey Tryuber
82600b7021
Adjusted docker stats memory output
...
Signed-off-by: Sergey Tryuber <Sergeant007@users.noreply.github.com >
Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp >
2017-05-16 02:00:47 +00:00
Daniel Nephin
8a6ad48d2b
Add windows resources to binary.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com >
2017-05-15 18:03:03 -04:00
Daniel Nephin
74c06a140b
Support running unit tests when files are saved.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com >
2017-05-15 17:02:58 -04:00
Tibor Vass
a2225276af
Merge pull request #78 from dnephin/fix-cross-build
...
Fix cross compile build
2017-05-15 12:31:34 -07:00
Sebastiaan van Stijn
4e7943646b
add credential-spec to compose
...
Signed-off-by: Michael Friis <friism@gmail.com >
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Signed-off-by: Brian Goff <cpuguy83@gmail.com >
2017-05-15 15:00:26 -04:00
Kenfe-Mickaël Laventure
36e557f1a3
Merge pull request #82 from vdemeester/opts-from-docker
...
Import `opts` package from moby/moby
2017-05-15 11:38:59 -07:00
Daniel Nephin
60b2dd3e23
Update the README
...
Remove referenced to developing on the host, we shouldn't support it.
Move script/validate to scripts/validate to be consistent.
Set the default target to be binary instead of clean.
Signed-off-by: Daniel Nephin <dnephin@docker.com >
2017-05-15 14:07:30 -04:00
Brian Goff
a4472a893d
Merge pull request #85 from thaJeztah/auto-milestone
...
Add VERSION file
2017-05-15 13:58:50 -04:00
Sebastiaan van Stijn
35c6e555e0
Add VERSION file
...
This file is used for auto-assigning milestones
to PR's by Poule, but may be usefule in general
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
2017-05-15 19:20:12 +02:00
Vincent Demeester
d7f6563efc
Update cli imports to using local package
...
Also, rename a bunch of variable to not *shadow* the `opts` package
name.
Signed-off-by: Vincent Demeester <vincent@sbr.pm >
2017-05-15 14:45:19 +02:00
Aaron Lehmann
560dc7660f
Update CLI docs and add opts/config.go
...
Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com >
2017-05-15 11:57:21 +02:00
Evan Hazlett
08097edc78
support custom paths for secrets
...
This adds support to specify custom container paths for secrets.
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com >
2017-05-15 11:57:21 +02:00
Aaron Lehmann
eb366ae039
Remove pkg/testutil/assert in favor of testify
...
I noticed that we're using a homegrown package for assertions. The
functions are extremely similar to testify, but with enough slight
differences to be confusing (for example, Equal takes its arguments in a
different order). We already vendor testify, and it's used in a few
places by tests.
I also found some problems with pkg/testutil/assert. For example, the
NotNil function seems to be broken. It checks the argument against
"nil", which only works for an interface. If you pass in a nil map or
slice, the equality check will fail.
In the interest of avoiding NIH, I'm proposing replacing
pkg/testutil/assert with testify. The test code looks almost the same,
but we avoid the confusion of having two similar but slightly different
assertion packages, and having to maintain our own package instead of
using a commonly-used one.
In the process, I found a few places where the tests should halt if an
assertion fails, so I've made those cases (that I noticed) use "require"
instead of "assert", and I've vendored the "require" package from
testify alongside the already-present "assert" package.
Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com >
2017-05-15 11:57:21 +02:00
Aaron Lehmann
d160d98970
Make the CLI show defaults from the swarmkit defaults package
...
If no fields related to an update config or restart policy are
specified, these structs should not be created as part of the service,
to avoid hardcoding the current defaults.
Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com >
2017-05-15 11:57:21 +02:00