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
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
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
Daniel Nephin
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
2017-06-14 17:30:45 -07:00
Daniel Nephin
b88ae58881
Add gosimple lint
...
Signed-off-by: Daniel Nephin <dnephin@docker.com >
Upstream-commit: 3724fb7f37
2017-06-14 16:55:08 -07:00
Daniel Nephin
003a07af7c
Add unparam linter
...
Signed-off-by: Daniel Nephin <dnephin@docker.com >
Upstream-commit: 3e3934c19f
2017-06-14 16:55:08 -07:00
Daniel Nephin
c9b100a0be
Add unconvert linter
...
Signed-off-by: Daniel Nephin <dnephin@docker.com >
Upstream-commit: 3bf0317fea
2017-06-14 16:54:27 -07:00
Daniel Nephin
16de65eef4
Add misspell lint
...
Signed-off-by: Daniel Nephin <dnephin@docker.com >
Upstream-commit: a712993e93
2017-06-14 16:54:27 -07:00
Daniel Nephin
2cdc30d891
Add unused linter.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com >
Upstream-commit: 01e1e58ada
2017-06-14 16:54:27 -07:00
Daniel Nephin
1bcf02da4f
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 >
Upstream-commit: 343d836a95
2017-06-14 14:59:48 -07:00
Sebastiaan van Stijn
7b49eaf104
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
Upstream-commit: 4c224a7786
2017-06-14 22:03:38 +02:00
Daniel Nephin
604510bf2e
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
Upstream-commit: 759e59e4a4
2017-06-14 14:31:01 -04:00
Aaron Lehmann
d2ab6e1508
Merge pull request #193 from dnephin/why-cover-so-slow
...
Speed up testing with coverage
Upstream-commit: 45c2c4c18f
2017-06-14 11:29:42 -07:00
Daniel Nephin
b937aa98bc
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
Upstream-commit: 63eff6548b
2017-06-14 14:23:40 -04:00
Daniel Nephin
6ca362a6db
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 >
Upstream-commit: 3a9ba545bc
2017-06-14 10:57:36 -07:00
Arash Deshmeh
9a1729bb2b
removed logging from service/inspect test to clean up the output of running tests
...
Signed-off-by: Arash Deshmeh <adeshmeh@ca.ibm.com >
Upstream-commit: 751278abe6
2017-06-14 12:38:31 -04:00
Slava Semushin
cd16e5cc8b
docs/reference/builder.md: mention that USER directive also allows to specify the user group.
...
Signed-off-by: Slava Semushin <semushin@redhat.com >
Upstream-commit: a84463d8d5
2017-06-14 15:49:37 +02:00
Vincent Demeester
1319ac06c7
Merge pull request #187 from dnephin/small-cleanup-to-image-remove
...
Fix some problems with image force remove
Upstream-commit: d209929aab
2017-06-14 09:59:32 +02:00
Vincent Demeester
544efe0207
Merge pull request #115 from jsoref/spelling
...
Spelling
Upstream-commit: 4ffefe4a1f
2017-06-14 09:58:55 +02:00
Vincent Demeester
f3827b078b
Do not call the config endpoint if API is lower than 1.30
...
Signed-off-by: Vincent Demeester <vincent@sbr.pm >
Upstream-commit: 2128b3f112
2017-06-14 09:56:53 +02:00
Brian Goff
0f674e20a2
Merge pull request #189 from tiborvass/update-docs
...
Update docs, completion, man
Upstream-commit: 3be666387a
2017-06-13 23:04:09 -05:00
Sebastiaan van Stijn
2f5b714872
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 >
Upstream-commit: ee1bbab620
2017-06-14 02:48:46 +00:00
Sebastiaan van Stijn
786d489f99
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 >
Upstream-commit: 8b11d46ecd
2017-06-14 02:48:46 +00:00
Doug Davis
9a66d3e2b0
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 >
Upstream-commit: ba4dcadcaa
2017-06-14 02:48:46 +00:00
Brian Goff
090c6ccf05
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 >
Upstream-commit: 8247a36058
2017-06-14 02:48:46 +00:00
Sebastiaan van Stijn
13d31e4cd8
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 >
Upstream-commit: 5bf86c1984
2017-06-14 02:48:46 +00:00
Vincent Demeester
fc9f540d08
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 >
Upstream-commit: b1738f4505
2017-06-14 02:48:46 +00:00
Tõnis Tiigi
a08039c09b
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 >
Upstream-commit: 7955683eb2
2017-06-14 02:48:46 +00:00
Sebastiaan van Stijn
d17a741bef
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 >
Upstream-commit: 6ee8cf85c5
2017-06-14 02:48:46 +00:00
Aaron Lehmann
774e3b7a1d
Merge pull request #72 from thaJeztah/fix-prefix-matching
...
Fix prefix-matching for service ps
Upstream-commit: 275c488734
2017-06-13 14:59:37 -07:00
Aaron Lehmann
809225a7dc
Merge pull request #184 from yongtang/167-network-inspect-scope
...
Use scope=swarm for service related network inspect and revendor docker/docker
Upstream-commit: 25bc9f1ce7
2017-06-13 14:47:20 -07:00
Yong Tang
a55a518566
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 >
Upstream-commit: 657457ee2c
2017-06-13 20:26:12 +00:00
Daniel Nephin
8af6b6b3cd
Fix some problems with image remove force.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com >
Upstream-commit: 676b71eaaa
2017-06-13 12:12:54 -07:00
