Remove incorrect duplicate phrase from build.md #31395
Closed
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Signed-off-by: Tobias Gesellchen <tobias@gesellix.de> (cherry picked from commit e6b2829) Signed-off-by: Victor Vieux <vieux@docker.com>
Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp> (cherry picked from commit eb11a10) Signed-off-by: Victor Vieux <vieux@docker.com>
Add missing flag and more descriptions in manpage. Signed-off-by: Zhang Wei <zhangwei555@huawei.com> (cherry picked from commit 977fd43) Signed-off-by: Victor Vieux <vieux@docker.com>
Signed-off-by: Harald Albers <github@albersweb.de> (cherry picked from commit a54cc4f) Signed-off-by: Victor Vieux <vieux@docker.com>
Signed-off-by: Harald Albers <github@albersweb.de> (cherry picked from commit 364e900) Signed-off-by: Victor Vieux <vieux@docker.com>
Signed-off-by: Harald Albers <github@albersweb.de> (cherry picked from commit 536a9ec) Signed-off-by: Victor Vieux <vieux@docker.com>
Signed-off-by: Yanqiang Miao <miao.yanqiang@zte.com.cn> (cherry picked from commit 3d4ea98) Signed-off-by: Victor Vieux <vieux@docker.com>
Signed-off-by: Harald Albers <github@albersweb.de> (cherry picked from commit 83158f8) Signed-off-by: Victor Vieux <vieux@docker.com>
Signed-off-by: yuexiao-wang <wang.yuexiao@zte.com.cn> (cherry picked from commit 1e6587f) Signed-off-by: Victor Vieux <vieux@docker.com>
bolt k/v pairs are only valid for the life of a transaction. This means the memory that the k/v pair is referencing may be invalid if it is accessed outside of the transaction. This can potentially cause a panic. For reference: https://godoc.org/github.com/boltdb/bolt#hdr-Caveats To fix this issue, unmarshal the stored data into volume meta before closing the transaction. Signed-off-by: Brian Goff <cpuguy83@gmail.com> (cherry picked from commit 4876a90) Signed-off-by: Victor Vieux <vieux@docker.com>
`docker plugin enable` and `docker plugin disable` only accept one plugin. Signed-off-by: Harald Albers <github@albersweb.de> (cherry picked from commit 390effd) Signed-off-by: Victor Vieux <vieux@docker.com>
Signed-off-by: Harald Albers <github@albersweb.de> (cherry picked from commit e140345) Signed-off-by: Victor Vieux <vieux@docker.com>
This fix tries to fix 29667 where image's `CMD` is modified after `WORKDIR` in Dockerfile. The value of `b.runConfig.Cmd` was modified in the processing of `WORKDIR`, in order to fix 28902. However, the same `b.runConfig.Cmd` is passed to `commit()`. This fix restored the `b.runConfig.Cmd` before `commit()` the image for `WORKDIR`. A test has been added. This fix fixes 29667. This fix is related to 28902, 28909, 28514. Signed-off-by: Yong Tang <yong.tang.github@outlook.com> (cherry picked from commit 0836023) Signed-off-by: Victor Vieux <vieux@docker.com>
Signed-off-by: Sebastiaan van Stijn <github@gone.nl> (cherry picked from commit 611a633) Signed-off-by: Victor Vieux <vieux@docker.com>
Signed-off-by: Daniel Nephin <dnephin@docker.com> (cherry picked from commit e4c1f07) Signed-off-by: Victor Vieux <vieux@docker.com>
Signed-off-by: Daniel Nephin <dnephin@docker.com> (cherry picked from commit abe32de) Signed-off-by: Victor Vieux <vieux@docker.com> Signed-off-by: Vincent Demeester <vincent@sbr.pm>
Signed-off-by: Harald Albers <github@albersweb.de> (cherry picked from commit 1b58d0b) Signed-off-by: Victor Vieux <vieux@docker.com>
In cases where there is high latency (ie, not-local network) `waitExitOrRemoved` was not receiving events for short-lived containers. This caused the client to hang while waiting for a notification that the container has stopped. This happens because `client.Events()` returns immediately and spins a goroutine up to process events. The problem here is it returns before the request to the events endpoint is even made. Even without high-latency issues, there is no guarantee that the goroutine is even scheduled by the time the function returns. Signed-off-by: Brian Goff <cpuguy83@gmail.com> (cherry picked from commit 4758599) Signed-off-by: Victor Vieux <vieux@docker.com> Signed-off-by: Vincent Demeester <vincent@sbr.pm>
…ps -a` In #28507 and #28885, `docker service/node ps -a` has been removed so that information about slots are show up even without `-a` flag. The output of `docker stack ps` reused the same output as `docker service/node ps`. However, the `-a` was still there. It might make sense to remove `docker stack ps -a` as well to bring consistency with `docker service/node ps`. This fix is related to #28507, #28885, and #25983. Signed-off-by: Yong Tang <yong.tang.github@outlook.com> (cherry picked from commit 9155e14) Signed-off-by: Victor Vieux <vieux@docker.com> Signed-off-by: Vincent Demeester <vincent@sbr.pm>
Signed-off-by: Yanqiang Miao <miao.yanqiang@zte.com.cn> (cherry picked from commit 6c02189) Signed-off-by: Victor Vieux <vieux@docker.com> Signed-off-by: Vincent Demeester <vincent@sbr.pm>
This fix tries to address the issue raised in 28581 and 28927 where it is not possible to create a secret from a file (only through STDIN). This fix add a flag `--file` to `docker secret create` so that it is possible to create a secret from a file with: ``` docker secret create --file secret.in secret.name ``` or ``` echo TEST | docker secret create --file - secret.name ``` Related docs has been updated. An integration test has been added to cover the changes. This fix fixes 28581. This fix is related to 28927. Signed-off-by: Yong Tang <yong.tang.github@outlook.com> (cherry picked from commit c6f0b7f) Signed-off-by: Victor Vieux <vieux@docker.com> Signed-off-by: Vincent Demeester <vincent@sbr.pm>
When a plugin is activated, and then `plugins.Handle` is called to register a new handler for a given plugin type, a deadlock occurs when for anything which calls `waitActive`, including `Get`, and `GetAll`. This happens because `Handle()` is setting `activated` to `false` to ensure that plugin handlers are run on next activation. Maybe these handlers should be called immediately for any plugins which are already registered... but to preserve the existing behavior while fixing the deadlock, track if handlers have been run on plugins and reset when a new handler is registered. The simplest way to reproduce the deadlock with Docker is to add a `-v /foo` to the test container created for the external graphdriver tests. Signed-off-by: Brian Goff <cpuguy83@gmail.com> (cherry picked from commit 2938dce) Signed-off-by: Victor Vieux <vieux@docker.com> Signed-off-by: Vincent Demeester <vincent@sbr.pm>
Signed-off-by: Victor Vieux <vieux@docker.com> (cherry picked from commit bcead92) Signed-off-by: Victor Vieux <vieux@docker.com> Signed-off-by: Vincent Demeester <vincent@sbr.pm>
Signed-off-by: Lei Jitang <leijitang@huawei.com> (cherry picked from commit 737b5b1) Signed-off-by: Victor Vieux <vieux@docker.com> Signed-off-by: Vincent Demeester <vincent@sbr.pm>
1.13.0 rc5 cherrypicks
We use the 'default' driver if none is specified. Signed-off-by: Vincent Demeester <vincent@sbr.pm>
returned in "docker info". Currently info endpoint isnt using the GetAllByCap, but relies on existing networks to get the plugin names. This causes a basic issue when it comes to global network plugins which swarm-mode relies on, wherein swarmkit will not be able to schedule the network on the worker nodes due to the filtering logic. In order to break this chicken & egg issue, we must start to use the GetAllManagedPluginsByCap. We are unable to use GetAllByCap due to various issues with Plugin-V1's lazy loading approach causing issues especially during daemon restarts (which uses SystemInfo) Signed-off-by: Madhu Venugopal <madhu@docker.com>
Cherry-pick #29877 : Use GetAllByCap to get list of network plugins in docker info
Signed-off-by: Victor Vieux <vieux@docker.com>
…update Add zsh completion for missing 'docker swarm init|update' options (cherry picked from commit 5d47cb9) Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
…k-cmds Add zsh completion for 'docker swarm unlock|unlock-key' commands (cherry picked from commit 27ab008) Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Add zsh completion for 'docker service logs' command (cherry picked from commit 03db463) Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Add zsh completion for 'docker checkpoint' commands (cherry picked from commit 4f6e4bf) Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Add zsh completion for 'docker build --squash' (cherry picked from commit 0d9bb4e) Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Add zsh completion for missing 'docker plugin' commands and options (cherry picked from commit da9a162) Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Signed-off-by: Gabriel Linder <linder.gabriel@gmail.com>
17.03 cherry picks
[1.13] Allow sync_file_range2 on supported architectures.
[1.13] Vendor swarmkit 30a4278
17.03 bash/zsh completion script cherry-picks
Signed-off-by: Victor Vieux <victorvieux@gmail.com>
Signed-off-by: Alessandro Boch <aboch@docker.com>
[1.13] update client/client.go DefaultVersion
[1.13.x/17.03.x] Vendoring libnetwork @ce28404
Signed-off-by: Victor Vieux <victorvieux@gmail.com>
Signed-off-by: Victor Vieux <victorvieux@gmail.com>
A phrase from the "Text files" section was incorrectly duplicated under the "Tarball contexts" section. Signed-off-by: Peter Jaffe <pjaffe@nevo.com>
thaJeztah
requested changes
Feb 27, 2017
thaJeztah
added
process/docs-cherry-pick
status/3-docs-review
and removed
status/0-triage
labels
|
@thaJeztah - I tried changing the base branch to Master per http://stackoverflow.com/questions/24159036/how-to-modify-a-pull-request-on-github-to-change-target-branch-to-merge-into, but I think that has resulted in the system thinking I'm trying to bring in a whole bunch of other commits that were in my fork from the over version. I was just trying to be helpful to correct one bit of documentation I was reviewing, and clearly I've caused more pain than harm :) I'll close this pull request and create a new one off master. |
|
Hm, yes, you'd probably have to rebase on top of master, it reopening a new one is fine; thanks! |
|
I created #31398 as a new one, based on master. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
A phrase from the "Text files" section was incorrectly duplicated under the "Tarball contexts" section.
Signed-off-by: Peter Jaffe pjaffe@nevo.com