9c9fdfadf7
update tests for new image struct
...
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: e8080dd7e5
2017-07-04 20:34:24 -07:00
2a3613893d
Merge pull request #276 from adshmh/add-unit-tests-to-checkpoint-package
...
add unit tests to checkpoint package
Upstream-commit: 3554d02f33
2017-07-04 11:17:25 -04:00
d2b6d249be
Merge pull request #243 from vieux/scale2
...
add `--detach` to docker scale
Upstream-commit: 43fb4a4547
2017-07-04 16:36:59 +02:00
c914e1a6cd
Merge pull request #213 from dnephin/improve-swarm-ca-cmd
...
Refactor and UI changes to `swarm ca` command
Upstream-commit: 85b41c3e71
2017-07-03 17:02:45 +02:00
0b37ceed6f
scale all services at once
...
Signed-off-by: Victor Vieux <victorvieux@gmail.com >
Upstream-commit: 58d3fc24b1
2017-07-03 13:40:54 +02:00
b58012d75f
add unit tests to cli/command/checkpoint package
...
Signed-off-by: Arash Deshmeh <adeshmeh@ca.ibm.com >
Upstream-commit: b296abd542
2017-06-30 17:17:47 -04:00
3bd733bca1
Merge pull request #273 from adshmh/add-unit-tests-to-task-package
...
add unit tests to task package
Upstream-commit: 379b762495
2017-06-30 11:41:24 -04:00
04259ca4ac
add unit tests to task package
...
Signed-off-by: Arash Deshmeh <adeshmeh@ca.ibm.com >
Upstream-commit: 244e28f41f
2017-06-29 17:57:31 -04:00
05c34f9c1a
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 >
Upstream-commit: 81e9837859
2017-06-29 17:57:06 -04:00
27d5d2149c
Compress after rewriting the archive.
...
Write a test showing compress failure.
Signed-off-by: Daniel Nephin <dnephin@docker.com >
Upstream-commit: a04aa8fe28
2017-06-29 13:18:10 -04:00
d8218cc6ef
Merge pull request #227 from dnephin/expose-config
...
expose config credentials without needing the Cli
Upstream-commit: 74af31be7f
2017-06-29 19:11:37 +02:00
38c47208e6
Merge pull request #255 from albers/system-prune-volume-warning
...
system prune: only warn for volumes if --volumes is given
Upstream-commit: 64486d7820
2017-06-29 08:50:16 -07:00
7b10a8b5c9
system prune: only warn about volumes if --volumes is given
...
Signed-off-by: Harald Albers <github@albersweb.de >
Upstream-commit: 849b0e96a0
2017-06-29 15:07:21 +02:00
f397c29ebe
on_failure -> on-failure in compose code
...
on_failure should be on-failure
Signed-off-by: Charlie Drage <charlie@charliedrage.com >
Upstream-commit: d3f9a6c610
2017-06-28 11:10:02 -04:00
ad9f81da7f
progress: Show success message when finished counting down
...
Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com >
Upstream-commit: 82e069026b
2017-06-27 15:07:10 -07:00
37752ce207
add --detach to docker scale
...
Signed-off-by: Victor Vieux <victorvieux@gmail.com >
Upstream-commit: 6c6b1091d9
2017-06-27 09:55:10 -07:00
ac616d52fb
Rename NewConfigFile to New in configfile package
...
Signed-off-by: Vincent Demeester <vincent@sbr.pm >
Upstream-commit: 105b21d1ab
2017-06-27 16:31:38 +02:00
284dc93fb1
Add missing unit tests.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com >
Upstream-commit: 62dfbef4d8
2017-06-27 13:46:47 +02:00
2f4e7d39ca
Move credential getting functions to the ConfigFile.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com >
Upstream-commit: a3cbc70147
2017-06-27 13:46:47 +02:00
c380487034
Cleanup config/credentials, remove dependency on config file.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com >
Upstream-commit: 33cbb70270
2017-06-27 13:45:50 +02:00
4682e5be27
Move config file loading to more appropriate packages.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com >
Upstream-commit: a8c70e43a3
2017-06-27 13:45:50 +02:00
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
2dbec80975
Merge pull request #176 from dnephin/new-lint
...
New linters
Upstream-commit: 2bfac7fcda
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
2017-06-20 16:38:36 -07:00
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
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
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
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
b88ae58881
Add gosimple lint
...
Signed-off-by: Daniel Nephin <dnephin@docker.com >
Upstream-commit: 3724fb7f37
2017-06-14 16:55:08 -07:00
003a07af7c
Add unparam linter
...
Signed-off-by: Daniel Nephin <dnephin@docker.com >
Upstream-commit: 3e3934c19f
2017-06-14 16:55:08 -07:00
c9b100a0be
Add unconvert linter
...
Signed-off-by: Daniel Nephin <dnephin@docker.com >
Upstream-commit: 3bf0317fea
2017-06-14 16:54:27 -07:00
