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
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
ab3ea637b6
Merge pull request #111 from keloyang/attach-restarting-check
...
Add a restarting check to runAttach
2017-06-08 12:53:15 +02:00
90f497302f
Add a restarting check to runAttach
...
Signed-off-by: Shukui Yang <yangshukui@huawei.com >
2017-06-08 07:12:39 +08:00
e8cc2cf760
Replace command.DockerCli to command.Cli in docker attach/exec command
...
Signed-off-by: Shukui Yang <yangshukui@huawei.com >
2017-06-08 07:03:52 +08:00
f790e839fc
Change --no-resolve-image flag to --resolve-image string flag
...
Signed-off-by: Nishant Totla <nishanttotla@gmail.com >
2017-06-07 12:30:11 -07:00
9f1bea2657
Enable client side digest pinning for stack deploy
...
Signed-off-by: Nishant Totla <nishanttotla@gmail.com >
2017-06-07 12:30:11 -07:00
08cb0bddfd
Merge pull request #162 from vdemeester/150-configs-fixes-on-old-daemon
...
Handle case of configs on old daemon
2017-06-07 12:18:32 -07:00
9d12d6fc87
Merge pull request #145 from dnephin/improve-compose-secrets-errors
...
Compose: Improve error messages when resource create/update fails
2017-06-07 18:51:10 +03:00
cf5550c426
Handle case of configs on old daemon
...
If configs are declared for a service and pointing on an old
daemon, error out properly (instead of "page not found").
If there is no configs declared, don't call convertServiceConfigObjs
to avoid having an error.
Signed-off-by: Vincent Demeester <vincent@sbr.pm >
2017-06-07 17:02:46 +02:00
44ac80881f
Update vendoring of docker/docker
...
Signed-off-by: Vincent Demeester <vincent@sbr.pm >
2017-06-06 00:23:21 +02:00
3718833f2c
Add unit tests for service/ps
...
Signed-off-by: Daniel Nephin <dnephin@docker.com >
2017-06-02 11:29:19 -04:00
a0066a150b
Merge pull request #143 from thaJeztah/remove-email-flag
...
Remove deprecated -e/--email flag from docker login
2017-06-02 08:56:07 +02:00
729d07a371
Compose: Improve error messages when resource creation/updates fail.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com >
2017-06-01 15:03:04 -04:00
