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

Bump docker to v26 #2289

Merged
merged 3 commits into from
Apr 11, 2024
Merged

Bump docker to v26 #2289

merged 3 commits into from
Apr 11, 2024

Conversation

wolfogre
Copy link
Member

@wolfogre wolfogre commented Apr 11, 2024

Replace and close #2260

What I did:

  1. Bump github.com/docker/cli and github.com/docker/docker.
    Then go mod tidy report:
go: github.com/nektos/act/pkg/container imports
	github.com/docker/docker/client imports
	go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp imports
	go.opentelemetry.io/otel/metric/global: module go.opentelemetry.io/otel/metric@latest found (v1.25.0), but does not contain package go.opentelemetry.io/otel/metric/global
go: github.com/nektos/act/pkg/container imports
	github.com/docker/docker/client imports
	go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp imports
	go.opentelemetry.io/otel/metric/instrument: module go.opentelemetry.io/otel/metric@latest found (v1.25.0), but does not contain package go.opentelemetry.io/otel/metric/instrument
go: github.com/nektos/act/pkg/container imports
	github.com/docker/docker/client tested by
	github.com/docker/docker/client.test imports
	github.com/docker/docker/testutil imports
	go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp imports
	go.opentelemetry.io/otel/exporters/otlp/internal: module go.opentelemetry.io/otel/exporters/otlp@latest found (v0.20.1), but does not contain package go.opentelemetry.io/otel/exporters/otlp/internal
go: github.com/nektos/act/pkg/container imports
	github.com/docker/docker/client tested by
	github.com/docker/docker/client.test imports
	github.com/docker/docker/testutil imports
	go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp imports
	go.opentelemetry.io/otel/exporters/otlp/otlptrace/internal/otlpconfig imports
	go.opentelemetry.io/otel/exporters/otlp/internal/envconfig: module go.opentelemetry.io/otel/exporters/otlp@latest found (v0.20.1), but does not contain package go.opentelemetry.io/otel/exporters/otlp/internal/envconfig
  1. Bump go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp and go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp.
    Then go mod tidy report all is fine.
    And go has been upgraded to 1.21 because contrib requires it.

  2. Update the codes to meet the changed APIs.

@wolfogre wolfogre added the dependencies Pull requests that update a dependency file label Apr 11, 2024
@wolfogre wolfogre requested a review from a team as a code owner April 11, 2024 04:21
@wolfogre wolfogre added the go Pull requests that update Go code label Apr 11, 2024
Copy link

codecov bot commented Apr 11, 2024

Codecov Report

Attention: Patch coverage is 0% with 5 lines in your changes are missing coverage. Please review.

Project coverage is 63.48%. Comparing base (5a80a04) to head (a2e16c7).
Report is 40 commits behind head on master.

Files Patch % Lines
pkg/container/docker_run.go 0.00% 5 Missing ⚠️
Additional details and impacted files
@@            Coverage Diff             @@
##           master    #2289      +/-   ##
==========================================
+ Coverage   61.56%   63.48%   +1.92%     
==========================================
  Files          53       56       +3     
  Lines        9002     7479    -1523     
==========================================
- Hits         5542     4748     -794     
+ Misses       3020     2282     -738     
- Partials      440      449       +9     

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

Copy link
Contributor

mergify bot commented Apr 11, 2024

@wolfogre this pull request has failed checks 🛠

@mergify mergify bot added the needs-work Extra attention is needed label Apr 11, 2024
@wolfogre
Copy link
Member Author

I don't think the "codecov/patch" check needs to be satisfied. @cplee, could you please help give a hand to merge it?

@cplee cplee merged commit 2df924c into nektos:master Apr 11, 2024
7 of 8 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
dependencies Pull requests that update a dependency file go Pull requests that update Go code needs-work Extra attention is needed size/L
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants