Commit Graph

4076 Commits

Author SHA1 Message Date
f453764eee 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
Upstream-commit: cfff0e2259
Component: cli
2017-06-26 20:56:54 -07:00
5323af3564 hide --detach for docker < 17.05
Signed-off-by: Victor Vieux <victorvieux@gmail.com>
Upstream-commit: db60f25561
Component: cli
2017-06-26 18:55:30 -07:00
bc7c33134c Merge pull request #231 from tonistiigi/client-session-fssession
Incrementally sending build context
Upstream-commit: 0133e13353
Component: cli
2017-06-26 17:15:34 -07:00
99068fccc9 Merge pull request #237 from aaronlehmann/progress-before-assignment
progress: Show progress of replicated tasks before they are assigned
Upstream-commit: 2f58992f85
Component: cli
2017-06-26 17:14:07 -07:00
f1b5e42df0 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>
Upstream-commit: b95638a5ac
Component: cli
2017-06-26 16:30:01 -07:00
6c88b7bdd9 Fix false Liquid errors
Signed-off-by: Misty Stanley-Jones <misty@docker.com>
Upstream-commit: 11c1729e00
Component: cli
2017-06-26 12:50:34 -07:00
d0a0bd4e19 Merge pull request #235 from vdemeester/234-fix-warn
Add a line break after warning 👼
Upstream-commit: 298d486d8b
Component: cli
2017-06-24 02:17:26 -07:00
3b769b27be 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>
Upstream-commit: d3d09f67b1
Component: cli
2017-06-23 17:34:59 -07:00
ec6218872a fix build issue with updated moby
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
Upstream-commit: ae8d049f9e
Component: cli
2017-06-23 16:12:20 -07:00
a2d1e59fe3 Merge pull request #236 from vdemeester/import-displayable-ports-from-moby
Import DisplayablePorts from moby/moby source
Upstream-commit: 8b6196ded7
Component: cli
2017-06-23 15:01:53 -04:00
d33398c2c4 vendor: update moby
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
Upstream-commit: 4adf701567
Component: cli
2017-06-23 11:34:22 -07:00
a254f57702 Fix cyclomatic complexity of two formatters
Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: c60d13e539
Component: cli
2017-06-23 11:34:22 -07:00
61f81c51e1 Add a line break after warning 👼
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
Upstream-commit: b7fad8f1dc
Component: cli
2017-06-23 20:15:00 +02:00
a9a5f68c49 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>
Upstream-commit: 9e142cadc9
Component: cli
2017-06-23 20:12:30 +02:00
f79cf3c340 Merge pull request #221 from dnephin/fix-lint-errors
Fix lint errors merged while new lint branch was in PR
Upstream-commit: 0c6b8d717d
Component: cli
2017-06-23 09:54:12 +02:00
0ada256ac5 Merge pull request #232 from dnephin/fix-circle-git
Use an image with git and ssh for circleCI
Upstream-commit: ca8e991469
Component: cli
2017-06-23 09:37:18 +02:00
b7706d3788 Merge pull request #202 from ripcurld0/fix_32235_moby
Unmarshal a number as a Number in RawInspectFallback
Upstream-commit: aefbc9d8f7
Component: cli
2017-06-22 23:12:50 -07:00
797b9c7a2d Use an image with git and ssh for circleCI
Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: 74c1388f66
Component: cli
2017-06-22 19:51:36 -04:00
08990efb47 Merge pull request #226 from mstanleyjones/typo-fix-auth
Fix small typo
Upstream-commit: ae2c3ffb40
Component: cli
2017-06-22 10:01:24 +02:00
9fb14cdd14 Fix mounts for directories with weird chars
Fixes:
`make -f docker.Makefile binary`

When directories have characters like `&&` they must be wrapped in
quotes or else the docker run command will fail.

