Commit Graph

1390 Commits

Author SHA1 Message Date
6065480cb3 moving opts to cli repo
Signed-off-by: Abhinandan Prativadi <abhi@docker.com>
Upstream-commit: 0893ab8560
Component: cli
2017-05-17 21:08:58 -07:00
e4194f2c92 moby vendoring
Signed-off-by: Abhinandan Prativadi <abhi@docker.com>
Upstream-commit: 2e07636e5e
Component: cli
2017-05-17 21:08:57 -07:00
dd32a4ed8f Adding network options to service create/update
Changes added to accept network specific options in
docker service create/update

Signed-off-by: Abhinandan Prativadi <abhi@docker.com>
Upstream-commit: 40341ae089
Component: cli
2017-05-17 21:07:48 -07:00
6046962f0a Merge pull request #49 from aboch/nlo2
Add network create flags --scope, --config-only, --config-from
Upstream-commit: d156151ba1
Component: cli
2017-05-17 20:08:23 -07:00
e90e12563c Vendor moby/moby @4874e0
Signed-off-by: Alessandro Boch <aboch@docker.com>
Upstream-commit: f7415aa953
Component: cli
2017-05-17 19:55:09 -07:00
9b300a1def Merge pull request #30 from nishanttotla/rename-trust-function
Moving docker service digest pinning to client side
Upstream-commit: 74cc280521
Component: cli
2017-05-18 03:05:48 +02:00
d8354ad717 Adding a flag to allow disabling registry lookup
Signed-off-by: Nishant Totla <nishanttotla@gmail.com>
Upstream-commit: 39d03bb2bd
Component: cli
2017-05-17 17:55:11 -07:00
fd1d1e23c8 Service create/update set QueryRegistry appropriately
Signed-off-by: Nishant Totla <nishanttotla@gmail.com>
Upstream-commit: c61ea6f789
Component: cli
2017-05-17 17:39:35 -07:00
17199df157 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>
Upstream-commit: b5e43fb5ec
Component: cli
2017-05-17 17:17:50 -07:00
6ff9bdf996 Merge pull request #80 from AkihiroSuda/adjust-docker-stats
[Carry moby/moby#32777] Adjusted docker stats memory output
Upstream-commit: 85c2330dfa
Component: cli
2017-05-18 01:55:52 +02:00
621e243582 Merge pull request #101 from jlhawn/update_container_wait
Update `run` and `start` to use container wait API
Upstream-commit: b3e7e1ff74
Component: cli
2017-05-18 01:31:40 +02:00
705b40c511 Merge pull request #21 from aduermael/prune-security
prune commands : make sure label filters are considered
Upstream-commit: 63ecaf1d4f
Component: cli
2017-05-17 16:23:27 -07:00
6ab9e202e7 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)
Upstream-commit: 6eca53c7ae
Component: cli
2017-05-17 15:18:01 -07:00
484d9f1587 Merge pull request #92 from vdemeester/add-codecov
Add codecov configuration
Upstream-commit: 8372ae744e
Component: cli
2017-05-17 13:50:03 -07:00
8068ecfd18 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>
Upstream-commit: 1cc1f54d90
Component: cli
2017-05-17 12:36:09 -07:00
dd8e5ae38a Merge pull request #90 from dnephin/add-windows-autogen
Add windows resources to binary
Upstream-commit: b28c4822cc
Component: cli
2017-05-17 11:59:54 -07:00
96f059a410 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)
Upstream-commit: 38591f20d0
Component: cli
2017-05-17 11:44:54 -07:00
ed481a9078 Update Vendor
Includes updates from docker/docker and imagespec

