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

Default to containerd in docker-compose.yml #6580

Merged
merged 1 commit into from Feb 26, 2021
Merged

Conversation

aoldershaw
Copy link
Contributor

since we're going to default to using containerd in 7.1.0, we should
probably be developing against it!

this commit uses the containerd runtime by default, and replaces the
containerd override with a guardian one

Signed-off-by: Aidan Oldershaw aoldershaw@pivotal.io

What does this PR accomplish?

Bug Fix | Feature | Documentation

closes # .

Changes proposed by this PR:

Notes to reviewer:

Contributor Checklist

Reviewer Checklist

  • Code reviewed
  • Tests reviewed
  • Documentation reviewed
  • Release notes reviewed
  • PR acceptance performed
  • New config flags added? Ensure that they are added to the
    BOSH and
    Helm packaging; otherwise, ignored for
    the integration
    tests

    (for example, if they are Garden configs that are not displayed in the
    --help text).

since we're going to default to using containerd in 7.1.0, we should
probably be developing against it!

this commit uses the containerd runtime by default, and replaces the
containerd override with a guardian one

Signed-off-by: Aidan Oldershaw <aoldershaw@pivotal.io>
Copy link
Contributor

@muntac muntac left a comment

Choose a reason for hiding this comment

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

LGTM!

@aoldershaw aoldershaw merged commit d208bdd into master Feb 26, 2021
@aoldershaw aoldershaw deleted the default-to-containerd branch February 26, 2021 01:10
@clarafu clarafu added the release/no-impact This is an issue that never affected released versions (i.e. a regression caught prior to shipping). label Mar 15, 2021
@clarafu clarafu changed the title default to containerd in docker-compose.yml Default to containerd in docker-compose.yml Mar 15, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
misc release/no-impact This is an issue that never affected released versions (i.e. a regression caught prior to shipping).
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants