Copy pkg/symlink and pkg/truncindex from moby/moby#4631
Copy pkg/symlink and pkg/truncindex from moby/moby#4631dmcgowan merged 1 commit intocontainerd:masterfrom
Conversation
dims
force-pushed
the
copy-a-few-packages-from-moby/moby
branch
4 times, most recently
from
857c844 to
1b9d287
Compare
|
Build succeeded.
|
dims
force-pushed
the
copy-a-few-packages-from-moby/moby
branch
from
1b9d287 to
6df2a9b
Compare
|
Build succeeded.
|
dims
changed the title
|
Do we usually add some kind of note below our header to preserve information about where this came from? I'm also curious why there is a BSD license file in the symlink directory? |
|
@estesp i copied them over from moby/moby. felt wrong to strip it out |
|
Let's wait for a short bit, and see if we could move these out of the docker repo to be a standalone module (I'd like to avoid getting these out of sync if possible) Mostly looking at the symlink one |
|
sounds good @thaJeztah |
|
Looks good, but let's mention the origin of the code in the file header |
moby/moby SHA : 9c15e82f19b0ad3c5fe8617a8ec2dddc6639f40a github.com/docker/docker/pkg/truncindex/truncindex.go -> pkg/cri/store/truncindex/truncindex.go github.com/docker/docker/pkg/symlink/LICENSE.APACHE -> pkg/symlink/LICENSE.APACHE github.com/docker/docker/pkg/symlink/LICENSE.BSD -> pkg/symlink/LICENSE.BSD github.com/docker/docker/pkg/symlink/README.md -> pkg/symlink/README.md github.com/docker/docker/pkg/symlink/fs.go -> pkg/symlink/fs.go github.com/docker/docker/pkg/symlink/fs_unix.go -> pkg/symlink/fs_unix.go github.com/docker/docker/pkg/symlink/fs_windows.go -> pkg/symlink/fs_windows.go Signed-off-by: Davanum Srinivas <[email protected]>
dims
force-pushed
the
copy-a-few-packages-from-moby/moby
branch
from
6df2a9b to
a9cb223
Compare
|
Build succeeded.
|
|
Discussed this in the moby maintainers meeting, and we want to move the pkg/symlink package to the https://github.com/moby/sys (could be as a separate submodule). I want to have a look at that, but we want to preserve history of the package, so I have to dust-off my git and google-fu for that; if someone has time to look at that, that would be appreciated @dims IIRC, you did something similar for https://github.com/moby/ipvs (if you have hints 🤗) For the "truncindex" package (doesn't really deserve its own repo/module), so copying that should be fine. |
thaJeztah
left a comment
thaJeztah
left a comment
There was a problem hiding this comment.
let me leave a "request changes" review on this one (see my comment above) 👍
dmcgowan
left a comment
dmcgowan
left a comment
There was a problem hiding this comment.
LGTM
I think the symlink package could share logic with our existing scoped path resolution logic. I don't see a need to wait for this to be separated out as another module to depend on.
|
I would really prefer it to be maintained centrally to prevent things from diverging if possible |
Can we have these packages in https://github.com/moby/sys ? cc @kolyshkin |
Good idea, will take a look later this week. |
I took a look and I do not know enough details about these packages in order to be able to maintain it. Yet I think it's a good idea to have it this way (as separate packages in |
|
@kolyshkin @thaJeztah i've a PR in moby/sys, please take a look : moby/sys#53 |
|
Let's separate this change from any moves in Moby. Breaking the |
7 participants
We need to remove the recursive dependency of containerd<->docker/docker
Follow up of discussion in #4626 (comment)
Signed-off-by: Davanum Srinivas [email protected]