Skip to content

Commit 1e8b09c

Browse files
dmcgowandmcgowan
authored
Merge pull request #2353 from ehazlett/process-runtime
linux -> runtime/linux
2 parents c7083ee + 6653917 commit 1e8b09c

53 files changed

Lines changed: 237 additions & 194 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎Protobuild.toml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ plugins = ["fieldpath"] # disable grpc for this package
3737

3838
[[overrides]]
3939
# enable ttrpc and disable fieldpath and grpc for the shim
40-
prefixes = ["github.com/containerd/containerd/linux/shim/v1"]
40+
prefixes = ["github.com/containerd/containerd/runtime/linux/shim/v1"]
4141
plugins = ["ttrpc"]
4242

4343
# Aggregrate the API descriptors to lock down API changes.
@@ -51,8 +51,8 @@ ignore_files = [
5151

5252
# Lock down runc config
5353
[[descriptors]]
54-
prefix = "github.com/containerd/containerd/linux/runctypes"
55-
target = "linux/runctypes/next.pb.txt"
54+
prefix = "github.com/containerd/containerd/runtime/linux/runctypes"
55+
target = "runtime/linux/runctypes/next.pb.txt"
5656
ignore_files = [
5757
"google/protobuf/descriptor.proto",
5858
"gogoproto/gogo.proto"

‎cmd/containerd-shim/main_unix.go‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -35,10 +35,10 @@ import (
3535
"time"
3636

3737
"github.com/containerd/containerd/events"
38-
"github.com/containerd/containerd/linux/proc"
39-
"github.com/containerd/containerd/linux/shim"
40-
shimapi "github.com/containerd/containerd/linux/shim/v1"
4138
"github.com/containerd/containerd/namespaces"
39+
"github.com/containerd/containerd/runtime/linux/proc"
40+
"github.com/containerd/containerd/runtime/linux/shim"
41+
shimapi "github.com/containerd/containerd/runtime/linux/shim/v1"
4242
"github.com/containerd/typeurl"
4343
ptypes "github.com/gogo/protobuf/types"
4444
"github.com/pkg/errors"

‎cmd/containerd-shim/shim_darwin.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ import (
2222
"os"
2323
"os/signal"
2424

25-
"github.com/containerd/containerd/linux/shim"
25+
"github.com/containerd/containerd/runtime/linux/shim"
2626
runc "github.com/containerd/go-runc"
2727
"github.com/stevvooe/ttrpc"
2828
)

‎cmd/containerd-shim/shim_linux.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ import (
2020
"os"
2121
"os/signal"
2222

23-
"github.com/containerd/containerd/linux/shim"
23+
"github.com/containerd/containerd/runtime/linux/shim"
2424
runc "github.com/containerd/go-runc"
2525
"github.com/opencontainers/runc/libcontainer/system"
2626
"github.com/stevvooe/ttrpc"

‎cmd/containerd-shim/shim_unix.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ import (
2222
"os"
2323
"os/signal"
2424

25-
"github.com/containerd/containerd/linux/shim"
25+
"github.com/containerd/containerd/runtime/linux/shim"
2626
runc "github.com/containerd/go-runc"
2727
"github.com/stevvooe/ttrpc"
2828
)

‎cmd/containerd/builtins_linux.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@ package main
1818

1919
import (
2020
_ "github.com/containerd/aufs"
21-
_ "github.com/containerd/containerd/linux"
2221
_ "github.com/containerd/containerd/metrics/cgroups"
22+
_ "github.com/containerd/containerd/runtime/linux"
2323
_ "github.com/containerd/containerd/snapshots/native"
2424
_ "github.com/containerd/containerd/snapshots/overlay"
2525
_ "github.com/containerd/zfs"

‎cmd/ctr/commands/shim/shim.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ import (
2626

2727
"github.com/containerd/console"
2828
"github.com/containerd/containerd/cmd/ctr/commands"
29-
shim "github.com/containerd/containerd/linux/shim/v1"
29+
shim "github.com/containerd/containerd/runtime/linux/shim/v1"
3030
"github.com/containerd/typeurl"
3131
ptypes "github.com/gogo/protobuf/types"
3232
"github.com/opencontainers/runtime-spec/specs-go"

‎container_linux_test.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,8 +35,8 @@ import (
3535
"github.com/containerd/containerd/cio"
3636
"github.com/containerd/containerd/containers"
3737
"github.com/containerd/containerd/errdefs"
38-
"github.com/containerd/containerd/linux/runctypes"
3938
"github.com/containerd/containerd/oci"
39+
"github.com/containerd/containerd/runtime/linux/runctypes"
4040
specs "github.com/opencontainers/runtime-spec/specs-go"
4141
"github.com/pkg/errors"
4242
"golang.org/x/sys/unix"

‎container_opts_unix.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,9 +31,9 @@ import (
3131
"github.com/containerd/containerd/content"
3232
"github.com/containerd/containerd/errdefs"
3333
"github.com/containerd/containerd/images"
34-
"github.com/containerd/containerd/linux/runctypes"
3534
"github.com/containerd/containerd/mount"
3635
"github.com/containerd/containerd/platforms"
36+
"github.com/containerd/containerd/runtime/linux/runctypes"
3737
"github.com/gogo/protobuf/proto"
3838
protobuf "github.com/gogo/protobuf/types"
3939
digest "github.com/opencontainers/go-digest"

‎metrics/cgroups/cgroups.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,12 +24,12 @@ import (
2424
"github.com/containerd/cgroups"
2525
eventstypes "github.com/containerd/containerd/api/events"
2626
"github.com/containerd/containerd/events"
27-
"github.com/containerd/containerd/linux"
2827
"github.com/containerd/containerd/log"
2928
"github.com/containerd/containerd/namespaces"
3029
"github.com/containerd/containerd/platforms"
3130
"github.com/containerd/containerd/plugin"
3231
"github.com/containerd/containerd/runtime"
32+
"github.com/containerd/containerd/runtime/linux"
3333
metrics "github.com/docker/go-metrics"
3434
"github.com/sirupsen/logrus"
3535
)

0 commit comments

Comments
 (0)