chore(deps): bump github.com/docker/docker from v25.0.5 to v26.1.4 by thaJeztah · Pull Request #2584 · testcontainers/testcontainers-go

thaJeztah · 2024-06-14T17:40:37Z

What does this PR do?

Updating the docker dependency to the current release.

rename variables that shadowed imports
Update docker and dependencies
Remove uses of deprecated API types
Deprecate network.WithCheckDuplicate(), which is automatically set on older API versions
Deprecate NetworkCreate.CheckDuplicate
Remove uses of network.WithCheckDuplicate()

Why is it important?

Related issues

closes [Bug]: v0.31.0 failing due to docker type removed in docker/docker dependency #2583

netlify · 2024-06-14T17:40:53Z

✅ Deploy Preview for testcontainers-go ready!

Name	Link
🔨 Latest commit	`e434d06`
🔍 Latest deploy log	https://app.netlify.com/sites/testcontainers-go/deploys/666cbf199843f40008d88e56
😎 Deploy Preview	https://deploy-preview-2584--testcontainers-go.netlify.app
📱 Preview on mobile	Toggle QR Code... Use your smartphone camera to open QR code link.

To edit notification comments on pull requests, go to your Netlify site configuration.

docker.go

docker_auth_test.go

options.go

thaJeztah · 2024-06-14T17:52:11Z

Think I have them all and changed them all back 😄

mdelapenya · 2024-06-14T17:53:16Z

Thanks for this! I'm enabling the CI now

mdelapenya · 2024-06-14T17:54:45Z

Oh you probably need to run make lint locally to detect and fix the deprecations

thaJeztah · 2024-06-14T17:57:35Z

oh! good one; I should've read the docs; let me check

mdelapenya · 2024-06-14T17:58:49Z

I should've read the docs

if the docs include reading the GH workflow, then you are right... otherwise it's my fault not having the CONTRIBUTING guidelines up-to-date 🙈

Signed-off-by: Sebastiaan van Stijn <[email protected]>

- Update docker and dependencies - Remove uses of deprecated API types - Deprecate network.WithCheckDuplicate(), which is automatically set on older API versions - Deprecate NetworkCreate.CheckDuplicate - Remove uses of network.WithCheckDuplicate() Signed-off-by: Sebastiaan van Stijn <[email protected]>

thaJeztah · 2024-06-14T18:02:24Z

Yup, looks like I missed one type 😂 I think it's ok now 🤞

mdelapenya · 2024-06-14T18:04:43Z

Perfect, lint passed! 🚀 Waiting for the CI to merge

thaJeztah · 2024-06-14T18:13:18Z

Hm... looks like some failures 🤔 fun!

run golangci-lint
  Running [/home/runner/golangci-lint-1.55.2-linux-amd64/golangci-lint run --out-format=github-actions --path-prefix=modules/artemis --verbose] in [/home/runner/work/testcontainers-go/testcontainers-go/modules/artemis] ...
  Error: undefined: testcontainers (typecheck)
  Error: undefined: testcontainers (typecheck)
  Error: undefined: testcontainers (typecheck)
  Error: c.PortEndpoint undefined (type *Container has no field or method PortEndpoint) (typecheck)
  Error: c.PortEndpoint undefined (type *Container has no field or method PortEndpoint) (typecheck)

thaJeztah · 2024-06-14T18:16:18Z

I don't see that locally; or at least, don't see something immediately wrong in here;

testcontainers-go/modules/artemis/artemis.go

Line 38 in 2681ae4

return c.PortEndpoint(ctx, nat.Port(defaultBrokerPort), "")

thaJeztah · 2024-06-14T18:18:38Z

Wondering if it's golangci-lint needing an update for newer Go versions 🤔

golangci/golangci-lint-action@9d1e0624a798bb64f6c3cea93db47765312263dc
  with:
    version: v1.55.2
    working-directory: modules/artemis
    args: --verbose
    skip-cache: true
    github-token: ***
    only-new-issues: false
    skip-save-cache: false
    install-mode: binary
  env:
    TESTCONTAINERS_RYUK_DISABLED: false
    RYUK_CONNECTION_TIMEOUT: 60s
    RYUK_RECONNECTION_TIMEOUT: 10s

