Merge release-20201216.0-94-ge74aa25e2 (automated)

1 files changed, 24 insertions, 0 deletions

diff --git a/shim/main.go b/shim/main.go
new file mode 100644
index 000000000..b87a20d08
--- /dev/null
+++ b/shim/main.go
@@ -0,0 +1,24 @@
+// Copyright 2020 The gVisor 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
+//
+//     https://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.
+
+// Binary containerd-shim-runsc-v1 is the v2 containerd shim (implementing the formal v1 API).
+package main
+
+import (
+	"gvisor.dev/gvisor/shim/cli"
+)
+
+func main() {
+	cli.Main()
+}