Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: containerd/containerd
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: v1.7.14
Choose a base ref
...
head repository: containerd/containerd
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: v1.7.15
Choose a head ref
  • 12 commits
  • 72 files changed
  • 8 contributors

Commits on Mar 20, 2024

  1. build(deps): bump google.golang.org/protobuf from 1.31.0 to 1.32.0

    Bumps google.golang.org/protobuf from 1.31.0 to 1.32.0.
    
    ---
    updated-dependencies:
    - dependency-name: google.golang.org/protobuf
      dependency-type: direct:production
      update-type: version-update:semver-minor
    ...
    
    Signed-off-by: dependabot[bot] <support@github.com>
    (cherry picked from commit 7fe038e)
    Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
    dependabot[bot] authored and thaJeztah committed Mar 20, 2024
    Configuration menu
    Copy the full SHA
    a1a7af7 View commit details
    Browse the repository at this point in the history
  2. build(deps): bump google.golang.org/protobuf from 1.32.0 to 1.33.0

    Bumps google.golang.org/protobuf from 1.32.0 to 1.33.0.
    
    ---
    updated-dependencies:
    - dependency-name: google.golang.org/protobuf
      dependency-type: direct:production
      update-type: version-update:semver-minor
    ...
    
    Signed-off-by: dependabot[bot] <support@github.com>
    (cherry picked from commit 10c7f03)
    Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
    dependabot[bot] authored and thaJeztah committed Mar 20, 2024
    Configuration menu
    Copy the full SHA
    2d136c5 View commit details
    Browse the repository at this point in the history
  3. vendor: github.com/golang/protobuf v1.5.4

    commit 10c7f03 updated google.golang.org/protobuf
    to v1.33.0, which addresses CVE-2024-24786, however a follow-up post on the
    Golang security list issued a warning that the v1.33.0 update introduced a
    breaking change, causing compatibility with github.com/golang/protobuf to be
    broken;
    
    > A small correction: This vulnerability applies when the UnmarshalOptions.DiscardUnknown
    > option is set (as well as when unmarshaling into any message which contains a
    > google.protobuf.Any). There is no UnmarshalUnknown option.
    >
    > In addition, version 1.33.0 of google.golang.org/protobuf inadvertently
    > introduced an incompatibility with the older github.com/golang/protobuf
    > module. (golang/protobuf#1596) Users of the older
    > module should update to github.com/golang/protobuf@v1.5.4.
    
    Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
    (cherry picked from commit 45e425c)
    Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
    thaJeztah committed Mar 20, 2024
    Configuration menu
    Copy the full SHA
    e6d91d8 View commit details
    Browse the repository at this point in the history

Commits on Mar 22, 2024

  1. Merge pull request #9975 from thaJeztah/1.7_bump_protobuf

    [release/1.7 backport] vendor: google.golang.org/protobuf 1.33.0, github.com/golang/protobuf v1.5.4
    dmcgowan authored Mar 22, 2024
    Configuration menu
    Copy the full SHA
    be5ec97 View commit details
    Browse the repository at this point in the history

Commits on Mar 25, 2024

  1. adds mediatype to oci index record

    Signed-off-by: Talon Bowler <talon.bowler@docker.com>
    (cherry picked from commit 17ea395)
    daghack committed Mar 25, 2024
    Configuration menu
    Copy the full SHA
    6605c47 View commit details
    Browse the repository at this point in the history

Commits on Mar 27, 2024

  1. Merge pull request #9990 from daghack/oci-add-mediatype-1.7

    [release/1.7] adds mediatype to oci index record
    estesp authored Mar 27, 2024
    Configuration menu
    Copy the full SHA
    ec5222f View commit details
    Browse the repository at this point in the history

Commits on Mar 28, 2024

  1. Fix compile from version control system (source) use case

    This change excludes the github.com/mitchellh/osext indirect dependency
    to resolve compile from source use case issue due to dependency no
    longer being available.
    
    Signed-off-by: Austin Vazquez <macedonv@amazon.com>
    austinvazquez committed Mar 28, 2024
    Configuration menu
    Copy the full SHA
    2a05421 View commit details
    Browse the repository at this point in the history

Commits on Mar 29, 2024

  1. Merge pull request #10012 from austinvazquez/release-1.7-fix-offline-…

    …compilation
    
    [release/1.7] Fix compile from version control system (source) use case
    estesp authored Mar 29, 2024
    Configuration menu
    Copy the full SHA
    0dcf21c View commit details
    Browse the repository at this point in the history

Commits on Apr 5, 2024

  1. runc-shim: only defer init process exits

    In order to make sure that we don't publish task exit events for init
    processes before we do for execs in that container, we added logic to
    `processExits` in 892dc54 to skip these
    and let the pending exec's `handleStarted` closure process them.
    
    However, the conditional logic in `processExits` added was faulty - we
    should only defer processing of exit events related to init processes,
    not other execs. Due to this missing condition,
    892dc54 introduced a bug where, if
    there are many concurrent execs for the same container/init pid, exec
    exits are skipped and then never published, resulting in hanging
    clients.
    
    This commit adds the missing logic to `processExits`.
    
    Signed-off-by: Laura Brehm <laurabrehm@hey.com>
    (cherry picked from commit 6d00c3a)
    Signed-off-by: Laura Brehm <laurabrehm@hey.com>
    laurazard committed Apr 5, 2024
    Configuration menu
    Copy the full SHA
    21df467 View commit details
    Browse the repository at this point in the history
  2. Merge pull request #10037 from laurazard/backport-1.7-exec-fix

    [release/1.7] Fix runc shim to only defer init process exits
    dmcgowan authored Apr 5, 2024
    Configuration menu
    Copy the full SHA
    52fc8ab View commit details
    Browse the repository at this point in the history
  3. Prep v1.7.15 release

    Signed-off-by: Phil Estes <estesp@amazon.com>
    estesp committed Apr 5, 2024
    Configuration menu
    Copy the full SHA
    4d4759b View commit details
    Browse the repository at this point in the history
  4. Merge pull request #10039 from estesp/prep-1.7.15

    [release/1.7] Prepare for v1.7.15 release
    dmcgowan authored Apr 5, 2024
    Configuration menu
    Copy the full SHA
    926c958 View commit details
    Browse the repository at this point in the history
Loading