summaryrefslogtreecommitdiffhomepage
path: root/cmd
diff options
context:
space:
mode:
authorLantao Liu <taotaotheripper@gmail.com>2019-01-29 18:51:18 -0800
committerGitHub <noreply@github.com>2019-01-29 18:51:18 -0800
commit35db607dfccd3c03b69f1a42c58cf58ec8259e37 (patch)
treecb299257cc8dc78f90a46af8bec02c750c3f8ed9 /cmd
parentf39907aa5d3d1b4ffb2dc0bb08954da1dea6f0b8 (diff)
Add containerd shim v2 support. (#13)
* Update vendors Signed-off-by: Lantao Liu <lantaol@google.com> * Add containerd shim v2 support. Signed-off-by: Lantao Liu <lantaol@google.com> * Add test and doc for containerd-shim-runsc-v1. Signed-off-by: Lantao Liu <lantaol@google.com> * Address comments.
Diffstat (limited to 'cmd')
-rw-r--r--cmd/containerd-shim-runsc-v1/main.go24
-rw-r--r--cmd/gvisor-containerd-shim/main.go2
2 files changed, 25 insertions, 1 deletions
diff --git a/cmd/containerd-shim-runsc-v1/main.go b/cmd/containerd-shim-runsc-v1/main.go
new file mode 100644
index 000000000..ec73edbd2
--- /dev/null
+++ b/cmd/containerd-shim-runsc-v1/main.go
@@ -0,0 +1,24 @@
+/*
+ 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 main
+
+import (
+ "github.com/containerd/containerd/runtime/v2/shim"
+
+ runsc "github.com/google/gvisor-containerd-shim/pkg/v2"
+)
+
+func main() {
+ shim.Run("io.containerd.runsc.v1", runsc.New)
+}
diff --git a/cmd/gvisor-containerd-shim/main.go b/cmd/gvisor-containerd-shim/main.go
index cdea2d7b1..ea26aa105 100644
--- a/cmd/gvisor-containerd-shim/main.go
+++ b/cmd/gvisor-containerd-shim/main.go
@@ -48,7 +48,7 @@ import (
"golang.org/x/sys/unix"
runsc "github.com/google/gvisor-containerd-shim/pkg/go-runsc"
- "github.com/google/gvisor-containerd-shim/pkg/shim"
+ "github.com/google/gvisor-containerd-shim/pkg/v1/shim"
)
var (