This repository was archived by the owner on Oct 13, 2023. It is now read-only.
[17.12] backport fix plural singular node generic resources#404
Merged
andrewhsu merged 2 commits intodocker-archive:17.12from Feb 13, 2018
Conversation
Signed-off-by: Renaud Gaubert <rgaubert@nvidia.com> (cherry picked from commit 6702ac5) Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Daemon flags that can be specified multiple times use singlar names for flags, but plural names for the configuration file. To make the daemon configuration know how to correlate the flag with the corresponding configuration option, `opt.NewNamedListOptsRef()` should be used instead of `opt.NewListOptsRef()`. Commit 6702ac5 attempted to fix the daemon not corresponding the flag with the configuration file option, but did so by changing the name of the flag to plural. This patch reverts that change, and uses `opt.NewNamedListOptsRef()` instead. Signed-off-by: Sebastiaan van Stijn <github@gone.nl> (cherry picked from commit 6e7715d) Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
cpuguy83
pushed a commit
to cpuguy83/docker-ce
that referenced
this pull request
Feb 7, 2018
…ation Fix presentation of published "random" host ports Upstream-commit: 772956b263bda4f8e6c2d6e08b5c99d927230bb1 Component: cli
thaJeztah
deleted the
17.12-backport-fix-plural-singular-node-generic-resources
branch
docker-jenkins
pushed a commit
that referenced
this pull request
Oct 12, 2019
[19.03 backport] revert controller: Check if IPTables is enabled for arrangeUserFilterRule ENGCORE-1114 Upstream-commit: adfac697dc5b74998c6a5229f1e4e9b2e0406af4 Component: engine
docker-jenkins
pushed a commit
that referenced
this pull request
Oct 28, 2019
deb: Only recommend aufs-tools on amd64 Upstream-commit: 7d1f550 Component: packaging
silvin-lubecki
pushed a commit
to silvin-lubecki/docker-ce
that referenced
this pull request
Feb 3, 2020
…ix-plural-singular-node-generic-resources [17.12] backport fix plural singular node generic resources
akrasnov-drv
pushed a commit
to drivenets/docker-ce
that referenced
this pull request
Apr 23, 2023
deb: Only recommend aufs-tools on amd64
This file contains hidden or 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
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
4 participants
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.
backport of moby/moby#35970 and moby/moby#36125 for 17.12