Sebastiaan van Stijn
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
2017-06-26 20:56:54 -07:00
Tibor Vass
0fcd0709a5
Merge pull request #219 from vieux/scale
...
hide `--detach` for docker < 17.05
Upstream-commit: c3e5445659
2017-06-26 20:47:39 -07:00
Victor Vieux
5323af3564
hide --detach for docker < 17.05
...
Signed-off-by: Victor Vieux <victorvieux@gmail.com >
Upstream-commit: db60f25561
2017-06-26 18:55:30 -07:00
Victor Vieux
bc7c33134c
Merge pull request #231 from tonistiigi/client-session-fssession
...
Incrementally sending build context
Upstream-commit: 0133e13353
2017-06-26 17:15:34 -07:00
Sebastiaan van Stijn
99068fccc9
Merge pull request #237 from aaronlehmann/progress-before-assignment
...
progress: Show progress of replicated tasks before they are assigned
Upstream-commit: 2f58992f85
2017-06-26 17:14:07 -07:00
Tonis Tiigi
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
2017-06-26 16:30:01 -07:00
Sebastiaan van Stijn
daace4e1a1
Merge pull request #241 from mstanleyjones/master
...
Fix false Liquid errors
Upstream-commit: 3648a8b9d0
2017-06-26 13:19:04 -07:00
Misty Stanley-Jones
6c88b7bdd9
Fix false Liquid errors
...
Signed-off-by: Misty Stanley-Jones <misty@docker.com >
Upstream-commit: 11c1729e00
2017-06-26 12:50:34 -07:00
Sebastiaan van Stijn
d0a0bd4e19
Merge pull request #235 from vdemeester/234-fix-warn
...
Add a line break after warning 👼
Upstream-commit: 298d486d8b
2017-06-24 02:17:26 -07:00
Aaron Lehmann
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
2017-06-23 17:34:59 -07:00
Tonis Tiigi
ec6218872a
fix build issue with updated moby
...
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com >
Upstream-commit: ae8d049f9e
2017-06-23 16:12:20 -07:00
Daniel Nephin
a2d1e59fe3
Merge pull request #236 from vdemeester/import-displayable-ports-from-moby
...
Import DisplayablePorts from moby/moby source
Upstream-commit: 8b6196ded7
2017-06-23 15:01:53 -04:00
Tonis Tiigi
d33398c2c4
vendor: update moby
...
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com >
Upstream-commit: 4adf701567
2017-06-23 11:34:22 -07:00
Daniel Nephin
a254f57702
Fix cyclomatic complexity of two formatters
...
Signed-off-by: Daniel Nephin <dnephin@docker.com >
Upstream-commit: c60d13e539
2017-06-23 11:34:22 -07:00
Vincent Demeester
61f81c51e1
Add a line break after warning 👼
...
Signed-off-by: Vincent Demeester <vincent@sbr.pm >
Upstream-commit: b7fad8f1dc
2017-06-23 20:15:00 +02:00
Vincent Demeester
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
2017-06-23 20:12:30 +02:00
Vincent Demeester
f79cf3c340
Merge pull request #221 from dnephin/fix-lint-errors
...
Fix lint errors merged while new lint branch was in PR
Upstream-commit: 0c6b8d717d
2017-06-23 09:54:12 +02:00
Vincent Demeester
0ada256ac5
Merge pull request #232 from dnephin/fix-circle-git
...
Use an image with git and ssh for circleCI
Upstream-commit: ca8e991469
2017-06-23 09:37:18 +02:00
Sebastiaan van Stijn
b7706d3788
Merge pull request #202 from ripcurld0/fix_32235_moby
...
Unmarshal a number as a Number in RawInspectFallback
Upstream-commit: aefbc9d8f7
2017-06-22 23:12:50 -07:00
Daniel Nephin
797b9c7a2d
Use an image with git and ssh for circleCI
...
Signed-off-by: Daniel Nephin <dnephin@docker.com >
Upstream-commit: 74c1388f66
2017-06-22 19:51:36 -04:00
Vincent Demeester
08990efb47
Merge pull request #226 from mstanleyjones/typo-fix-auth
...
Fix small typo
Upstream-commit: ae2c3ffb40
2017-06-22 10:01:24 +02:00
Vincent Demeester
ce6099fcd2
Merge pull request #228 from seemethere/wrap_pwd
...
Fix mounts for directories with weird chars
Upstream-commit: 53ac8bbed8
2017-06-22 09:59:41 +02:00
Eli Uriegas
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
2017-06-21 17:47:40 -07:00
Misty Stanley-Jones
08cdfb1fb9
Fix small typo
...
Signed-off-by: Misty Stanley-Jones <misty@docker.com >
Upstream-commit: ede69a38c2
2017-06-21 11:06:26 -07:00
Daniel Nephin
ebe9d0fb69
Merge pull request #152 from dnephin/improve-volume-parse
...
Improve volume spec parsing
Upstream-commit: edfc89f4de
2017-06-21 11:45:20 -04:00
Vincent Demeester
bcbca95cb7
Merge pull request #222 from thaJeztah/carry-moby-33290
...
Explain `stack deploy` with multiple Compose files
Upstream-commit: 4b1055aaa6
2017-06-21 17:36:20 +02:00
Daniel Nephin
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
2017-06-21 11:16:04 -04:00
Daniel Nephin
49c6d18b80
Some improvements to compose volume spec parsing
...
Signed-off-by: Daniel Nephin <dnephin@docker.com >
Upstream-commit: db6ff357a7
2017-06-21 11:13:52 -04:00
Boaz Shuster
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
2017-06-21 13:10:14 +03:00
Vincent Demeester
3d78550cb5
Merge pull request #164 from mstanleyjones/clarify-attach
...
Clarify ability to attach multiple times
Upstream-commit: 9f00ec085f
2017-06-21 10:59:34 +02:00
Vincent Demeester
be0409b2e0
Merge pull request #196 from dnephin/use-circleci-workflow
...
Use CircleCI workflows
Upstream-commit: 93562e94a9
2017-06-21 10:06:31 +02:00
Vincent Demeester
3b2ad4db09
Merge pull request #214 from adshmh/add-unit-tests-to-stack-package
...
add unit tests to stack package
Upstream-commit: d5d0ec56c1
2017-06-21 10:00:08 +02:00
Sebastiaan van Stijn
878246195d
Merge pull request #216 from thaJeztah/fix-markdown
...
Fix Markdown formatting of experimental "stacks"
Upstream-commit: e07fbfda7e
2017-06-20 21:31:07 -07:00
Sebastiaan van Stijn
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
2017-06-20 21:23:21 -07:00
Daniel Nephin
edf13621d4
Fix lint errors merged while new lint branch was in PR.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com >
Upstream-commit: b84e21cd05
2017-06-21 00:11:59 -04:00
Ying Li
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
2017-06-20 18:55:10 -07:00
Brian Goff
2dbec80975
Merge pull request #176 from dnephin/new-lint
...
New linters
Upstream-commit: 2bfac7fcda
2017-06-20 16:47:45 -07:00
Brian Goff
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
2017-06-20 16:38:36 -07:00
Brian Goff
6752b15b06
Merge pull request #93 from dave-tucker/proxyConfig
...
Allow Proxy Configuration in config.json
Upstream-commit: 6f6ccbd6bc
2017-06-20 16:15:19 -07:00
Sebastiaan van Stijn
8f64a8f93c
Fix Markdown formatting of experimental "stacks"
...
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: c5301ca35d
2017-06-20 15:15:08 -07:00
Arash Deshmeh
e2861e049e
add unit tests to stack package
...
Signed-off-by: Arash Deshmeh <adeshmeh@ca.ibm.com >
Upstream-commit: 535af2d868
2017-06-20 14:31:00 -04:00
Dave Tucker
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
2017-06-20 09:51:41 +01:00
Aaron Lehmann
6f4d8ba43b
Merge pull request #124 from darrenstahlmsft/revendorGowinio
...
Update go-winio to v0.4.1
Upstream-commit: 5dd30732a2
2017-06-16 15:21:55 -07:00
Brian Goff
a93d31683c
Merge pull request #199 from adshmh/remove-logging-from-command-formatter-package-tests
...
removed logging from command/formatter package tests
Upstream-commit: f767b9a118
2017-06-16 14:08:39 -04:00
zebrilee
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
2017-06-16 10:24:26 +02:00
Daniel Nephin
ad6108e6a5
Try out circleci workflow
...
Signed-off-by: Daniel Nephin <dnephin@docker.com >
Upstream-commit: 75aebdd463
2017-06-15 12:38:40 -07:00
Arash Deshmeh
3f1fb4c18f
removed logging from command/formatter package tests
...
Signed-off-by: Arash Deshmeh <adeshmeh@ca.ibm.com >
Upstream-commit: 7f71d0d979
2017-06-15 14:14:59 -04:00
Vincent Demeester
1aa1877000
Merge pull request #198 from thaJeztah/add-exec-example
...
Added usage example for -e for exec
Upstream-commit: eb7452cf3a
2017-06-15 18:18:48 +02:00
Sebastiaan van Stijn
246d4ea4ff
Merge pull request #194 from dnephin/run-docs-gen-in-ci
...
Run docs and man generation in CI
Upstream-commit: 23a0e3b7b7
2017-06-15 17:46:56 +02:00
Sebastiaan van Stijn
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
2017-06-15 17:24:41 +02:00
