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
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
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
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
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
65df45f31c
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
Upstream-commit: 7baaa90481
2017-06-13 21:04:47 +02:00
45b64dbaab
fixed the output leak from error test case for config/remove
...
Signed-off-by: Arash Deshmeh <adeshmeh@ca.ibm.com >
Upstream-commit: 006b9b126d
2017-06-13 12:24:42 -04:00
9a1d721392
Merge pull request #185 from vdemeester/fix-image-remove-tests
...
Fix remove_test output duplication
Upstream-commit: feeeb2c550
2017-06-13 14:21:32 +02:00
59b1e60ea5
Fix remove_test output duplication
...
Signed-off-by: Vincent Demeester <vincent@sbr.pm >
Upstream-commit: dd924ebf4f
2017-06-13 14:02:56 +02:00
f30d636fb1
Merge pull request #160 from e11137/master
...
fixes #46 Always exit 0 when remove image with force option
Upstream-commit: ecc8e0a204
2017-06-13 14:02:02 +02:00
04d4acede5
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 >
Upstream-commit: 8c2f81892b
2017-06-13 02:53:25 +00:00
10e0cc84e6
Merge pull request #157 from dnephin/make-compose-check-fail
...
Fix check-git-diff in CI
Upstream-commit: 8545341709
2017-06-12 17:15:35 -07:00
88e6e57d65
Merge pull request #175 from dnephin/golang-version
...
Print CircleCI docker version
Upstream-commit: f82f61efc6
2017-06-10 15:03:07 +02:00
159c952b6f
Merge pull request #173 from StefanScherer/update-golang-1.8.3
...
Update golang 1.8.3
Upstream-commit: 6a963c5cbe
2017-06-09 15:10:04 -07:00
1a30bcfcf2
Add a docker version print to CI
...
Signed-off-by: Daniel Nephin <dnephin@docker.com >
Upstream-commit: cda8281da8
2017-06-09 15:54:09 -04:00
e9ff960979
Update golang 1.8.3
...
Signed-off-by: Stefan Scherer <scherer_stefan@icloud.com >
Upstream-commit: b38c49411b
2017-06-09 21:43:00 +02:00
2810834b91
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
Upstream-commit: dd585ad4fb
2017-06-09 21:03:33 +02:00
a2e3a8a7ba
Merge pull request #171 from adshmh/fix-stack-remove-testcase-error-message-leak
...
removed the output leaked from stack remove error test case
Upstream-commit: 45b02769f9
2017-06-09 21:03:22 +02:00
15c3a892ca
fixed the output leak from secret/remove command error test case
...
Signed-off-by: Arash Deshmeh <adeshmeh@ca.ibm.com >
Upstream-commit: 77062a09dc
2017-06-09 13:21:14 -04:00
2180c64b2f
removed the output leaked from stack remove error test case
...
Signed-off-by: Arash Deshmeh <adeshmeh@ca.ibm.com >
Upstream-commit: 852bf0f96d
2017-06-09 12:14:18 -04:00
81261f8161
Merge pull request #166 from thaJeztah/update-term
...
Bump docker/docker to cd35e4beee13a7c193e2a89008cd87d38fcd0161
Upstream-commit: a74e715b1a
2017-06-08 13:45:32 -07:00
92da3a16e3
Merge pull request #121 from nishanttotla/digest-pinning-stack-deploy
...
Enable client side digest pinning for stack deploy
Upstream-commit: 4d980880f3
2017-06-08 23:20:02 +03:00
e390db6238
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 >
Upstream-commit: 0310de5213
2017-06-08 16:08:11 -04:00
f41b60a28b
Merge pull request #168 from thaJeztah/bump-version
...
Update version to 17.07-dev
Upstream-commit: b1ea2e4eb5
2017-06-08 15:58:35 -04:00
501eac5305
Update version to 17.07-dev
...
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: 75238f3aa9
2017-06-08 21:45:37 +02:00
a2df58226d
Always exit whith -1 when remove image with force option
...
Signed-off-by: Rogelio Canedo <rcanedo@mappy.priv >
Upstream-commit: 5c8d702af5
2017-06-08 20:15:37 +02:00
696660014b
Bump docker/docker to cd35e4beee13a7c193e2a89008cd87d38fcd0161
...
Reverts changes in pkg/term related to `OPOST` that pulled in through;
3574e6a674cd35e4beeec8141a1fb1...cd35e4beeegithub@gone.nl >
Upstream-commit: efd11bf69d
2017-06-08 16:27:49 +02:00
8b832283fa
Merge pull request #111 from keloyang/attach-restarting-check
...
Add a restarting check to runAttach
Upstream-commit: ab3ea637b6
2017-06-08 12:53:15 +02:00
ce2ce71b2e
Merge pull request #163 from vdemeester/export-convertservice
...
Update ConvertService for external usage 👼
Upstream-commit: c944d20b1f
2017-06-08 10:55:56 +02:00
ba21fcb357
Update ConvertService for external usage 👼
...
Signed-off-by: Vincent Demeester <vincent@sbr.pm >
Upstream-commit: 96dc07a8cf
2017-06-08 10:44:05 +02:00
b190ae1082
Add a restarting check to runAttach
...
Signed-off-by: Shukui Yang <yangshukui@huawei.com >
Upstream-commit: 90f497302f
2017-06-08 07:12:39 +08:00
8d3a4135a1
Replace command.DockerCli to command.Cli in docker attach/exec command
...
Signed-off-by: Shukui Yang <yangshukui@huawei.com >
Upstream-commit: e8cc2cf760
2017-06-08 07:03:52 +08:00
31ea0d23c1
Change --no-resolve-image flag to --resolve-image string flag
...
Signed-off-by: Nishant Totla <nishanttotla@gmail.com >
Upstream-commit: f790e839fc
2017-06-07 12:30:11 -07:00
e0b0f9479e
Enable client side digest pinning for stack deploy
...
Signed-off-by: Nishant Totla <nishanttotla@gmail.com >
Upstream-commit: 9f1bea2657
2017-06-07 12:30:11 -07:00
b25d5c64ec
Merge pull request #162 from vdemeester/150-configs-fixes-on-old-daemon
...
Handle case of configs on old daemon
Upstream-commit: 08cb0bddfd
2017-06-07 12:18:32 -07:00
1b8c1463bf
Merge pull request #145 from dnephin/improve-compose-secrets-errors
...
Compose: Improve error messages when resource create/update fails
Upstream-commit: 9d12d6fc87
2017-06-07 18:51:10 +03:00
77734a6c63
Merge pull request #161 from vdemeester/update-codecov-threshold
...
Update codecov project threshold to 15%
Upstream-commit: 230b9eaf1a
2017-06-07 11:13:19 -04:00
85d6b4b742
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 >
Upstream-commit: cf5550c426
2017-06-07 17:02:46 +02:00
d8fa98915a
Update codecov project threshold to 15%
...
That way, the build will fail less.
Signed-off-by: Vincent Demeester <vincent@sbr.pm >
Upstream-commit: a132733939
2017-06-07 13:26:24 +02:00
6125da9d13
Merge pull request #155 from vdemeester/fix-and-update-vendor
...
Update vendoring of docker/docker
Upstream-commit: 583ed2e3be
2017-06-07 14:25:57 +03:00
3b7dc655ab
Fix check-git-diff so that it fails on CI
...
Signed-off-by: Daniel Nephin <dnephin@docker.com >
Upstream-commit: f75a44ffd8
2017-06-06 15:06:34 -04:00
0164928deb
Merge pull request #158 from tiborvass/fix-manpages-script
...
Fix manpages script
Upstream-commit: 51b00f966e
2017-06-06 10:44:58 +02:00
9b7bef68dd
fix manpages script
...
Signed-off-by: Tibor Vass <tibor@docker.com >
Upstream-commit: dc81def89c
2017-06-06 05:00:10 +00:00
a920b458df
Update vendoring of docker/docker
...
Signed-off-by: Vincent Demeester <vincent@sbr.pm >
Upstream-commit: 44ac80881f
2017-06-06 00:23:21 +02:00
147ce7926d
Merge pull request #154 from tiborvass/add-man-docs-scripts
...
Add scripts and targets for manpages and yamldocs
Upstream-commit: ed5b663082
2017-06-05 13:20:56 -07:00
4bf796daf6
Add scripts and targets for manpages and yamldocs
...
Signed-off-by: Tibor Vass <tibor@docker.com >
Upstream-commit: ff615dbc4d
2017-06-05 19:10:44 +00:00
2764166c95
Merge pull request #147 from tiborvass/import-man-docs-completion
...
Import man docs completion
Upstream-commit: d95fd2f38c
2017-06-02 12:36:15 -07:00
ae4b9d3f19
Remove old manpage generation dockerfiles and glide config.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com >
Upstream-commit: d2976d599f
2017-06-02 12:00:23 -04:00
7e488b89ed
Add unit tests for service/ps
...
Signed-off-by: Daniel Nephin <dnephin@docker.com >
Upstream-commit: 3718833f2c
2017-06-02 11:29:19 -04:00
ffaa61dd2d
Add missing dependencies to vendor, and fix generation imports
...
Signed-off-by: Daniel Nephin <dnephin@docker.com >
Upstream-commit: 875daf0130
2017-06-02 11:12:43 -04:00
