Kenfe-Mickael Laventure
030f7b370f
Update runc to 54296cf40ad8143b62dbcaa1d90e520a2136ddfe
...
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
2017-03-08 14:49:32 -08:00
Sebastiaan van Stijn
b2cba289fc
Merge pull request #31474 from thaJeztah/docs-cherry-picks
...
[17.03.x] Docs cherry picks
2017-03-02 13:11:45 +01:00
Sebastiaan van Stijn
de692b1065
Merge pull request #31467 from thaJeztah/remove-jekyll-markers
...
remove Jekyll tags from CLI reference
(cherry picked from commit 9321a12115
2017-03-02 11:03:57 +01:00
Sebastiaan van Stijn
9f55f97a5a
Merge pull request #31398 from pjaffe/patch-1
...
Remove incorrect duplicate phrase from build.md
(cherry picked from commit fb5ccc6605
2017-03-02 11:03:51 +01:00
Brian Goff
ef658fa65e
Merge pull request #31291 from albers/docs-daemon-hosts
...
Clarify why `hosts` in `daemon.json` does not work
(cherry picked from commit 27c9a6e9c2
2017-03-02 11:03:46 +01:00
Vincent Demeester
05b81bc152
Merge pull request #30832 from allencloud/update-swaggeryml-on-cluster-status-code
...
remove 400 and 404 for get nodes endpoint and add 503 for secret update
(cherry picked from commit e8b92f154d
2017-03-02 11:03:39 +01:00
Sebastiaan van Stijn
4b025d0605
Merge pull request #30731 from shin-/plugin_privileges_param_fix
...
Parameter name in GetPluginPrivileges is "remote"
(cherry picked from commit 8d28fc8fc4
2017-03-02 11:03:32 +01:00
Brian Goff
3a232c89e4
Merge pull request #31311 from aaronlehmann/vendor-swarmkit-1f3e4e6
...
[17.03.x] Vendor swarmkit 1f3e4e6
2017-02-24 09:11:59 -05:00
Aaron Lehmann
bef21471d7
Vendor swarmkit 1f3e4e6
...
Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
2017-02-23 11:07:29 -08:00
Victor Vieux
60ccb2265b
bump to version 17.03.0-ce
...
Signed-off-by: Victor Vieux <victorvieux@gmail.com>
2017-02-23 02:03:50 -08:00
Victor Vieux
faa90e9378
Merge pull request #31266 from vieux/17.03-cherry
...
17.03 cherry-picks
2017-02-23 02:02:52 -08:00
Victor Vieux
d9bc94cad2
Merge pull request #31260 from mlaventure/bump-runc-17.03
...
[17.03] Bump runc to a01dafd48bc1c7cc12bdb01206f9fea7dd6feb70
2017-02-23 01:07:05 -08:00
Kenfe-Mickael Laventure
e285c70dec
Bump runc to a01dafd48bc1c7cc12bdb01206f9fea7dd6feb70
...
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
2017-02-23 01:05:38 -08:00
Aaron Lehmann
ff70cbf5ea
Shutdown leaks an error when the container was never started
...
I found that sometimes tasks would end up in a rejected state when
trying to update them quickly. The problem was that Shutdown could fail
if called before the container was started. Instead of returning an
error in this case, Shutdown should succeed. This allows tasks to
progress to the "shutdown" state as expected.
Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
(cherry picked from commit 37b492ae1b
2017-02-23 00:00:01 -08:00
Victor Vieux
4fa77953f8
update CHANGELOG
...
Signed-off-by: Victor Vieux <victorvieux@gmail.com>
2017-02-22 23:59:15 -08:00
Yong Tang
3599289e2c
Fix duplicate mount point for --volumes-from in docker run
...
This fix tries to fix the issue raised in 21845. The issue with 21845
is that if multiple `--volumes-from` with the same destination has been
specified, then one volume will be overridden by the other. This will mess
up with volumes reference and prevent the overridden volume from
being removed at the end.
Issue 21845 was observed with `docker-compose` though it is possible to
emulate the same behavior with `docker` alone:
```
$ cat Dockerfile
FROM busybox
VOLUME ["/tmp/data"]
$ docker build -t vimage .
$ docker run --name=data1 vimage true
$ docker run --name=data2 vimage true
$ docker run --name=app --volumes-from=data1 --volumes-from=data2 -d busybox top
$ docker rm -f -v $(docker ps -aq)
$ docker volume ls
$ docker volume rm ...
```
NOTE: Second case:
```
$ cat Dockerfile
FROM busybox
VOLUME ["/tmp/data"]
$ docker build -t vimage .
$ docker run --name=data1 vimage true
$ docker run --name=data2 vimage true
$ docker run --name=app --volumes-from=data1 --volumes-from=data2 -v /tmp/data:/tmp/data -d busybox top
$ docker rm -f -v $(docker ps -aq)
$ docker volume ls
$ docker volume rm ...
```
NOTE: Third case: Combination of --volumes-from and `HostConfig.Mounts` (API only)
This fix tries to address the issue by return an error if duplicate
mount points was used with `--volumes-from`.
An integration test has been added.
This fix fixes 21845.
Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
(cherry picked from commit 9526e5c6ae
2017-02-22 23:37:49 -08:00
Victor Vieux
49849eda4a
Merge pull request #31270 from thaJeztah/17.03-cherry-pick-29076
...
[17.03] Block obsolete and unusual socket families in the default seccomp profile
2017-02-22 22:56:55 -08:00
Victor Vieux
d06b03a99d
Merge pull request #31274 from tonistiigi/update-containerd
...
[17.03.x] vendor: update containerd to 977c511ed
2017-02-22 19:38:23 -08:00
Victor Vieux
455ebb8892
Merge pull request #31271 from thaJeztah/cherry-pick-changelog-validation
...
[17.03] Cherry pick changelog validation
2017-02-22 19:38:05 -08:00
Victor Vieux
d77ec85abc
Merge pull request #31275 from thaJeztah/17.03-swagger-cherry-picks
...
17.03 swagger cherry picks
2017-02-22 18:26:57 -08:00
Nalin Dahyabhai
4730409857
Synchronize the cursor returned by followJournal
...
Make sure that the cursor value returned by followJournal() is the last
of the values returned by its goroutine's calls to drainJournal() by
waiting for it, rather than returning a value that may be superceded by
another if we're singalling the goroutine that it should exit by closing
a pipe.
Signed-off-by: Nalin Dahyabhai <nalin@redhat.com>
(cherry picked from commit d57c330617
2017-02-22 17:51:27 -08:00
Victor Vieux
44aec1b692
add -ce support
...
Signed-off-by: Victor Vieux <victorvieux@gmail.com>
2017-02-22 17:38:37 -08:00
Victor Vieux
f2738cd135
Merge pull request #31277 from thaJeztah/17.03-update-authors
...
[17.03.x] update authors
2017-02-22 17:32:06 -08:00
Victor Vieux
716c92c6ae
Merge pull request #31276 from thaJeztah/update-authors
...
Update authors
(cherry picked from commit 1948cc5fac
2017-02-23 02:26:36 +01:00
Victor Vieux
c984bbf871
Merge pull request #31203 from yongtang/02202017-Swagger-ContainerSpec
...
Add missing fields in Swagger docs
(cherry picked from commit 19cd2aa389
2017-02-23 01:05:54 +01:00
Tonis Tiigi
c7f67ed835
vendor: update containerd to 977c511ed
...
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
2017-02-22 16:04:23 -08:00
Sebastiaan van Stijn
cecae2c5ad
Merge pull request #31204 from yongtang/31179-Swagger-Secrets
...
Add missing Secrets in Swagger docs
(cherry picked from commit cf8408106d
2017-02-23 00:57:24 +01:00
Vincent Demeester
350ecb34e9
Merge pull request #30954 from yongtang/29448-swagger-version
...
Improve documentation of `Version` usage for Swarm API
(cherry picked from commit 89fe0e1b14
2017-02-23 00:56:22 +01:00
Kenfe-Mickaël Laventure
3804b6d408
Merge pull request #30391 from andrewhsu/check-changelog-date
...
validate CHANGELOG.md dates are in descending order
(cherry picked from commit 5e74dc11e3
2017-02-23 00:38:39 +01:00
Vincent Demeester
39781f92b3
Merge pull request #29208 from andrewhsu/validate-changelog
...
validate CHANGELOG.md is well-formed
(cherry picked from commit 59ba895a0f
2017-02-23 00:37:43 +01:00
Kenfe-Mickael Laventure
52a7b8350a
Prevent freeing a possible invalid pointer from journald
...
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
(cherry picked from commit 81630df854
2017-02-22 15:37:04 -08:00
Sebastiaan van Stijn
1235b56fbc
Merge pull request #29076 from justincormack/seccomp-socket-to-them
...
Block obsolete and unusual socket families in the default seccomp profile
(cherry picked from commit 48184351c9
2017-02-23 00:27:29 +01:00
Victor Vieux
9fb5c83df0
Merge pull request #31205 from vieux/update_changelog_17.03
...
update CHANGELOG for 17.03.0-ce
2017-02-22 15:05:27 -08:00
Antonio Murdaca
91d33f250b
image/cache: fix isValidParent logic
...
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
(cherry picked from commit 1cf4b2b8bd
2017-02-22 14:47:09 -08:00
Victor Vieux
fa43a64f9c
update CHANGELOG for 17.03.0-ce
...
Signed-off-by: Victor Vieux <victorvieux@gmail.com>
2017-02-22 12:03:09 -08:00
Vincent Demeester
d7bc6e4e7c
Merge pull request #31242 from thaJeztah/17.03-docs-cherry-picks
...
17.03 docs cherry picks
2017-02-22 11:13:07 +01:00
Vincent Demeester
f6b33c65d5
Merge pull request #31034 from erxian/refine-service-update-document
...
add rollback explanation to docker service update command document
(cherry picked from commit 75843d36aa
2017-02-22 00:49:16 +01:00
Sebastiaan van Stijn
23de3ee83b
Merge pull request #31023 from mstanleyjones/fix_liquid_errors
...
Fix some Liquid errors
(cherry picked from commit 88de5c36c7
2017-02-22 00:49:10 +01:00
Sebastiaan van Stijn
93daa00ee6
Merge pull request #30965 from YuPengZTE/devDes
...
fix typo
(cherry picked from commit a8f4d82176
2017-02-22 00:49:03 +01:00
Sebastiaan van Stijn
1f1b15ae4c
Merge pull request #30956 from yongtang/02122017-deprecated-login-email-removal
...
Add missing link in deprecated.md
(cherry picked from commit b5b6752230
2017-02-22 00:48:56 +01:00
Sebastiaan van Stijn
411ff56edf
Merge pull request #30921 from anusha-ragunathan/debug_docs
...
Add plugin socket related debug docs.
(cherry picked from commit fddab1444f
2017-02-22 00:48:50 +01:00
Sebastiaan van Stijn
fdd29d9085
Merge pull request #30898 from allencloud/add-link-query-in-container-rm-api-doc
...
add link query in container rm api doc
(cherry picked from commit b89aff1afa
2017-02-22 00:48:39 +01:00
Sebastiaan van Stijn
c611906062
Merge pull request #30804 from mstanleyjones/cli_fixups
...
Cli fixups
(cherry picked from commit 40dbbd3f9b
2017-02-22 00:48:21 +01:00
Sebastiaan van Stijn
8893cd6095
Merge pull request #30802 from anusha-ragunathan/debug_docs
...
Add plugin debug docs.
(cherry picked from commit d4be5a2f67
2017-02-22 00:48:15 +01:00
Sebastiaan van Stijn
f64a1832bd
Merge pull request #30789 from vdemeester/carry-update-docker-stack-experimental
...
Update docker stack experimental notes
(cherry picked from commit c5a592a0a4
2017-02-22 00:48:10 +01:00
Sebastiaan van Stijn
0a506d9429
Merge pull request #30774 from aaronlehmann/swarm-leave-docs-fix
...
Fix grammatical error in swarm_leave.md
(cherry picked from commit 9e80a2a457
2017-02-22 00:48:04 +01:00
Sebastiaan van Stijn
f28a1d3c23
Merge pull request #30663 from Mashimiao/reference-cmdline-service-tfix
...
reference/commandline: small tfix
(cherry picked from commit 32697b57c8
2017-02-22 00:47:59 +01:00
Vincent Demeester
e795408586
Merge pull request #30620 from thaJeztah/carry-29590
...
some grammatical errors
(cherry picked from commit deb0885419
2017-02-22 00:47:53 +01:00
Vincent Demeester
56da5fa29b
Merge pull request #30619 from johndmulhausen/patch-3
...
Fix for 404 in docs
(cherry picked from commit 1de72681b5
2017-02-22 00:47:45 +01:00
Sebastiaan van Stijn
84f026ba7e
Merge pull request #30553 from lewisdaly/21050-improve-user-namespace-docs
...
Updated dockerd docs with note about user namespaces
(cherry picked from commit d6b1b532a1
2017-02-22 00:47:39 +01:00
