Skip to content
This repository was archived by the owner on Oct 13, 2023. It is now read-only.

[19.03 backport] rootless: fix proxying UDP packets#434

Merged
thaJeztah merged 1 commit intodocker-archive:19.03from
AkihiroSuda:bump-up-rootlesskit-1903
Jan 20, 2020
Merged

[19.03 backport] rootless: fix proxying UDP packets#434
thaJeztah merged 1 commit intodocker-archive:19.03from
AkihiroSuda:bump-up-rootlesskit-1903

Conversation

@AkihiroSuda
Copy link

@AkihiroSuda AkihiroSuda commented Dec 19, 2019

backport moby#40317

@AkihiroSuda AkihiroSuda force-pushed the bump-up-rootlesskit-1903 branch from a8a183d to 5a6c9e3 Compare December 31, 2019 07:17
@AkihiroSuda
Copy link
Author

AkihiroSuda commented Dec 31, 2019

CI failure seems unrelated

[2019-12-31T07:24:04.578Z] + bundleName=amd64

[2019-12-31T07:24:04.578Z] + echo Creating amd64-bundles.tar.gz

[2019-12-31T07:24:04.578Z] Creating amd64-bundles.tar.gz

[2019-12-31T07:24:04.578Z] + xargs tar -czf amd64-bundles.tar.gz

[2019-12-31T07:24:04.578Z] + find bundles -path */root/*overlay2 -prune -o -type f ( -name *-report.json -o -name *.log -o -name *.prof -o -name *-report.xml ) -print

[2019-12-31T07:24:04.578Z] find: ‘bundles’: No such file or directory

[2019-12-31T07:24:04.578Z] tar: Cowardly refusing to create an empty archive

[2019-12-31T07:24:04.578Z] Try 'tar --help' or 'tar --usage' for more information.

script returned exit code 123

@thaJeztah thaJeztah added this to the 19.03.6 milestone Jan 6, 2020
thaJeztah
thaJeztah approved these changes Jan 6, 2020
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

cpuguy83
cpuguy83 approved these changes Jan 16, 2020
View reviewed changes
Copy link

@cpuguy83 cpuguy83 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
Copy link
Member

thaJeztah commented Jan 16, 2020

@AkihiroSuda can you rebase this one? docker-py tests should be fixed in this branch: we can merge after that

@thaJeztah
Copy link
Member

thaJeztah commented Jan 16, 2020

triggered CI - I think it actually does a merge before running, so perhaps rebase is not needed. Fingers crossed

@AkihiroSuda
rootless: fix proxying UDP packets
325e889 
UDP reply packets were not proxied: rootless-containers/rootlesskit#86

The issue was fixed in RootlessKit v0.7.1: rootless-containers/rootlesskit#87

Full changes since v0.7.0: rootless-containers/rootlesskit@v0.7.0...v0.7.1

Signed-off-by: Akihiro Suda <akihiro.suda.cz@hco.ntt.co.jp>
(cherry picked from commit 658723b)
Signed-off-by: Akihiro Suda <akihiro.suda.cz@hco.ntt.co.jp>
@AkihiroSuda
Copy link
Author

AkihiroSuda commented Jan 20, 2020

rebased

@AkihiroSuda AkihiroSuda force-pushed the bump-up-rootlesskit-1903 branch from 5a6c9e3 to 325e889 Compare January 20, 2020 04:16
@thaJeztah
Copy link
Member

thaJeztah commented Jan 20, 2020

all green now; merging 👍

@thaJeztah thaJeztah merged commit ec50d8f into docker-archive:19.03 Jan 20, 2020
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Reviewers

2 more reviewers

@cpuguy83 cpuguy83 cpuguy83 approved these changes

@thaJeztah thaJeztah thaJeztah approved these changes

Reviewers whose approvals may not affect merge requirements

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

19.03.6

Development

Successfully merging this pull request may close these issues.

3 participants

@AkihiroSuda @thaJeztah @cpuguy83