Skip to content

Commit

Permalink
linux -> runtime/linux
Browse files Browse the repository at this point in the history 
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
  • Loading branch information
@ehazlett
ehazlett committed May 30, 2018
1 parent 8d76868 commit cae94b9
Show file tree
Hide file tree
Showing 42 changed files with 182 additions and 148 deletions.
6 changes: 3 additions & 3 deletions Protobuild.toml
View file
Expand Up @@ -37,7 +37,7 @@ plugins = ["fieldpath"] # disable grpc for this package

[[overrides]]
# enable ttrpc and disable fieldpath and grpc for the shim
prefixes = ["github.com/containerd/containerd/linux/shim/v1"]
prefixes = ["github.com/containerd/containerd/runtime/linux/shim/v1"]
plugins = ["ttrpc"]

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

# Lock down runc config
[[descriptors]]
prefix = "github.com/containerd/containerd/linux/runctypes"
target = "linux/runctypes/next.pb.txt"
prefix = "github.com/containerd/containerd/runtime/linux/runctypes"
target = "runtime/linux/runctypes/next.pb.txt"
ignore_files = [
"google/protobuf/descriptor.proto",
"gogoproto/gogo.proto"
Expand Down
6 changes: 3 additions & 3 deletions cmd/containerd-shim/main_unix.go
View file
Expand Up @@ -35,10 +35,10 @@ import (
"time"

"github.com/containerd/containerd/events"
"github.com/containerd/containerd/linux/proc"
"github.com/containerd/containerd/linux/shim"
shimapi "github.com/containerd/containerd/linux/shim/v1"
"github.com/containerd/containerd/namespaces"
"github.com/containerd/containerd/runtime/linux/proc"
"github.com/containerd/containerd/runtime/linux/shim"
shimapi "github.com/containerd/containerd/runtime/linux/shim/v1"
"github.com/containerd/typeurl"
ptypes "github.com/gogo/protobuf/types"
"github.com/pkg/errors"
Expand Down
2 changes: 1 addition & 1 deletion cmd/containerd-shim/shim_darwin.go
View file
Expand Up @@ -22,7 +22,7 @@ import (
"os"
"os/signal"

"github.com/containerd/containerd/linux/shim"
"github.com/containerd/containerd/runtime/linux/shim"
runc "github.com/containerd/go-runc"
"github.com/stevvooe/ttrpc"
)
Expand Down
2 changes: 1 addition & 1 deletion cmd/containerd-shim/shim_linux.go
View file
Expand Up @@ -20,7 +20,7 @@ import (
"os"
"os/signal"

"github.com/containerd/containerd/linux/shim"
"github.com/containerd/containerd/runtime/linux/shim"
runc "github.com/containerd/go-runc"
"github.com/opencontainers/runc/libcontainer/system"
"github.com/stevvooe/ttrpc"
Expand Down
2 changes: 1 addition & 1 deletion cmd/containerd-shim/shim_unix.go
View file
Expand Up @@ -22,7 +22,7 @@ import (
"os"
"os/signal"

"github.com/containerd/containerd/linux/shim"
"github.com/containerd/containerd/runtime/linux/shim"
runc "github.com/containerd/go-runc"
"github.com/stevvooe/ttrpc"
)
Expand Down
2 changes: 1 addition & 1 deletion cmd/containerd/builtins_linux.go
View file
Expand Up @@ -18,8 +18,8 @@ package main

import (
_ "github.com/containerd/aufs"
_ "github.com/containerd/containerd/linux"
_ "github.com/containerd/containerd/metrics/cgroups"
_ "github.com/containerd/containerd/runtime/linux"
_ "github.com/containerd/containerd/snapshots/native"
_ "github.com/containerd/containerd/snapshots/overlay"
_ "github.com/containerd/zfs"
Expand Down
2 changes: 1 addition & 1 deletion cmd/ctr/commands/shim/shim.go
View file
Expand Up @@ -26,7 +26,7 @@ import (

"github.com/containerd/console"
"github.com/containerd/containerd/cmd/ctr/commands"
shim "github.com/containerd/containerd/linux/shim/v1"
shim "github.com/containerd/containerd/runtime/linux/shim/v1"
"github.com/containerd/typeurl"
ptypes "github.com/gogo/protobuf/types"
"github.com/opencontainers/runtime-spec/specs-go"
Expand Down
2 changes: 1 addition & 1 deletion container_linux_test.go
View file
Expand Up @@ -35,8 +35,8 @@ import (
"github.com/containerd/containerd/cio"
"github.com/containerd/containerd/containers"
"github.com/containerd/containerd/errdefs"
"github.com/containerd/containerd/linux/runctypes"
"github.com/containerd/containerd/oci"
"github.com/containerd/containerd/runtime/linux/runctypes"
specs "github.com/opencontainers/runtime-spec/specs-go"
"github.com/pkg/errors"
"golang.org/x/sys/unix"
Expand Down
2 changes: 1 addition & 1 deletion container_opts_unix.go
View file
Expand Up @@ -31,9 +31,9 @@ import (
"github.com/containerd/containerd/content"
"github.com/containerd/containerd/errdefs"
"github.com/containerd/containerd/images"
"github.com/containerd/containerd/linux/runctypes"
"github.com/containerd/containerd/mount"
"github.com/containerd/containerd/platforms"
"github.com/containerd/containerd/runtime/linux/runctypes"
"github.com/gogo/protobuf/proto"
protobuf "github.com/gogo/protobuf/types"
digest "github.com/opencontainers/go-digest"
Expand Down
2 changes: 1 addition & 1 deletion metrics/cgroups/cgroups.go
View file
Expand Up @@ -24,12 +24,12 @@ import (
"github.com/containerd/cgroups"
eventstypes "github.com/containerd/containerd/api/events"
"github.com/containerd/containerd/events"
"github.com/containerd/containerd/linux"
"github.com/containerd/containerd/log"
"github.com/containerd/containerd/namespaces"
"github.com/containerd/containerd/platforms"
"github.com/containerd/containerd/plugin"
"github.com/containerd/containerd/runtime"
"github.com/containerd/containerd/runtime/linux"
metrics "github.com/docker/go-metrics"
"github.com/sirupsen/logrus"
)
Expand Down
6 changes: 3 additions & 3 deletions linux/bundle.go → runtime/linux/bundle.go
View file
Expand Up @@ -25,9 +25,9 @@ import (
"path/filepath"

"github.com/containerd/containerd/events/exchange"
"github.com/containerd/containerd/linux/runctypes"
"github.com/containerd/containerd/linux/shim"
"github.com/containerd/containerd/linux/shim/client"
"github.com/containerd/containerd/runtime/linux/runctypes"
"github.com/containerd/containerd/runtime/linux/shim"
"github.com/containerd/containerd/runtime/linux/shim/client"
"github.com/pkg/errors"
)

Expand Down
0 linux/proc/deleted_state.go → runtime/linux/proc/deleted_state.go
View file
File renamed without changes.
0 linux/proc/exec.go → runtime/linux/proc/exec.go
View file
File renamed without changes.
0 linux/proc/exec_state.go → runtime/linux/proc/exec_state.go
View file
File renamed without changes.
2 changes: 1 addition & 1 deletion linux/proc/init.go → runtime/linux/proc/init.go
View file
Expand Up @@ -31,9 +31,9 @@ import (
"time"

"github.com/containerd/console"
"github.com/containerd/containerd/linux/runctypes"
"github.com/containerd/containerd/log"
"github.com/containerd/containerd/mount"
"github.com/containerd/containerd/runtime/linux/runctypes"
"github.com/containerd/fifo"
runc "github.com/containerd/go-runc"
"github.com/containerd/typeurl"
Expand Down
0 linux/proc/init_state.go → runtime/linux/proc/init_state.go
View file
File renamed without changes.
0 linux/proc/io.go → runtime/linux/proc/io.go
View file
File renamed without changes.
0 linux/proc/process.go → runtime/linux/proc/process.go
View file
File renamed without changes.
0 linux/proc/types.go → runtime/linux/proc/types.go
View file
File renamed without changes.
0 linux/proc/utils.go → runtime/linux/proc/utils.go
View file
File renamed without changes.
2 changes: 1 addition & 1 deletion linux/process.go → runtime/linux/process.go
View file
Expand Up @@ -24,8 +24,8 @@ import (
eventstypes "github.com/containerd/containerd/api/events"
"github.com/containerd/containerd/api/types/task"
"github.com/containerd/containerd/errdefs"
shim "github.com/containerd/containerd/linux/shim/v1"
"github.com/containerd/containerd/runtime"
shim "github.com/containerd/containerd/runtime/linux/shim/v1"
"github.com/pkg/errors"
"github.com/stevvooe/ttrpc"
)
Expand Down
0 linux/runctypes/1.0.pb.txt → runtime/linux/runctypes/1.0.pb.txt
View file
File renamed without changes.
17 changes: 17 additions & 0 deletions runtime/linux/runctypes/doc.go
View file
@@ -0,0 +1,17 @@
/*
Copyright The containerd Authors.
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
*/

package runctypes
4 changes: 2 additions & 2 deletions linux/runctypes/next.pb.txt → runtime/linux/runctypes/next.pb.txt
View file
@@ -1,5 +1,5 @@
file {
name: "github.com/containerd/containerd/linux/runctypes/runc.proto"
name: "github.com/containerd/containerd/runtime/linux/runctypes/runc.proto"
package: "containerd.linux.runc"
dependency: "gogoproto/gogo.proto"
message_type {
Expand Down Expand Up @@ -176,7 +176,7 @@ file {
}
}
options {
go_package: "github.com/containerd/containerd/linux/runctypes;runctypes"
go_package: "github.com/containerd/containerd/runtime/linux/runctypes;runctypes"
}
weak_dependency: 0
syntax: "proto3"
Expand Down
72 changes: 36 additions & 36 deletions linux/runctypes/runc.pb.go → runtime/linux/runctypes/runc.pb.go
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion linux/runctypes/runc.proto → runtime/linux/runctypes/runc.proto
View file
Expand Up @@ -4,7 +4,7 @@ package containerd.linux.runc;

import weak "gogoproto/gogo.proto";

option go_package = "github.com/containerd/containerd/linux/runctypes;runctypes";
option go_package = "github.com/containerd/containerd/runtime/linux/runctypes;runctypes";

message RuncOptions {
string runtime = 1;
Expand Down
6 changes: 3 additions & 3 deletions linux/runtime.go → runtime/linux/runtime.go
View file
Expand Up @@ -33,16 +33,16 @@ import (
"github.com/containerd/containerd/errdefs"
"github.com/containerd/containerd/events/exchange"
"github.com/containerd/containerd/identifiers"
"github.com/containerd/containerd/linux/proc"
"github.com/containerd/containerd/linux/runctypes"
shim "github.com/containerd/containerd/linux/shim/v1"
"github.com/containerd/containerd/log"
"github.com/containerd/containerd/metadata"
"github.com/containerd/containerd/mount"
"github.com/containerd/containerd/namespaces"
"github.com/containerd/containerd/platforms"
"github.com/containerd/containerd/plugin"
"github.com/containerd/containerd/runtime"
"github.com/containerd/containerd/runtime/linux/proc"
"github.com/containerd/containerd/runtime/linux/runctypes"
shim "github.com/containerd/containerd/runtime/linux/shim/v1"
runc "github.com/containerd/go-runc"
"github.com/containerd/typeurl"
ptypes "github.com/gogo/protobuf/types"
Expand Down
4 changes: 2 additions & 2 deletions linux/shim/client/client.go → runtime/linux/shim/client/client.go
View file
Expand Up @@ -36,9 +36,9 @@ import (
"github.com/stevvooe/ttrpc"

"github.com/containerd/containerd/events"
"github.com/containerd/containerd/linux/shim"
shimapi "github.com/containerd/containerd/linux/shim/v1"
"github.com/containerd/containerd/log"
"github.com/containerd/containerd/runtime/linux/shim"
shimapi "github.com/containerd/containerd/runtime/linux/shim/v1"
"github.com/containerd/containerd/sys"
ptypes "github.com/gogo/protobuf/types"
)
Expand Down
0 linux/shim/client/client_linux.go → runtime/linux/shim/client/client_linux.go
View file
File renamed without changes.
0 linux/shim/client/client_unix.go → runtime/linux/shim/client/client_unix.go
View file
File renamed without changes.
2 changes: 1 addition & 1 deletion linux/shim/local.go → runtime/linux/shim/local.go
View file
Expand Up @@ -22,8 +22,8 @@ import (
"context"
"path/filepath"

shimapi "github.com/containerd/containerd/linux/shim/v1"
"github.com/containerd/containerd/mount"
shimapi "github.com/containerd/containerd/runtime/linux/shim/v1"
ptypes "github.com/gogo/protobuf/types"
)

Expand Down
0 linux/shim/reaper.go → runtime/linux/shim/reaper.go
View file
File renamed without changes.
6 changes: 3 additions & 3 deletions linux/shim/service.go → runtime/linux/shim/service.go
View file
Expand Up @@ -29,12 +29,12 @@ import (
"github.com/containerd/containerd/api/types/task"
"github.com/containerd/containerd/errdefs"
"github.com/containerd/containerd/events"
"github.com/containerd/containerd/linux/proc"
"github.com/containerd/containerd/linux/runctypes"
shimapi "github.com/containerd/containerd/linux/shim/v1"
"github.com/containerd/containerd/log"
"github.com/containerd/containerd/namespaces"
"github.com/containerd/containerd/runtime"
"github.com/containerd/containerd/runtime/linux/proc"
"github.com/containerd/containerd/runtime/linux/runctypes"
shimapi "github.com/containerd/containerd/runtime/linux/shim/v1"
runc "github.com/containerd/go-runc"
"github.com/containerd/typeurl"
ptypes "github.com/gogo/protobuf/types"
Expand Down
0 linux/shim/service_linux.go → runtime/linux/shim/service_linux.go
View file
File renamed without changes.
0 linux/shim/service_unix.go → runtime/linux/shim/service_unix.go
View file
File renamed without changes.
17 changes: 17 additions & 0 deletions runtime/linux/shim/v1/doc.go
View file
@@ -0,0 +1,17 @@
/*
Copyright The containerd Authors.
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
*/

package shim

0 comments on commit cae94b9

Please sign in to comment.