Docker-DCO-1.1-Signed-off-by: Josh Hawn <josh.hawn@docker.com> (github: jlhawn)
Upstream-commit: 4f9ac4899f
Component: cli
2017-05-17 11:44:54 -07:00
6e96eb3d23 Merge pull request #87 from dnephin/add-watcher
Support running unit tests when files are saved
Upstream-commit: 3d655c090a
Component: cli
2017-05-17 10:19:10 -04:00
64cad477fc Merge pull request #42 from dperny/service-logs-support-details
Add support for details on service logs
Upstream-commit: ae1124abad
Component: cli
2017-05-17 10:15:55 -04:00
6ae5b03502 Merge pull request #96 from nishanttotla/vendor-swarmkit
Vendor swarmkit 998a47fb9c2b727c8a48d372309af0b3032051e2
Upstream-commit: b3be2a0316
Component: cli
2017-05-17 14:05:19 +02:00
8339d63cee Merge pull request #95 from dnephin/use-check-redirect
Use CheckRedirect so that client behaves the same way with GO 1.8
Upstream-commit: dee8e6ab2d
Component: cli
2017-05-17 10:13:42 +02:00
ba46f33bdd 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>
Upstream-commit: ebc0eff478
Component: cli
2017-05-16 16:53:58 -07:00
fe92c98764 Merge pull request #89 from aaronlehmann/pretty
Add --pretty option to "secret inspect" and "config inspect"
Upstream-commit: 5b19f39017
Component: cli
2017-05-17 01:38:10 +02:00
66a0573519 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>
Upstream-commit: 62567078ff
Component: cli
2017-05-16 15:12:20 -07:00
5d9a68e410 Vendor swarmkit 998a47fb9c2b727c8a48d372309af0b3032051e2
Signed-off-by: Nishant Totla <nishanttotla@gmail.com>
Upstream-commit: 4ac30da2a9
Component: cli
2017-05-16 15:06:07 -07:00
e78b25ca60 Merge pull request #48 from cyli/root-rotation-cli
Synchronous CLI command for root CA rotation
Upstream-commit: c17acee8cf
Component: cli
2017-05-16 14:58:05 -07:00
00f1ab7ba6 Merge pull request #98 from aaronlehmann/logs-padding-underflow
service: Avoid underflow in logs padding calculation
Upstream-commit: ebbab14224
Component: cli
2017-05-16 23:36:25 +02:00
d92c450866 Avoid loop when discarding contents of progress pipe
Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
Upstream-commit: 51f698337d
Component: cli
2017-05-16 14:34:59 -07:00
37f8c1ed6a Re-vendor docker/docker.
Signed-off-by: Ying Li <ying.li@docker.com>
Upstream-commit: 103bfb2739
Component: cli
2017-05-16 14:31:19 -07:00
a87d4d281d Provide command line tool to view and rotate swarm's currently CA root certificate.
Signed-off-by: Ying Li <ying.li@docker.com>
Upstream-commit: 3fe8321d0c
Component: cli
2017-05-16 14:31:15 -07:00
ff47f5ac2e Add support for configs to compose format
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
Upstream-commit: e574286ba2
Component: cli
2017-05-16 17:10:14 -04:00
2e0471b665 Merge pull request #71 from thaJeztah/add-credspec-to-compose
add credential-spec to compose
Upstream-commit: 90809f8fd9
Component: cli
2017-05-16 16:45:06 -04:00
497edf6960 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>
Upstream-commit: ab6bc5dce6
Component: cli
2017-05-16 12:27:31 -07:00
2112e5a5da Use CheckRedirect so that client behaves the same way with GO 1.8
Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: f9ab6a77b0
Component: cli
2017-05-16 11:48:00 -04:00
81a1bf8cf1 Add codecov configuration
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
Upstream-commit: f4b8aec86e
Component: cli
2017-05-16 16:53:35 +02:00
71cfdc53d3 Remove unused windows resourcefiles.
Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: 329f4e29c5
Component: cli
2017-05-15 22:50:33 -04:00
2d89d443c2 Fix float64 comparison in stats_helpers_test.go
Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp>
Upstream-commit: 3c78bc775c
Component: cli
2017-05-16 02:13:00 +00:00
798e7f5d71 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>
Upstream-commit: 82600b7021
Component: cli
2017-05-16 02:00:47 +00:00
d7802c7d2b Add windows resources to binary.
Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: 8a6ad48d2b
Component: cli
2017-05-15 18:03:03 -04:00
473491581d Support running unit tests when files are saved.
Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: 74c06a140b
Component: cli
2017-05-15 17:02:58 -04:00
54778e28e7 Merge pull request #78 from dnephin/fix-cross-build
Fix cross compile build
Upstream-commit: a2225276af
Component: cli
2017-05-15 12:31:34 -07:00
5c35f1a58b 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>
Upstream-commit: 4e7943646b
Component: cli
2017-05-15 15:00:26 -04:00
15f41f0cf9 Merge pull request #82 from vdemeester/opts-from-docker
Import `opts` package from moby/moby
Upstream-commit: 36e557f1a3
Component: cli
2017-05-15 11:38:59 -07:00
a6473845ef 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>
Upstream-commit: 60b2dd3e23
Component: cli
2017-05-15 14:07:30 -04:00
ca78770821 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>
Upstream-commit: 35c6e555e0
Component: cli
2017-05-15 19:20:12 +02:00
242da31a23 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>
Upstream-commit: d7f6563efc
Component: cli
2017-05-15 14:45:19 +02:00
fd70e3c064 Update CLI docs and add opts/config.go
Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
Upstream-commit: 560dc7660f
Component: cli
2017-05-15 11:57:21 +02:00
9d6529ee2a support custom paths for secrets
This adds support to specify custom container paths for secrets.

Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
Upstream-commit: 08097edc78
Component: cli
2017-05-15 11:57:21 +02:00
5307ef4aee 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>
Upstream-commit: eb366ae039
Component: cli
2017-05-15 11:57:21 +02:00