3f4d91508e
Remove useless prune package 👼
...
The `cli/command/prune` just does some aliasing of `Prune*` methods,
doesn't have any use.
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
2017-07-18 09:49:02 +02:00
6c3a448ecb
Fix: skip build-cache prune on unsupported versions
...
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2017-07-17 11:55:35 +02:00
1333b49194
Sort swarm stacks and nodes using natural sorting
...
This commit changes the order stacks and nodes are displayed.
For example, running "docker stack ls" is expected to
display the following list:
NAME SERVICES
service-1 1
service-2 1
service-10 1
However, currently this is what is printed:
NAME SERVICES
service-1 1
service-10 1
service-2 1
To fix this, "docker stack ls" and "docker node ls" are using
natural sorting to make it more human readable.
Signed-off-by: Boaz Shuster <ripcurld.github@gmail.com>
2017-07-13 14:33:02 +03:00
ae38f202bb
Merge pull request #271 from tych0/password-stdin
...
Password stdin
2017-07-12 17:08:11 -07:00
4615c92f66
Fix warning in docker CLI when `swarm ca --ca-cert`, etc. flags are passed,
...
and add a test.
Signed-off-by: Ying Li <ying.li@docker.com>
2017-07-12 14:56:28 -07:00
f27934376d
Fix test and lint failures
...
Split test cases.
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2017-07-12 11:37:35 -04:00
87345ed117
Merge pull request #277 from thaJeztah/dont-remove-what-isnt-there
...
Don't attempt to remove unsupported resources on older daemon
2017-07-12 10:43:54 +02:00
fa7687a362
Merge pull request #299 from dnephin/less-verbose-fake-cli
...
Less verbose fake cli
2017-07-12 09:56:43 +02:00
42a3800783
Update some tests to remove unnecessary buffers.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2017-07-11 17:52:43 -04:00
3da0cbfdd1
Remove unnecessary use of SetConfigfile
...
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2017-07-11 14:49:30 -04:00
69b142b52a
Update FakeCli to remove duplication in tests.
...
Use byte buffers by default, since that is what is done most of the time.
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2017-07-11 14:49:30 -04:00
102a8f0c9d
Pin all tools used in the Dockerfiles
...
Also update gometalinter to use the official version. The update
found some new gosimple errors, which are fixed.
Also update the filewatcher script for the latest version of filewatcher.
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2017-07-11 14:23:27 -04:00
7d18477bc2
login: add a --password-stdin argument
...
This:
* conflicts with --password (naturally)
* conflicts with the absence of --username (both can't be grabbed by the
stdin)
* strips a trailing newline off the password if it exists
Signed-off-by: Tycho Andersen <tycho@tycho.ws>
2017-07-11 12:16:29 -06:00
2429f15672
Don't attempt to remove unsupported resources on older daemon
...
When running `docker stack rm <some stack>` against an older daemon,
a warning was printed for "configs" being ignored;
WARNING: ignoring "configs" (requires API version 1.30, but the Docker daemon API version is 1.26)
Given that an old daemon cannot _have_ configs, there should not be
a need to warn, or _attempt_ to remove these resources.
This patch removes the warning, and skips fetching (and removing)
configs.
A check if _secrets_ are supported by the daemon is also added,
given that this would result in an error when attempted against
an older (pre 1.13) daemon.
There is one situation where this could lead to secrets or
configs being left behind; if the client is connecting to a
daemon that _does_ support secrets, configs, but the API version
is overridden using `DOCKER_API_VERSION`, no warning is printed,
and secrets and configs are not attempted to be removed.
Given that `DOCKER_API_VERSION` is regarded a feature for
debugging / "power users", it should be ok to ignore this.
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2017-07-11 10:29:03 -07:00
d8a2972cb1
Remove unused prune functions
...
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2017-07-10 13:27:19 -07:00
af6c0896f5
Merge pull request #298 from dnephin/fix-stack-out-stream
...
Fix stack output stream
2017-07-10 09:23:23 +02:00
7ae9bc141c
Merge pull request #259 from aaronlehmann/service-progress-surface-error
...
progress: Show task error in place of progress bar
2017-07-09 00:04:38 -07:00
c99530b1d2
Merge pull request #270 from tych0/warn-only-about-password-on-cli
...
login: print a big warning when using --password
2017-07-08 16:37:40 -07:00
c9b92a328d
progress: Light refactor
...
Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
2017-07-06 10:40:35 -07:00
45b0e7cf1a
fixing SIGSEGV when running containers
...
Signed-off-by: Yassine TIJANI <yasstij11@gmail.com>
moving the deffering of the close after the error checking
Signed-off-by: Yassine TIJANI <yasstij11@gmail.com>
fixing SIGSEGV when running containers
Signed-off-by: Yassine TIJANI <yasstij11@gmail.com>
2017-07-06 18:57:36 +02:00
1aa82bc7df
Merge pull request #211 from ksouf/issue-37-add-tests-on-commands
...
adding network_create tests
2017-07-06 08:59:15 +02:00
e672589ec0
Merge pull request #296 from thaJeztah/fix-error-overwrite
...
Fix error variable being overwritten
2017-07-05 19:26:27 -07:00
57c1551991
adding unit tests to network
...
Signed-off-by: khaled souf <khaled.souf@gmail.com>
2017-07-06 00:54:30 +02:00
4d4c789cac
Fix error variable being overwritten
...
The `err` variable was set in a loop, so only
the last result was taken into account to return
"failure" or not.
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2017-07-05 13:54:57 -07:00
0030bfea9f
Remove duplication in task formatting.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2017-07-05 13:40:47 -04:00
fb6deb1077
Fix stream for 'nothing found in stack' message
...
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2017-07-05 13:32:54 -04:00
e8080dd7e5
update tests for new image struct
...
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2017-07-04 20:34:24 -07:00
3554d02f33
Merge pull request #276 from adshmh/add-unit-tests-to-checkpoint-package
...
add unit tests to checkpoint package
2017-07-04 11:17:25 -04:00
43fb4a4547
Merge pull request #243 from vieux/scale2
...
add `--detach` to docker scale
2017-07-04 16:36:59 +02:00
85b41c3e71
Merge pull request #213 from dnephin/improve-swarm-ca-cmd
...
Refactor and UI changes to `swarm ca` command
2017-07-03 17:02:45 +02:00
c269ad26e8
login: print a big warning when using --password
...
Task command lines are world readable via /proc/pid/cmdline, so this isn't
safe.
Signed-off-by: Tycho Andersen <tycho@tycho.ws>
2017-07-03 08:47:20 -06:00
58d3fc24b1
scale all services at once
...
Signed-off-by: Victor Vieux <victorvieux@gmail.com>
2017-07-03 13:40:54 +02:00
b296abd542
add unit tests to cli/command/checkpoint package
...
Signed-off-by: Arash Deshmeh <adeshmeh@ca.ibm.com>
2017-06-30 17:17:47 -04:00
379b762495
Merge pull request #273 from adshmh/add-unit-tests-to-task-package
...
add unit tests to task package
2017-06-30 11:41:24 -04:00
244e28f41f
add unit tests to task package
...
Signed-off-by: Arash Deshmeh <adeshmeh@ca.ibm.com>
2017-06-29 17:57:31 -04:00
81e9837859
Refactor caCommand
...
Split out a swarmCAOptions struct for options that are shared between
the ca and update commands.
Change the 'no trust root' message to an error.
Add some unit tests.
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2017-06-29 17:57:06 -04:00
a04aa8fe28
Compress after rewriting the archive.
...
Write a test showing compress failure.
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2017-06-29 13:18:10 -04:00
74af31be7f
Merge pull request #227 from dnephin/expose-config
...
expose config credentials without needing the Cli
2017-06-29 19:11:37 +02:00
64486d7820
Merge pull request #255 from albers/system-prune-volume-warning
...
system prune: only warn for volumes if --volumes is given
2017-06-29 08:50:16 -07:00
849b0e96a0
system prune: only warn about volumes if --volumes is given
...
Signed-off-by: Harald Albers <github@albersweb.de>
2017-06-29 15:07:21 +02:00
dd3eae84e1
progress: Add unit tests
...
Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
2017-06-28 17:53:56 -07:00
d3f9a6c610
on_failure -> on-failure in compose code
...
on_failure should be on-failure
Signed-off-by: Charlie Drage <charlie@charliedrage.com>
2017-06-28 11:10:02 -04:00
1ef585f65d
progress: Show task error in place of progress bar
...
If a task encounters an error, the interactive "service create" and
"service update" commands should show that error instead of showing a
stuck progress bar.
To validate:
docker service create --detach=false --name broken --restart-condition=none --replicas 3 busybox asdf
and
docker service create --detach=false --name broken --mode global --restart-condition none busybox asdf
Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
2017-06-27 15:12:31 -07:00
82e069026b
progress: Show success message when finished counting down
...
Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
2017-06-27 15:07:10 -07:00
6c6b1091d9
add --detach to docker scale
...
Signed-off-by: Victor Vieux <victorvieux@gmail.com>
2017-06-27 09:55:10 -07:00
105b21d1ab
Rename NewConfigFile to New in configfile package
...
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
2017-06-27 16:31:38 +02:00
62dfbef4d8
Add missing unit tests.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2017-06-27 13:46:47 +02:00
a3cbc70147
Move credential getting functions to the ConfigFile.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2017-06-27 13:46:47 +02:00
33cbb70270
Cleanup config/credentials, remove dependency on config file.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2017-06-27 13:45:50 +02:00
a8c70e43a3
Move config file loading to more appropriate packages.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2017-06-27 13:45:50 +02:00
cfff0e2259
Merge pull request #207 from cyli/warn-swarm-ca-command
...
If `docker swarm ca` is not called with the `--rotate` flag, warn if other flags are passed
2017-06-26 20:56:54 -07:00
db60f25561
hide --detach for docker < 17.05
...
Signed-off-by: Victor Vieux <victorvieux@gmail.com>
2017-06-26 18:55:30 -07:00
0133e13353
Merge pull request #231 from tonistiigi/client-session-fssession
...
Incrementally sending build context
2017-06-26 17:15:34 -07:00
2f58992f85
Merge pull request #237 from aaronlehmann/progress-before-assignment
...
progress: Show progress of replicated tasks before they are assigned
2017-06-26 17:14:07 -07:00
b95638a5ac
Use long running session in builder
...
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
Add incremental context send support
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
2017-06-26 16:30:01 -07:00
298d486d8b
Merge pull request #235 from vdemeester/234-fix-warn
...
Add a line break after warning 👼
2017-06-24 02:17:26 -07:00
d3d09f67b1
progress: Show progress of replicated tasks before they are assigned
...
This was only showing tasks that belong to nodes that are currently up,
so that tasks on down nodes don't appear to be stuck. But this
unintentionally excludes tasks that haven't been assigned yet, so if a
task is stuck before assignment, for example because no nodes meet its
constraints, a progress bar won't even be shown. The check should only
apply to tasks that have a node assignment.
Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
2017-06-23 17:34:59 -07:00
ae8d049f9e
fix build issue with updated moby
...
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
2017-06-23 16:12:20 -07:00
8b6196ded7
Merge pull request #236 from vdemeester/import-displayable-ports-from-moby
...
Import DisplayablePorts from moby/moby source
2017-06-23 15:01:53 -04:00
c60d13e539
Fix cyclomatic complexity of two formatters
...
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2017-06-23 11:34:22 -07:00
b7fad8f1dc
Add a line break after warning 👼
...
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
2017-06-23 20:15:00 +02:00
9e142cadc9
Import DisplayablePorts from moby/moby source
...
This has nothing to do in the `api` package for moby as it's just a
cli display function.
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
2017-06-23 20:12:30 +02:00
0c6b8d717d
Merge pull request #221 from dnephin/fix-lint-errors
...
Fix lint errors merged while new lint branch was in PR
2017-06-23 09:54:12 +02:00
aefbc9d8f7
Merge pull request #202 from ripcurld0/fix_32235_moby
...
Unmarshal a number as a Number in RawInspectFallback
2017-06-22 23:12:50 -07:00
732261f774
Use compose volume spec parser for container volume flag
...
Restore testcases for Volume spec parsing.
And correctly interpret the parsed volume.
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2017-06-21 11:16:04 -04:00
db6ff357a7
Some improvements to compose volume spec parsing
...
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2017-06-21 11:13:52 -04:00
9a2f2d769d
Unmarshal a number as a Number in RawInspectFallback
...
Running `docker inspect --format "{{.ID}} {{.Size}}" alpine` prints
sha256:651aa95985aa4a17a38ffcf71f598ec461924ca96865facc2c5782ef2d2be07f 3983636
While `docker inspect --format "{{.Id}} {{.Size}}" alpine` prints
sha256:651aa95985aa4a17a38ffcf71f598ec461924ca96865facc2c5782ef2d2be07f 3.983636e+06
This happens because "Id" is not a field of types.ImageInspect and thus
tryRawInspectFallback is called and converts the raw response into `interface{}`
using a JSON decoder. However, by default that decoder converts numbers into
`float64` unless `UseNumber` is set.
Signed-off-by: Boaz Shuster <ripcurld.github@gmail.com>
2017-06-21 13:10:14 +03:00
d5d0ec56c1
Merge pull request #214 from adshmh/add-unit-tests-to-stack-package
...
add unit tests to stack package
2017-06-21 10:00:08 +02:00
b84e21cd05
Fix lint errors merged while new lint branch was in PR.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2017-06-21 00:11:59 -04:00
32b43bc21a
If `docker swarm ca` is not called with the `--rotate` flag, the other
...
flags, including cert expiry, will be ignored, so warn if a user attempts
to use `docker swarm ca --cert-expiry` or something.
Signed-off-by: Ying Li <ying.li@docker.com>
2017-06-20 18:55:10 -07:00
2bfac7fcda
Merge pull request #176 from dnephin/new-lint
...
New linters
2017-06-20 16:47:45 -07:00
760f847bc8
Merge pull request #195 from Zebrilee/fix-issue-114
...
fix the issue `--help` doesn't work if daemon is not available
2017-06-20 16:38:36 -07:00
535af2d868
add unit tests to stack package
...
Signed-off-by: Arash Deshmeh <adeshmeh@ca.ibm.com>
2017-06-20 14:31:00 -04:00
35f1e301b5
Allow Proxy Configuration in config.json
...
This commit modifies config.json to allow for any proxies allowed in
build-args to be configured. These values will then be used
by default as build-args in docker build.
Signed-off-by: Dave Tucker <dt@docker.com>
2017-06-20 09:51:41 +01:00
cca30cb1d9
comment the return of setHelpFunc in order to show --help even if the daemon is not running. Then add a if statement in isSupported function to check if the daemon is running
...
Signed-off-by: zebrilee <zebrilee@gmail.com>
revert change on docker.go, set HasExperimental to true in cli.go
Signed-off-by: zebrilee <zebrilee@gmail.com>
2017-06-16 10:24:26 +02:00
7f71d0d979
removed logging from command/formatter package tests
...
Signed-off-by: Arash Deshmeh <adeshmeh@ca.ibm.com>
2017-06-15 14:14:59 -04:00
3724fb7f37
Add gosimple lint
...
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2017-06-14 16:55:08 -07:00
3e3934c19f
Add unparam linter
...
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2017-06-14 16:55:08 -07:00
3bf0317fea
Add unconvert linter
...
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2017-06-14 16:54:27 -07:00
a712993e93
Add misspell lint
...
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2017-06-14 16:54:27 -07:00
01e1e58ada
Add unused linter.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2017-06-14 16:54:27 -07:00
759e59e4a4
Merge pull request #182 from vdemeester/180-fix-stack-rm-config-endpoint
...
Do not call the config endpoint if API is lower than 1.30
2017-06-14 14:31:01 -04:00
751278abe6
removed logging from service/inspect test to clean up the output of running tests
...
Signed-off-by: Arash Deshmeh <adeshmeh@ca.ibm.com>
2017-06-14 12:38:31 -04:00
d209929aab
Merge pull request #187 from dnephin/small-cleanup-to-image-remove
...
Fix some problems with image force remove
2017-06-14 09:59:32 +02:00
4ffefe4a1f
Merge pull request #115 from jsoref/spelling
...
Spelling
2017-06-14 09:58:55 +02:00
2128b3f112
Do not call the config endpoint if API is lower than 1.30
...
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
2017-06-14 09:56:53 +02:00
275c488734
Merge pull request #72 from thaJeztah/fix-prefix-matching
...
Fix prefix-matching for service ps
2017-06-13 14:59:37 -07:00
25bc9f1ce7
Merge pull request #184 from yongtang/167-network-inspect-scope
...
Use scope=swarm for service related network inspect and revendor docker/docker
2017-06-13 14:47:20 -07:00
657457ee2c
Use `scope=swarm` for service related network inspect.
...
This fix use `scope=swarm` for service related network inspect.
The purpose is that, in case multiple networks with the same
name exist in different scopes, it is still possible to obtain
the network for services.
This fix is related to moby/moby#33630 and docker/cli#167
Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
2017-06-13 20:26:12 +00:00
676b71eaaa
Fix some problems with image remove force.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2017-06-13 12:12:54 -07:00
006b9b126d
fixed the output leak from error test case for config/remove
...
Signed-off-by: Arash Deshmeh <adeshmeh@ca.ibm.com>
2017-06-13 12:24:42 -04:00
dd924ebf4f
Fix remove_test output duplication
...
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
2017-06-13 14:02:56 +02:00
ecc8e0a204
Merge pull request #160 from e11137/master
...
fixes #46 Always exit 0 when remove image with force option
2017-06-13 14:02:02 +02:00
dd585ad4fb
Merge pull request #172 from adshmh/fix-secret-remove-testcase-error-message-leak
...
fixed the output leak from the error test case for secret/remove command
2017-06-09 21:03:33 +02:00
77062a09dc
fixed the output leak from secret/remove command error test case
...
Signed-off-by: Arash Deshmeh <adeshmeh@ca.ibm.com>
2017-06-09 13:21:14 -04:00
852bf0f96d
removed the output leaked from stack remove error test case
...
Signed-off-by: Arash Deshmeh <adeshmeh@ca.ibm.com>
2017-06-09 12:14:18 -04:00
a74e715b1a
Merge pull request #166 from thaJeztah/update-term
...
Bump docker/docker to cd35e4beee13a7c193e2a89008cd87d38fcd0161
2017-06-08 13:45:32 -07:00
4d980880f3
Merge pull request #121 from nishanttotla/digest-pinning-stack-deploy
...
Enable client side digest pinning for stack deploy
2017-06-08 23:20:02 +03:00
0310de5213
Move IsArchive and HeaderSize to build/context
...
Previously these were in docker/docker/pkg/archive, but unused
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2017-06-08 16:08:11 -04:00
5c8d702af5
Always exit whith -1 when remove image with force option
...
Signed-off-by: Rogelio Canedo <rcanedo@mappy.priv>
2017-06-08 20:15:37 +02:00
Vincent Demeester
Sebastiaan van Stijn
Boaz Shuster
Sebastiaan van Stijn
Ying Li
Daniel Nephin
Vincent Demeester
Tycho Andersen
Aaron Lehmann
Yassine TIJANI
khaled souf
Daniel Nephin
Victor Vieux
Arash Deshmeh
Kenfe-Mickaël Laventure
Harald Albers
Charlie Drage
Tonis Tiigi
Brian Goff
Dave Tucker
zebrilee
Yong Tang
Rogelio Canedo