Skip to content

Commit

Permalink
[chore] Bump github.com/opencontainers/runc from 1.1.13 to 1.1.14 in …
Browse files Browse the repository at this point in the history
…/cmd/otelcontribcol (#35062)

**Description:** <Describe what has changed.>
<!--Ex. Fixing a bug - Describe the bug and how this fixes the issue.
Ex. Adding a feature - Explain what this achieves.-->
This re-applies
#34991
(with the additional dep bump in the `awscontainerinsights` receiver).
It looks like the `runc` dependency was downgraded in
#35019,
but I'm not sure if the downgrade was **required** there.

This should resolve a [failing CI/CD
action](https://github.com/open-telemetry/opentelemetry-collector-contrib/actions/runs/10745988978/job/29806095602#step:6:391)
on `main`.

---------

Co-authored-by: Sean Marciniak <30928402+MovieStoreGuy@users.noreply.github.com>
  • Loading branch information
crobert-1 and MovieStoreGuy authored Sep 9, 2024
1 parent 237a96b commit be7ddc3
Show file tree
Hide file tree
Showing 4 changed files with 6 additions and 6 deletions.
2 changes: 1 addition & 1 deletion cmd/otelcontribcol/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -673,7 +673,7 @@ require (
github.com/open-telemetry/otel-arrow v0.26.0 // indirect
github.com/opencontainers/go-digest v1.0.0 // indirect
github.com/opencontainers/image-spec v1.1.0 // indirect
github.com/opencontainers/runc v1.1.13 // indirect
github.com/opencontainers/runc v1.1.14 // indirect
github.com/opencontainers/runtime-spec v1.2.0 // indirect
github.com/opencontainers/selinux v1.10.0 // indirect
github.com/opensearch-project/opensearch-go/v2 v2.3.0 // indirect
Expand Down
4 changes: 2 additions & 2 deletions cmd/otelcontribcol/go.sum

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion receiver/awscontainerinsightreceiver/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ require (
github.com/open-telemetry/opentelemetry-collector-contrib/internal/common v0.108.0 // indirect
github.com/opencontainers/go-digest v1.0.0 // indirect
github.com/opencontainers/image-spec v1.0.2 // indirect
github.com/opencontainers/runc v1.1.13 // indirect
github.com/opencontainers/runc v1.1.14 // indirect
github.com/opencontainers/runtime-spec v1.2.0 // indirect
github.com/opencontainers/selinux v1.10.0 // indirect
github.com/openshift/api v3.9.0+incompatible // indirect
Expand Down
4 changes: 2 additions & 2 deletions receiver/awscontainerinsightreceiver/go.sum

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 comments on commit be7ddc3

Please sign in to comment.