Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[20.10 backport] Restore active mount counts on live-restore #45826

Closed
wants to merge 8 commits into from
Closed

[20.10 backport] Restore active mount counts on live-restore #45826

wants to merge 8 commits into from

Commits on Jun 27, 2023

  1. api/swagger: add missing 400 response for POST /containers/{id}/wait 

    The /containers/{id}/wait can return a 400 (invalid argument) error if
httputils.ParseForm() fails.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
(cherry picked from commit 0e5929f)
Signed-off-by: Bjorn Neergaard <bjorn.neergaard@docker.com>
    @thaJeztah @neersighted
    thaJeztah authored and neersighted committed Jun 27, 2023
    Configuration menu
    Copy the full SHA
    21e475c View commit details
    Browse the repository at this point in the history

  2. api: swagger: move Volume examples inline 

    Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
(cherry picked from commit e444ac3)
Signed-off-by: Bjorn Neergaard <bjorn.neergaard@docker.com>
    @thaJeztah @neersighted
    thaJeztah authored and neersighted committed Jun 27, 2023
    Configuration menu
    Copy the full SHA
    7e7b59b View commit details
    Browse the repository at this point in the history

  3. api: swagger: move VolumeCreateOptions to definitions 

    Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
(cherry picked from commit 0119f79)
Signed-off-by: Bjorn Neergaard <bjorn.neergaard@docker.com>
    @thaJeztah @neersighted
    thaJeztah authored and neersighted committed Jun 27, 2023
    Configuration menu
    Copy the full SHA
    726e718 View commit details
    Browse the repository at this point in the history

  4. daemon/config: DefaultShmSize: minor tweak and improve docs 

    I had to check what the actual size was, so added it to the const's documentation.

While at it, also made use of it in a test, so that we're testing against the expected
value, and changed one alias to be consistent with other places where we alias this
import.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
(cherry picked from commit 821b4d4)
Signed-off-by: Bjorn Neergaard <bjorn.neergaard@docker.com>
    @thaJeztah @neersighted
    thaJeztah authored and neersighted committed Jun 27, 2023
    Configuration menu
    Copy the full SHA
    f020b87 View commit details
    Browse the repository at this point in the history

  5. api: swagger: move ContainerWaitResponse to definitions 

    This should help with CI being unstable when generating the types (due
to Go randomizing order). Unfortunately, the (file) names are a bit ugly,
but addressing that in a follow-up.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
(cherry picked from commit e4c6ca3)
Signed-off-by: Bjorn Neergaard <bjorn.neergaard@docker.com>
    @thaJeztah @neersighted
    thaJeztah authored and neersighted committed Jun 27, 2023
    Configuration menu
    Copy the full SHA
    1ad3c50 View commit details
    Browse the repository at this point in the history

  6. client, integration-cli: remove unneeded import aliases 

    Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
(cherry picked from commit 9060126)
Signed-off-by: Bjorn Neergaard <bjorn.neergaard@docker.com>
    @thaJeztah @neersighted
    thaJeztah authored and neersighted committed Jun 27, 2023
    Configuration menu
    Copy the full SHA
    011d9f0 View commit details
    Browse the repository at this point in the history

  7. api: move types.Volume to volume.Volume 

    Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
(cherry picked from commit f19ef20)
Signed-off-by: Bjorn Neergaard <bjorn.neergaard@docker.com>
    @thaJeztah @neersighted
    thaJeztah authored and neersighted committed Jun 27, 2023
    Configuration menu
    Copy the full SHA
    e27c043 View commit details
    Browse the repository at this point in the history

  8. api/types: replace uses of deprecated types.Volume with volume.Volume 

    Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
(cherry picked from commit 176f66d)
Resolved conflicts:
	client/volume_inspect.go
	daemon/disk_usage.go
	integration/system/disk_usage_test.go
	volume/service/service.go
Co-authored-by: Bjorn Neergaard <bjorn.neergaard@docker.com>
Signed-off-by: Bjorn Neergaard <bjorn.neergaard@docker.com>
    @thaJeztah @neersighted
    thaJeztah and neersighted committed Jun 27, 2023
    Configuration menu
    Copy the full SHA
    9ddd54f View commit details
    Browse the repository at this point in the history