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
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
6f6ccbd6bc
Merge pull request #93 from dave-tucker/proxyConfig
...
Allow Proxy Configuration in config.json
2017-06-20 16:15:19 -07: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
5dd30732a2
Merge pull request #124 from darrenstahlmsft/revendorGowinio
...
Update go-winio to v0.4.1
2017-06-16 15:21:55 -07:00
f767b9a118
Merge pull request #199 from adshmh/remove-logging-from-command-formatter-package-tests
...
removed logging from command/formatter package tests
2017-06-16 14:08:39 -04: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
eb7452cf3a
Merge pull request #198 from thaJeztah/add-exec-example
...
Added usage example for -e for exec
2017-06-15 18:18:48 +02:00
23a0e3b7b7
Merge pull request #194 from dnephin/run-docs-gen-in-ci
...
Run docs and man generation in CI
2017-06-15 17:46:56 +02:00
c848d9b22d
Added usage example for -e for exec
...
Signed-off-by: Vishnu Narayanan <iamwishnu@gmail.com>
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2017-06-15 17:24:41 +02:00
4881ef507f
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>
2017-06-14 17:30:45 -07: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
343d836a95
Run docs and man generation in CI
...
Also cleanup the scripts a bit to be more consistent, and fail on errors.
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2017-06-14 14:59:48 -07:00
4c224a7786
Merge pull request #191 from php-coder/improve_user_directive_doc
...
docs/reference/builder.md: mention that USER directive also allows to specify a user group
2017-06-14 22:03:38 +02: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
45c2c4c18f
Merge pull request #193 from dnephin/why-cover-so-slow
...
Speed up testing with coverage
2017-06-14 11:29:42 -07:00
63eff6548b
Merge pull request #192 from adshmh/remove-logging-from-service-inspect-test
...
remove logging from service/inspect test case to clean up the output of running tests
2017-06-14 14:23:40 -04:00
3a9ba545bc
Speed up testing with coverage
...
By running a 'go test -i' on all the packages first the overall runtime is significantly
decreased.
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2017-06-14 10:57:36 -07: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
a84463d8d5
docs/reference/builder.md: mention that USER directive also allows to specify the user group.
...
Signed-off-by: Slava Semushin <semushin@redhat.com>
2017-06-14 15:49:37 +02: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
3be666387a
Merge pull request #189 from tiborvass/update-docs
...
Update docs, completion, man
2017-06-13 23:04:09 -05:00
ee1bbab620
Update docs, completion scripts for disable-legacy-registry
...
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
(cherry picked from commit 2b8f0eef7338f37104464154ba65aef7db3b9703)
Signed-off-by: Tibor Vass <tibor@docker.com>
2017-06-14 02:48:46 +00:00
8b11d46ecd
Merge pull request #33572 from hsluoyz/patch-1
...
Add Casbin plugin to the list of Authorization plugins in docs.
(cherry picked from commit 220831d541bfe9bf566c1038773198d431560dd3)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
(cherry picked from commit 0ad3e3294e74f443130b5e1fb1ef6b31f4f92366)
Signed-off-by: Tibor Vass <tibor@docker.com>
2017-06-14 02:48:46 +00:00
ba4dcadcaa
Merge pull request #32804 from bbodenmiller/patch-1
...
remove extra word
(cherry picked from commit 9db03bd8cdad3c8804105cb5794ebad5e728f48f)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
(cherry picked from commit 3eaec0071c3ce1b7201e37859afe5bcb78d4f215)
Signed-off-by: Tibor Vass <tibor@docker.com>
2017-06-14 02:48:46 +00:00
8247a36058
Merge pull request #32791 from djalal/patch-1
...
fix typo
(cherry picked from commit 32a52716b964373b4ac464052e73ea5da79856c6)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
(cherry picked from commit fcbd93f52032593cc71b298c00a46fd354356650)
Signed-off-by: Tibor Vass <tibor@docker.com>
2017-06-14 02:48:46 +00:00
5bf86c1984
Merge pull request #32735 from bhavin192/patch-1
...
Add note about host-dir in VOLUME
(cherry picked from commit f2fff9d913a8ab0436dd56033189a7c3713a59a2)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
(cherry picked from commit 8fd6547fc3eb67e7efa7efb007ae6a4494cd2bb3)
Signed-off-by: Tibor Vass <tibor@docker.com>
2017-06-14 02:48:46 +00:00
b1738f4505
Merge pull request #32724 from PatrickLang/patricklang-win-memory
...
Adding more on -m and --memory
(cherry picked from commit c3fbca106552f2dadcb89510ff87945b50f36419)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
(cherry picked from commit b4047a849bd3018f8a8eabf34613a4fca57f818e)
Signed-off-by: Tibor Vass <tibor@docker.com>
2017-06-14 02:48:46 +00:00
7955683eb2
Merge pull request #32684 from scjane/patch-3
...
Update builder.md
(cherry picked from commit 831066337743fc29ff122fce51afe44b8b3b3ba9)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
(cherry picked from commit bc66821abbcf50c721ce9b8f52b339fda102d389)
Signed-off-by: Tibor Vass <tibor@docker.com>
2017-06-14 02:48:46 +00:00
6ee8cf85c5
Update deprecated.md for removal of --email flag
...
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
(cherry picked from commit 43239f62bedc4721d27744d21c122622988bb3ae)
Signed-off-by: Tibor Vass <tibor@docker.com>
2017-06-14 02:48:46 +00: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
7baaa90481
Merge pull request #186 from adshmh/fix-output-leak-from-config-remove-test-case
...
fix the output leak from error test case for config/remove
2017-06-13 21:04:47 +02: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
feeeb2c550
Merge pull request #185 from vdemeester/fix-image-remove-tests
...
Fix remove_test output duplication
2017-06-13 14:21:32 +02: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
8c2f81892b
Update docker/docker to 4310f7da7e6bcd8185bf05e032f9b7321cfa6ea2
...
This fix updates docker/docker to 4310f7da7e6bcd8185bf05e032f9b7321cfa6ea2
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 02:53:25 +00:00
8545341709
Merge pull request #157 from dnephin/make-compose-check-fail
...
Fix check-git-diff in CI
2017-06-12 17:15:35 -07:00
f82f61efc6
Merge pull request #175 from dnephin/golang-version
...
Print CircleCI docker version
2017-06-10 15:03:07 +02:00
Daniel Nephin
Brian Goff
Dave Tucker
Aaron Lehmann
zebrilee
Arash Deshmeh
Vincent Demeester
Sebastiaan van Stijn
Sebastiaan van Stijn
Daniel Nephin
Slava Semushin
Vincent Demeester
Doug Davis
Tõnis Tiigi
Yong Tang
Tibor Vass