Signed-off-by: Eli Uriegas <eli.uriegas@docker.com>
Upstream-commit: 1119e992f2
Component: cli
2017-06-21 17:47:40 -07:00
08cdfb1fb9 Fix small typo
Signed-off-by: Misty Stanley-Jones <misty@docker.com>
Upstream-commit: ede69a38c2
Component: cli
2017-06-21 11:06:26 -07:00
ebe9d0fb69 Merge pull request #152 from dnephin/improve-volume-parse
Improve volume spec parsing
Upstream-commit: edfc89f4de
Component: cli
2017-06-21 11:45:20 -04:00
bcbca95cb7 Merge pull request #222 from thaJeztah/carry-moby-33290
Explain `stack deploy` with multiple Compose files
Upstream-commit: 4b1055aaa6
Component: cli
2017-06-21 17:36:20 +02:00
2b68a9d068 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>
Upstream-commit: 732261f774
Component: cli
2017-06-21 11:16:04 -04:00
49c6d18b80 Some improvements to compose volume spec parsing
Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: db6ff357a7
Component: cli
2017-06-21 11:13:52 -04:00
8903bd3d57 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>
Upstream-commit: 9a2f2d769d
Component: cli
2017-06-21 13:10:14 +03:00
3d78550cb5 Merge pull request #164 from mstanleyjones/clarify-attach
Clarify ability to attach multiple times
Upstream-commit: 9f00ec085f
Component: cli
2017-06-21 10:59:34 +02:00
be0409b2e0 Merge pull request #196 from dnephin/use-circleci-workflow
Use CircleCI workflows
Upstream-commit: 93562e94a9
Component: cli
2017-06-21 10:06:31 +02:00
3b2ad4db09 Merge pull request #214 from adshmh/add-unit-tests-to-stack-package
add unit tests to stack package
Upstream-commit: d5d0ec56c1
Component: cli
2017-06-21 10:00:08 +02:00
878246195d Merge pull request #216 from thaJeztah/fix-markdown
Fix Markdown formatting of experimental "stacks"
Upstream-commit: e07fbfda7e
Component: cli
2017-06-20 21:31:07 -07:00
0e797a650f Explain stack deploy with multiple Compose files
The Docker Compose docs suggest using a separate override
configuration file for production-specific settings, but
it is not obvious how to feed this to `docker stack deploy`,
which only supports a single Compose file as input. Thus,
we now describe how to do this by merging the configuration
files with `docker-compose config`.

Signed-off-by: Denis Washington <denis@denisw.de>
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: 36fa4af30b
Component: cli
2017-06-20 21:23:21 -07:00
edf13621d4 Fix lint errors merged while new lint branch was in PR.
Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: b84e21cd05
Component: cli
2017-06-21 00:11:59 -04:00
8a5a7a8a1e 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>
Upstream-commit: 32b43bc21a
Component: cli
2017-06-20 18:55:10 -07:00
2dbec80975 Merge pull request #176 from dnephin/new-lint
New linters
Upstream-commit: 2bfac7fcda
Component: cli
2017-06-20 16:47:45 -07:00
c196fc8ae5 Merge pull request #195 from Zebrilee/fix-issue-114
fix the issue `--help` doesn't work if daemon is not available
Upstream-commit: 760f847bc8
Component: cli
2017-06-20 16:38:36 -07:00
8f64a8f93c Fix Markdown formatting of experimental "stacks"
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: c5301ca35d
Component: cli
2017-06-20 15:15:08 -07:00
e2861e049e add unit tests to stack package
Signed-off-by: Arash Deshmeh <adeshmeh@ca.ibm.com>
Upstream-commit: 535af2d868
Component: cli
2017-06-20 14:31:00 -04:00
d49d72e7d6 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>
Upstream-commit: 35f1e301b5
Component: cli
2017-06-20 09:51:41 +01:00
6f4d8ba43b Merge pull request #124 from darrenstahlmsft/revendorGowinio
Update go-winio to v0.4.1
Upstream-commit: 5dd30732a2
Component: cli
2017-06-16 15:21:55 -07:00
9fa6954b47 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>
Upstream-commit: cca30cb1d9
Component: cli
2017-06-16 10:24:26 +02:00
ad6108e6a5 Try out circleci workflow
Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: 75aebdd463
Component: cli
2017-06-15 12:38:40 -07:00
3f1fb4c18f removed logging from command/formatter package tests
Signed-off-by: Arash Deshmeh <adeshmeh@ca.ibm.com>
Upstream-commit: 7f71d0d979
Component: cli
2017-06-15 14:14:59 -04:00
1aa1877000 Merge pull request #198 from thaJeztah/add-exec-example
Added usage example for -e for exec
Upstream-commit: eb7452cf3a
Component: cli
2017-06-15 18:18:48 +02:00
cd9e55249f Added usage example for -e for exec
Signed-off-by: Vishnu Narayanan <iamwishnu@gmail.com>
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: c848d9b22d
Component: cli
2017-06-15 17:24:41 +02:00
6c8b2e5bbf Use a fork of gometalinter
Until https://github.com/alecthomas/gometalinter/pull/289 is merged.
This reduces the runtime of the linter by 50x

Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: 4881ef507f
Component: cli
2017-06-14 17:30:45 -07:00
b88ae58881 Add gosimple lint
Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: 3724fb7f37
Component: cli
2017-06-14 16:55:08 -07:00
003a07af7c Add unparam linter
Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: 3e3934c19f
Component: cli
2017-06-14 16:55:08 -07:00
c9b100a0be Add unconvert linter
Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: 3bf0317fea
Component: cli
2017-06-14 16:54:27 -07:00
16de65eef4 Add misspell lint
Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: a712993e93
Component: cli
2017-06-14 16:54:27 -07:00
2cdc30d891 Add unused linter.
Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: 01e1e58ada
Component: cli
2017-06-14 16:54:27 -07:00