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

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

Merged
merged 5 commits into from
Jun 15, 2024

Conversation

thaJeztah
Copy link
Contributor

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

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

netlify bot commented Jun 14, 2024

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...

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 Outdated Show resolved Hide resolved
docker.go Outdated Show resolved Hide resolved
docker.go Outdated Show resolved Hide resolved
docker_auth_test.go Outdated Show resolved Hide resolved
options.go Outdated Show resolved Hide resolved
@thaJeztah
Copy link
Contributor Author

Think I have them all and changed them all back 😄

@mdelapenya
Copy link
Collaborator

Thanks for this! I'm enabling the CI now

@mdelapenya
Copy link
Collaborator

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

@thaJeztah
Copy link
Contributor Author

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

@mdelapenya
Copy link
Collaborator

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 <github@gone.nl>
- 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 <github@gone.nl>
@thaJeztah
Copy link
Contributor Author

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

@mdelapenya
Copy link
Collaborator

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

@mdelapenya mdelapenya self-assigned this Jun 14, 2024
@mdelapenya mdelapenya added the dependencies Dependencies or external services label Jun 14, 2024
@mdelapenya 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
@thaJeztah
Copy link
Contributor Author

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
Copy link
Contributor Author

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

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

@thaJeztah
Copy link
Contributor Author

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
Copy link
Collaborator

Let me try to lint all modules locally 🙏

@mdelapenya
Copy link
Collaborator

mdelapenya commented Jun 14, 2024

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
Copy link
Contributor Author

oh! missed that one; thanks!

@mdelapenya
Copy link
Collaborator

@thaJeztah #2586

@mdelapenya mdelapenya merged commit 9a93db4 into testcontainers:main Jun 15, 2024
106 checks passed
voluntas added a commit to shiguredo/kohaku that referenced this pull request Jun 16, 2024
… thaJeztah · Pull Request #2584 · testcontainers/testcontainers-go testcontainers/testcontainers-go#2584

これが含まれたのがリリースされるまでコメントアウト
voluntas added a commit to shiguredo/kohaku that referenced this pull request Jun 16, 2024
* 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 を追加

* テストをいったんコメントアウト
mdelapenya added a commit that referenced this pull request Jun 17, 2024
…2584)

* rename some variables that shadowed imports

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>

* 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 <github@gone.nl>

* chore: run make tidy-all

* fix: update types in the registry module

* fix: more types

---------

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Co-authored-by: Manuel de la Peña <mdelapenya@gmail.com>
mdelapenya added a commit that referenced this pull request Jun 18, 2024
…2584)

* rename some variables that shadowed imports

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>

* 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 <github@gone.nl>

* chore: run make tidy-all

* fix: update types in the registry module

* fix: more types

---------

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Co-authored-by: Manuel de la Peña <mdelapenya@gmail.com>
mdelapenya added a commit to mdelapenya/testcontainers-go that referenced this pull request Jun 24, 2024
* 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)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
dependencies Dependencies or external services
Projects
None yet
Development

Successfully merging this pull request may close these issues.

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