Skip to content

Migrate docker module to moby - #909

Merged
wrjlewis merged 3 commits into
matrix-org:mainfrom
AndrewFerr:docker-to-moby
Aug 6, 2026
Merged

Migrate docker module to moby#909
wrjlewis merged 3 commits into
matrix-org:mainfrom
AndrewFerr:docker-to-moby

Conversation

@AndrewFerr

Copy link
Copy Markdown
Member

Migrate from the deprecated github.com/docker/docker module to the current latest version of github.com/moby/moby, and make all changes necessary to adapt to its refactoring.

Signed-off-by: Andrew Ferrazzutti andrewf@element.io

Pull Request Checklist

Migrate from the deprecated github.com/docker/docker module to the
current latest version of github.com/moby/moby, and make all changes
necessary to adapt to its refactoring.
@AndrewFerr
AndrewFerr requested review from a team and kegsay as code owners August 3, 2026 02:42

@reivilibre reivilibre left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks!

return "", fmt.Errorf("%s: failed to create docker network. %w", blueprintName, err)
}
if nw.Warning != "" {
if len(nw.Warning) > 0 && nw.Warning[0] != "" {

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

wondering why we have to check [0] != "" as well. Is it actually necessary?
I don't mind and I don't know, just seems bizarre to me

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't know if it's necessary either, but figured it was cheap to guard against it just in case.

@wrjlewis
wrjlewis merged commit 2ceab09 into matrix-org:main Aug 6, 2026
6 checks passed
@AndrewFerr
AndrewFerr deleted the docker-to-moby branch August 6, 2026 17:05
Comment thread cmd/perftest/snapshot.go
"time"

"github.com/docker/docker/api/types/container"
"github.com/matrix-org/complement/internal/docker"

@MadLittleMods MadLittleMods Aug 6, 2026

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

For reference, what's spawning this change? (migrating docker module to moby)

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The fact that docker/docker is no longer getting new releases & has some CVEs that AIUI are fixed only in the replacement moby/ packages.

Granted, CVEs aren't much of an issue for integration tests, but this felt like a good catalyst for doing the migration.

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

What made you care about this though?

How did you notice?

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

One of our security scanners (Vanta) flagged the CVEs in all of our repos that use Complement.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants