Skip to content

Update docker/docker 8aca18d, containerd v1.2.4 #1700

Merged
tiborvass merged 3 commits intodocker:masterfrom
thaJeztah:update_engine
Mar 12, 2019
Merged

Update docker/docker 8aca18d, containerd v1.2.4 #1700
tiborvass merged 3 commits intodocker:masterfrom
thaJeztah:update_engine

Conversation

@thaJeztah
Copy link
Copy Markdown
Member

@thaJeztah thaJeztah commented Feb 28, 2019 •
edited
Loading

Full diffs:

Removed dependencies:

  • github.com/containerd/cri (no longer used by the parts of containerd/containerd we're using)
  • github.com/gorilla/context (no longer needed by gorilla/mux v1.7.0, which dropped support for old Go versions)

@thaJeztah
Copy link
Copy Markdown
Member Author

thaJeztah commented Mar 1, 2019

Ah, yes, forgot I had to make changes;

cli/command/container/opts.go:548:3: cannot use copts.pidsLimit (type int64) as type *int64 in field value
cli/compose/convert/service.go:608:39: cannot convert spec (type "github.com/docker/cli/cli/compose/types".CredentialSpecConfig) to type swarm.CredentialSpec
cli/command/container/opts.go:548: cannot use copts.pidsLimit (type int64) as type *int64 in field value
cli/compose/convert/service.go:608: cannot convert spec (type "github.com/docker/cli/cli/compose/types".CredentialSpecConfig) to type swarm.CredentialSpec

@thaJeztah thaJeztah changed the title Update docker/docker ed681c5c0d26aa, containerd v1.2.4 [WIP] Update docker/docker ed681c5c0d26aa, containerd v1.2.4 Mar 1, 2019
@thaJeztah thaJeztah force-pushed the update_engine branch 4 times, most recently from 0c6655e to ff3c9a4 Compare March 1, 2019 20:30
@codecov-io
Copy link
Copy Markdown

codecov-io commented Mar 1, 2019

Codecov Report

Merging #1700 into master will not change coverage.
The diff coverage is 100%.

@@           Coverage Diff           @@
##           master    #1700   +/-   ##
=======================================
  Coverage   56.12%   56.12%           
=======================================
  Files         306      306           
  Lines       21030    21030           
=======================================
  Hits        11803    11803           
  Misses       8373     8373           
  Partials      854      854

1 similar comment
@codecov-io
Copy link
Copy Markdown

codecov-io commented Mar 1, 2019

Codecov Report

Merging #1700 into master will not change coverage.
The diff coverage is 100%.

@@           Coverage Diff           @@
##           master    #1700   +/-   ##
=======================================
  Coverage   56.12%   56.12%           
=======================================
  Files         306      306           
  Lines       21030    21030           
=======================================
  Hits        11803    11803           
  Misses       8373     8373           
  Partials      854      854

@thaJeztah thaJeztah changed the title [WIP] Update docker/docker ed681c5c0d26aa, containerd v1.2.4 Update docker/docker ed681c5c0d26aa, containerd v1.2.4 Mar 1, 2019
thaJeztah added 3 commits March 2, 2019 13:41
@thaJeztah
bump docker/docker to 8aca18d631f3f72d4c6e3dc01b6e5d468ad941b8
0fc0015 
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
@thaJeztah
bump github.com/gorilla/mux v1.7.0
087a7ee 
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
@thaJeztah
Update containerd 1.2.4 and dependencies
05fd2a8 
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
@thaJeztah thaJeztah changed the title Update docker/docker ed681c5c0d26aa, containerd v1.2.4 Update docker/docker 8aca18d, containerd v1.2.4 Mar 2, 2019
@thaJeztah thaJeztah mentioned this pull request Mar 2, 2019
Closed
thaJeztah
thaJeztah commented Mar 2, 2019
View reviewed changes
cli/compose/types/types.go
// CredentialSpecConfig for credential spec on Windows
type CredentialSpecConfig struct {
// @TODO Config is not yet in use
Config string `yaml:"-" json:"-"` // Config was added in API v1.40
Copy link
Copy Markdown
Member Author

@thaJeztah thaJeztah Mar 2, 2019

Choose a reason for hiding this comment

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

Wasn't sure what the best way was to allow me to update the vendor, but not yet "expose" this field, as there's still discussion about the current implementation in moby, so I wasn't sure if this part of the API would change because of that moby/moby#38777 (comment)

/cc @ddebroy @dperny @wk8

@thaJeztah
Copy link
Copy Markdown
Member Author

thaJeztah commented Mar 2, 2019

ping @silvin-lubecki @vdemeester @tiborvass PTAL

vdemeester
vdemeester approved these changes Mar 4, 2019
View reviewed changes
Copy link
Copy Markdown
Collaborator

@vdemeester vdemeester left a comment

Choose a reason for hiding this comment

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

LGTM 🐯

@tiborvass tiborvass merged commit 81ac432 into docker:master Mar 12, 2019
@GordonTheTurtle GordonTheTurtle added this to the 19.03.0 milestone Mar 12, 2019
@thaJeztah thaJeztah deleted the update_engine branch March 12, 2019 18:34
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@vdemeester vdemeester vdemeester approved these changes

@tiborvass tiborvass tiborvass approved these changes

Assignees

No one assigned

Labels

status/2-code-review

Projects

None yet

Milestone

19.03.0

Development

Successfully merging this pull request may close these issues.

5 participants

@thaJeztah @codecov-io @vdemeester @tiborvass @GordonTheTurtle