mdelapenya · 2024-06-14T18:19:19Z

Let me try to lint all modules locally 🙏

mdelapenya · 2024-06-14T18:22:07Z

Each submodule needed to mod-tidy again, I ran make tidy-all for that. This brings me the chance to improve the contributing docs ASAP

thaJeztah · 2024-06-14T18:24:47Z

oh! missed that one; thanks!

mdelapenya · 2024-06-14T18:40:32Z

@thaJeztah #2586

modules/registry/registry.go

… thaJeztah · Pull Request #2584 · testcontainers/testcontainers-go testcontainers/testcontainers-go#2584 これが含まれたのがリリースされるまでコメントアウト

* sqlc を引っぺがす * バージョンを上げる * environment 追加 * いったんコメントアウト * とりあえず * 一時的にテストを変更する * お試し E2E テスト * アップデート * grafana をいったんコメントアウト * 設定ファイルを整理 * 色々整理 * 細かいログ追加 * 色々シンプルにする * validate までは問題なし * 統計ウェブフックを clickhouse に登録できるようになった * 変更履歴を更新する * ブランチ無視削除 * 整理 * chore(deps): bump github.com/docker/docker from v25.0.5 to v26.1.4 by thaJeztah · Pull Request #2584 · testcontainers/testcontainers-go testcontainers/testcontainers-go#2584 これが含まれたのがリリースされるまでコメントアウト * stats_webhook_path を追加 * テストをいったんコメントアウト

…2584) * rename some variables that shadowed imports Signed-off-by: Sebastiaan van Stijn <[email protected]> * go.mod: github.com/docker/docker v26.1.4 - Update docker and dependencies - Remove uses of deprecated API types - Deprecate network.WithCheckDuplicate(), which is automatically set on older API versions - Deprecate NetworkCreate.CheckDuplicate - Remove uses of network.WithCheckDuplicate() Signed-off-by: Sebastiaan van Stijn <[email protected]> * chore: run make tidy-all * fix: update types in the registry module * fix: more types --------- Signed-off-by: Sebastiaan van Stijn <[email protected]> Co-authored-by: Manuel de la Peña <[email protected]>

