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.

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

vendor: github.com/docker/docker 1a1f3cff45ec (master, v27.0-dev) #5170

Merged
merged 1 commit into from
Jun 20, 2024

Conversation

thaJeztah
Copy link
Member

@thaJeztah thaJeztah commented Jun 18, 2024

vendor: github.com/docker/docker 1a1f3cff45ec (master, v27.0-dev)

Rewrite local code to use the new container.Ulimit alias to start
transitioning away from direct uses of go-units.Ulimit.

full diff: moby/moby@v27.0.0-rc.2...1a1f3cf

- A picture of a cute animal (not mandatory but encouraged)

@codecov-commenter
Copy link

codecov-commenter commented Jun 18, 2024

Codecov Report

Attention: Patch coverage is 60.00000% with 8 lines in your changes missing coverage. Please review.

Project coverage is 61.76%. Comparing base (aebdf50) to head (2088c59).

Additional details and impacted files
@@           Coverage Diff           @@
##           master    #5170   +/-   ##
=======================================
  Coverage   61.76%   61.76%           
=======================================
  Files         297      297           
  Lines       20768    20768           
=======================================
  Hits        12828    12828           
  Misses       7024     7024           
  Partials      916      916           

@thaJeztah
Copy link
Member Author

@laurazard @vvoland PTAL 🤗

@thaJeztah thaJeztah changed the title vendor: github.com/docker/docker fd71cbfab5f3 (master, v27.0-dev) vendor: github.com/docker/docker b5b7ddfdd575 (master, v27.0-dev) Jun 18, 2024
@thaJeztah thaJeztah changed the title vendor: github.com/docker/docker b5b7ddfdd575 (master, v27.0-dev) vendor: github.com/docker/docker 3e85c9d5173d (master, v27.0-dev) Jun 18, 2024
@thaJeztah thaJeztah changed the title vendor: github.com/docker/docker 3e85c9d5173d (master, v27.0-dev) vendor: github.com/docker/docker 59b119f94e6d (master, v27.0-dev) Jun 18, 2024
@thaJeztah thaJeztah changed the title vendor: github.com/docker/docker 59b119f94e6d (master, v27.0-dev) vendor: github.com/docker/docker e7347f8a8c2f (master, v27.0-dev) Jun 18, 2024
@thaJeztah thaJeztah changed the title vendor: github.com/docker/docker e7347f8a8c2f (master, v27.0-dev) vendor: github.com/docker/docker 11179de64c6e (master, v27.0-dev) Jun 19, 2024
@thaJeztah thaJeztah changed the title vendor: github.com/docker/docker 11179de64c6e (master, v27.0-dev) vendor: github.com/docker/docker a24af26aba4a (master, v27.0-dev) Jun 20, 2024
@thaJeztah thaJeztah changed the title vendor: github.com/docker/docker a24af26aba4a (master, v27.0-dev) vendor: github.com/docker/docker 202de333a410 (master, v27.0-dev) Jun 20, 2024
@@ -50,7 +50,7 @@ func (s *stats) isKnownContainer(cid string) (int, bool) {
return -1, false
}

func collect(ctx context.Context, s *Stats, cli client.APIClient, streamStats bool, waitFirst *sync.WaitGroup) {
func collect(ctx context.Context, s *Stats, cli client.ContainerAPIClient, streamStats bool, waitFirst *sync.WaitGroup) {
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Changed this to a narrower interface, as it doesn't need all of api-client

"github.com/docker/docker/api/types"
)

func TestCalculateBlockIO(t *testing.T) {
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Merged this test into the other test-file (stats_helpers_test.go)

@thaJeztah
Copy link
Member Author

May be doing one more update to include moby/moby#48011

Rewrite local code to use the new container.Ulimit alias to start
transitioning away from direct uses of go-units.Ulimit.

full diff: moby/moby@v27.0.0-rc.2...1a1f3cf

Signed-off-by: Sebastiaan van Stijn <[email protected]>
@thaJeztah thaJeztah changed the title vendor: github.com/docker/docker 202de333a410 (master, v27.0-dev) vendor: github.com/docker/docker 1a1f3cff45ec (master, v27.0-dev) Jun 20, 2024
@thaJeztah
Copy link
Member Author

Updated, with moby/moby#48011 included

@vvoland vvoland merged commit 2fee28c into docker:master Jun 20, 2024
100 checks passed
@thaJeztah thaJeztah deleted the bump_engine2 branch June 20, 2024 12:52
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants