InTheForest/moby
1
0
Fork 0
mirror of https://github.com/moby/moby.git synced 2026-01-11 18:51:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

Move oci to daemon/pkg/oci

Browse Source 
Signed-off-by: Derek McGowan <derek@mcg.dev>
This commit is contained in:
Derek McGowan
2025-07-24 12:11:19 -07:00
parent f24455c90b
commit c74ba95583
26 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
daemon/builder/dockerfile/dispatchers_test.go
View File

@@ -10,7 +10,7 @@ import (
"github.com/docker/docker/daemon/builder"
"github.com/docker/docker/daemon/internal/image"
"github.com/docker/docker/oci"
"github.com/docker/docker/daemon/pkg/oci"
"github.com/docker/go-connections/nat"
"github.com/moby/buildkit/frontend/dockerfile/instructions"
"github.com/moby/buildkit/frontend/dockerfile/parser"

2
daemon/builder/dockerfile/evaluator.go
View File

@@ -27,8 +27,8 @@ import (
"github.com/docker/docker/daemon/builder"
"github.com/docker/docker/daemon/internal/image"
"github.com/docker/docker/daemon/pkg/oci"
"github.com/docker/docker/errdefs"
"github.com/docker/docker/oci"
"github.com/moby/buildkit/frontend/dockerfile/instructions"
"github.com/moby/buildkit/frontend/dockerfile/shell"
"github.com/moby/moby/api/types/container"

2
daemon/container.go
View File

@@ -19,10 +19,10 @@ import (
"github.com/docker/docker/daemon/container"
"github.com/docker/docker/daemon/internal/image"
"github.com/docker/docker/daemon/network"
"github.com/docker/docker/daemon/pkg/oci/caps"
"github.com/docker/docker/daemon/pkg/opts"
volumemounts "github.com/docker/docker/daemon/volume/mounts"
"github.com/docker/docker/errdefs"
"github.com/docker/docker/oci/caps"
"github.com/docker/go-connections/nat"
containertypes "github.com/moby/moby/api/types/container"
"github.com/moby/moby/api/types/mount"

2
daemon/container/container.go
View File

@@ -26,10 +26,10 @@ import (
"github.com/docker/docker/daemon/logger/local"
"github.com/docker/docker/daemon/logger/loggerutils/cache"
"github.com/docker/docker/daemon/network"
"github.com/docker/docker/daemon/pkg/oci"
"github.com/docker/docker/daemon/volume"
volumemounts "github.com/docker/docker/daemon/volume/mounts"
"github.com/docker/docker/errdefs"
"github.com/docker/docker/oci"
"github.com/docker/go-units"
containertypes "github.com/moby/moby/api/types/container"
"github.com/moby/moby/api/types/events"

2
daemon/create_unix.go
View File

@@ -11,9 +11,9 @@ import (
cerrdefs "github.com/containerd/errdefs"
"github.com/containerd/log"
"github.com/docker/docker/daemon/container"
"github.com/docker/docker/daemon/pkg/oci"
volumemounts "github.com/docker/docker/daemon/volume/mounts"
volumeopts "github.com/docker/docker/daemon/volume/service/opts"
"github.com/docker/docker/oci"
"github.com/docker/docker/pkg/idtools"
containertypes "github.com/moby/moby/api/types/container"
mounttypes "github.com/moby/moby/api/types/mount"

2
daemon/exec_linux.go
View File

@@ -8,7 +8,7 @@ import (
coci "github.com/containerd/containerd/v2/pkg/oci"
"github.com/docker/docker/daemon/config"
"github.com/docker/docker/daemon/container"
"github.com/docker/docker/oci/caps"
"github.com/docker/docker/daemon/pkg/oci/caps"
"github.com/opencontainers/runtime-spec/specs-go"
)

4
daemon/oci_linux.go
View File

@@ -15,12 +15,12 @@ import (
"github.com/containerd/log"
dconfig "github.com/docker/docker/daemon/config"
"github.com/docker/docker/daemon/container"
"github.com/docker/docker/daemon/pkg/oci"
"github.com/docker/docker/daemon/pkg/oci/caps"
volumemounts "github.com/docker/docker/daemon/volume/mounts"
"github.com/docker/docker/errdefs"
"github.com/docker/docker/internal/rootless/mountopts"
"github.com/docker/docker/internal/rootless/specconv"
"github.com/docker/docker/oci"
"github.com/docker/docker/oci/caps"
containertypes "github.com/moby/moby/api/types/container"
"github.com/moby/sys/mount"
"github.com/moby/sys/mountinfo"

2
daemon/oci_windows.go
View File

@@ -15,8 +15,8 @@ import (
"github.com/docker/docker/daemon/config"
"github.com/docker/docker/daemon/container"
"github.com/docker/docker/daemon/internal/image"
"github.com/docker/docker/daemon/pkg/oci"
"github.com/docker/docker/errdefs"
"github.com/docker/docker/oci"
"github.com/moby/moby/api/types/backend"
containertypes "github.com/moby/moby/api/types/container"
"github.com/opencontainers/runtime-spec/specs-go"

0
oci/caps/defaults.go → daemon/pkg/oci/caps/defaults.go
View File

0
oci/caps/utils.go → daemon/pkg/oci/caps/utils.go
View File

0
oci/caps/utils_linux.go → daemon/pkg/oci/caps/utils_linux.go
View File

0
oci/caps/utils_other.go → daemon/pkg/oci/caps/utils_other.go
View File

2
oci/defaults.go → daemon/pkg/oci/defaults.go
View File

@@ -9,8 +9,8 @@ import (
"runtime"
"sync"
"github.com/docker/docker/daemon/pkg/oci/caps"
"github.com/docker/docker/internal/platform"
"github.com/docker/docker/oci/caps"
"github.com/opencontainers/runtime-spec/specs-go"
)

0
oci/devices_linux.go → daemon/pkg/oci/devices_linux.go
View File

0
oci/fixtures/default-old-format.json → daemon/pkg/oci/fixtures/default-old-format.json
View File

0
oci/fixtures/default.json → daemon/pkg/oci/fixtures/default.json
View File

0
oci/fixtures/example.json → daemon/pkg/oci/fixtures/example.json
View File

0
oci/fuzz_test.go → daemon/pkg/oci/fuzz_test.go
View File

0
oci/namespaces.go → daemon/pkg/oci/namespaces.go
View File

0
oci/oci.go → daemon/pkg/oci/oci.go
View File

0
oci/oci_test.go → daemon/pkg/oci/oci_test.go
View File

0
oci/seccomp_test.go → daemon/pkg/oci/seccomp_test.go
View File

2
daemon/pkg/plugin/v2/plugin_linux.go
View File

@@ -9,9 +9,9 @@ import (
"runtime"
"strings"
"github.com/docker/docker/daemon/pkg/oci"
"github.com/docker/docker/internal/rootless/mountopts"
"github.com/docker/docker/internal/sliceutil"
"github.com/docker/docker/oci"
"github.com/moby/moby/api/types"
"github.com/moby/sys/userns"
"github.com/opencontainers/runtime-spec/specs-go"

2
daemon/seccomp_linux_test.go
View File

@@ -6,7 +6,7 @@ import (
coci "github.com/containerd/containerd/v2/pkg/oci"
dconfig "github.com/docker/docker/daemon/config"
"github.com/docker/docker/daemon/container"
"github.com/docker/docker/oci"
"github.com/docker/docker/daemon/pkg/oci"
"github.com/docker/docker/pkg/sysinfo"
containertypes "github.com/moby/moby/api/types/container"
"github.com/moby/profiles/seccomp"

2
daemon/start_linux.go
View File

@@ -7,8 +7,8 @@ import (
"github.com/docker/docker/daemon/config"
"github.com/docker/docker/daemon/container"
"github.com/docker/docker/daemon/internal/libcontainerd/types"
"github.com/docker/docker/daemon/pkg/oci"
"github.com/docker/docker/errdefs"
"github.com/docker/docker/oci"
"github.com/opencontainers/runtime-spec/specs-go"
)

2
integration/container/create_test.go
View File

@@ -11,9 +11,9 @@ import (
containerd "github.com/containerd/containerd/v2/client"
cerrdefs "github.com/containerd/errdefs"
"github.com/docker/docker/daemon/pkg/oci"
testContainer "github.com/docker/docker/integration/internal/container"
net "github.com/docker/docker/integration/internal/network"
"github.com/docker/docker/oci"
"github.com/docker/docker/pkg/stringid"
"github.com/docker/docker/testutil"
"github.com/moby/moby/api/types/container"