* main: docs: document disabling ryuk with properties (testcontainers#2603) fix: allow compose files and readers to be used together (testcontainers#2598) chore(deps): bump urllib3 from 2.2.1 to 2.2.2 (testcontainers#2590) docs: example for NATS cluster (testcontainers#2591) docs: fix deprecation for material extensions emoji (testcontainers#2592) gha: update golangci-lint to v1.59.1 (testcontainers#2588) network: WithCheckDuplicate: don't set CheckDuplicate value (testcontainers#2589) fix: proper synchronisation for start/stop log production (testcontainers#2576) chore(deps): bump github.com/docker/docker from v25.0.5 to v26.1.4 (testcontainers#2584) docs: update contributing guide (testcontainers#2586) feat: add testcontainers labels to the built images (testcontainers#2579) feat(mongodb): Make the replica set name configurable (testcontainers#2538) chore: skip reaper tests if ryuk is disabled (testcontainers#2582) chore: increase check time to 60 secs instead of 20 (testcontainers#2581) fix: prepend substitutors for built images (testcontainers#2577) docs: update colima docs (testcontainers#2578) fix(cockroachdb): Fixes cockroachdb wait strategy handling (testcontainers#2456) Fix race condition when looking up reaper (ryuk) container (testcontainers#2508) chore: bring golangci-lint back (testcontainers#2571) docs(compose): Fix typo docker compose docs (testcontainers#2565)

…estcontainers#2584) * rename some variables that shadowed imports Signed-off-by: Sebastiaan van Stijn <[email protected]> * go.mod: github.com/docker/docker v26.1.4 - Update docker and dependencies - Remove uses of deprecated API types - Deprecate network.WithCheckDuplicate(), which is automatically set on older API versions - Deprecate NetworkCreate.CheckDuplicate - Remove uses of network.WithCheckDuplicate() Signed-off-by: Sebastiaan van Stijn <[email protected]> * chore: run make tidy-all * fix: update types in the registry module * fix: more types --------- Signed-off-by: Sebastiaan van Stijn <[email protected]> Co-authored-by: Manuel de la Peña <[email protected]>

thaJeztah requested a review from a team as a code owner June 14, 2024 17:40

thaJeztah mentioned this pull request Jun 14, 2024

[Bug]: v0.31.0 failing due to docker type removed in docker/docker dependency #2583

Closed

thaJeztah commented Jun 14, 2024

View reviewed changes

docker.go Outdated Show resolved Hide resolved

mdelapenya mentioned this pull request Jun 14, 2024

chore(deps): bump github.com/docker/docker from v25.0.5+incompatible to v26.1.4+incompatible #2585

Closed

mdelapenya reviewed Jun 14, 2024

View reviewed changes

docker.go Outdated Show resolved Hide resolved

mdelapenya reviewed Jun 14, 2024

View reviewed changes

docker.go Outdated Show resolved Hide resolved

mdelapenya reviewed Jun 14, 2024

View reviewed changes

docker_auth_test.go Outdated Show resolved Hide resolved

mdelapenya reviewed Jun 14, 2024

View reviewed changes

options.go Outdated Show resolved Hide resolved

thaJeztah force-pushed the bump_docker branch from 9b7768c to 3a50a96 Compare June 14, 2024 17:51

thaJeztah added 2 commits June 14, 2024 19:59

rename some variables that shadowed imports

d5ad0bd

Signed-off-by: Sebastiaan van Stijn <[email protected]>

thaJeztah force-pushed the bump_docker branch from 3a50a96 to 6e086e8 Compare June 14, 2024 18:02

mdelapenya self-assigned this Jun 14, 2024

mdelapenya added the dependencies Dependencies or external services label Jun 14, 2024

mdelapenya changed the title ~~go.mod: github.com/docker/docker v26.1.4~~ chore(deps): bump github.com/docker/docker from v25.0.5 to v26.1.4 Jun 14, 2024

chore: run make tidy-all

18e565a

mdelapenya mentioned this pull request Jun 14, 2024

docs: update contributing guide #2586

Merged

fix: update types in the registry module

c855a27

thaJeztah commented Jun 14, 2024

View reviewed changes

modules/registry/registry.go Show resolved Hide resolved

fix: more types

e434d06

mdelapenya merged commit 9a93db4 into testcontainers:main Jun 15, 2024

thaJeztah mentioned this pull request Jun 15, 2024

network: WithCheckDuplicate: don't set CheckDuplicate value #2589

Merged

czeslavo mentioned this pull request Jun 25, 2024

chore(deps): bump github.com/docker/docker from 26.1.4+incompatible to 27.0.1+incompatible Kong/kubernetes-ingress-controller#6246

Closed

Uh oh!

Conversation

thaJeztah commented Jun 14, 2024

What does this PR do?

Why is it important?

Related issues

Uh oh!

netlify bot commented Jun 14, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

✅ Deploy Preview for testcontainers-go ready!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

thaJeztah commented Jun 14, 2024

Uh oh!

mdelapenya commented Jun 14, 2024

Uh oh!

mdelapenya commented Jun 14, 2024

Uh oh!

thaJeztah commented Jun 14, 2024

Uh oh!

mdelapenya commented Jun 14, 2024

Uh oh!

thaJeztah commented Jun 14, 2024

Uh oh!

mdelapenya commented Jun 14, 2024

Uh oh!

thaJeztah commented Jun 14, 2024

Uh oh!

thaJeztah commented Jun 14, 2024

Uh oh!

thaJeztah commented Jun 14, 2024

Uh oh!

mdelapenya commented Jun 14, 2024

Uh oh!

mdelapenya commented Jun 14, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

thaJeztah commented Jun 14, 2024

Uh oh!

mdelapenya commented Jun 14, 2024

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants

netlify bot commented Jun 14, 2024 •

edited

Loading

mdelapenya commented Jun 14, 2024 •

edited

Loading