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.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We鈥檒l occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update Rootlesskit to v2.0.1 #47332

Merged
merged 3 commits into from Feb 6, 2024
Merged

Update Rootlesskit to v2.0.1 #47332

merged 3 commits into from Feb 6, 2024

Conversation

AkihiroSuda
Copy link
Member

@AkihiroSuda AkihiroSuda commented Feb 6, 2024 •
edited

- What I did

Fix:

- How I did it

Updated Rootlesskit to v2.0.1
https://github.com/rootless-containers/rootlesskit/releases/tag/v2.0.1

- How to verify it

Run DOCKERD_ROOTLESS_ROOTLESSKIT_NET=lxc-user-nic dockerd-rootless.sh, and verify that DNS works (e.g., docker --context=rootless pull hello-world)

- Description for the changelog

Update Rootlesskit to v2.0.1

- A picture of a cute animal (not mandatory but encouraged)
馃惂

@AkihiroSuda
vendor.mod: github.com/google/uuid v1.6.0
f7192bb 
https://github.com/google/uuid/releases/tag/v1.6.0

Signed-off-by: Akihiro Suda <akihiro.suda.cz@hco.ntt.co.jp>
@AkihiroSuda
go.mod: github.com/rootless-containers/rootlesskit/v2 v2.0.1
f1730a6 
https://github.com/rootless-containers/rootlesskit/releases/tag/v2.0.1

Signed-off-by: Akihiro Suda <akihiro.suda.cz@hco.ntt.co.jp>
@AkihiroSuda
Dockerfile: update RootlessKit to v2.0.1
7f1b700 
https://github.com/rootless-containers/rootlesskit/releases/tag/v2.0.1

Fix issue 47327 (`rootless lxc-user-nic: /etc/resolv.conf missing ip`)

Signed-off-by: Akihiro Suda <akihiro.suda.cz@hco.ntt.co.jp>
@AkihiroSuda AkihiroSuda added this to the 25.0.3 milestone Feb 6, 2024
@AkihiroSuda AkihiroSuda linked an issue Feb 6, 2024 that may be closed by this pull request
[v25 regression] rootless lxc-user-nic: /etc/resolv.conf missing ip #47327
Closed
@AkihiroSuda AkihiroSuda mentioned this pull request Feb 6, 2024
Closed
@thaJeztah
Copy link
Member

Failure is unrelated, and is a known flaky; I kicked GHA again

=== Failed
=== FAIL: amd64.integration.daemon TestLiveRestore/volume_references/local_volume_with_mount_options (2.32s)
    daemon_test.go:581: assertion failed: error is not nil: Error response from daemon: remove test-live-restore-volume-references-local: volume has active mounts
        --- FAIL: TestLiveRestore/volume_references/local_volume_with_mount_options (2.32s)

=== FAIL: amd64.integration.daemon TestLiveRestore/volume_references (20.77s)
    --- FAIL: TestLiveRestore/volume_references (20.77s)

thaJeztah
thaJeztah approved these changes Feb 6, 2024
View reviewed changes
Copy link
Member

@thaJeztah thaJeztah left a comment

Choose a reason for hiding this comment

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

LGTM

@thaJeztah thaJeztah mentioned this pull request Feb 6, 2024
Merged
@thaJeztah
Copy link
Member

Prepared a cherry-pick (only the binary, as it looks like we don't need the vendor update);

@thaJeztah thaJeztah merged commit cae5d32 into moby:master Feb 6, 2024
126 checks passed
@thaJeztah thaJeztah mentioned this pull request Feb 6, 2024
Open
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@thaJeztah thaJeztah thaJeztah approved these changes

@tianon tianon Awaiting requested review from tianon tianon is a code owner

Assignees
No one assigned
Labels
area/rootless Rootless mode process/cherry-picked
Projects
None yet
Milestone
25.0.3
Development

Successfully merging this pull request may close these issues.

[v25 regression] rootless lxc-user-nic: /etc/resolv.conf missing ip
2 participants
@AkihiroSuda @thaJeztah