From 8b0f0b4d11e0938eec8da411323b2ce35976ab56 Mon Sep 17 00:00:00 2001 From: Fabricio Voznika Date: Tue, 12 Jan 2021 17:50:33 -0800 Subject: Delete shim v1 gvisor-containerd-shim is not compatible with containerd 1.1 or earlier. Starting from containerd 1.2, shim v2 is the preferred interface. PiperOrigin-RevId: 351485556 --- shim/cli/BUILD | 16 ++++++++++++++++ shim/cli/cli.go | 28 ++++++++++++++++++++++++++++ 2 files changed, 44 insertions(+) create mode 100644 shim/cli/BUILD create mode 100644 shim/cli/cli.go (limited to 'shim/cli') diff --git a/shim/cli/BUILD b/shim/cli/BUILD new file mode 100644 index 000000000..665dcc5a1 --- /dev/null +++ b/shim/cli/BUILD @@ -0,0 +1,16 @@ +load("//tools:defs.bzl", "go_library") + +package(licenses = ["notice"]) + +go_library( + name = "cli", + srcs = ["cli.go"], + visibility = [ + "//:__pkg__", + "//shim:__pkg__", + ], + deps = [ + "//pkg/shim", + "@com_github_containerd_containerd//runtime/v2/shim:go_default_library", + ], +) diff --git a/shim/cli/cli.go b/shim/cli/cli.go new file mode 100644 index 000000000..068976c79 --- /dev/null +++ b/shim/cli/cli.go @@ -0,0 +1,28 @@ +// Copyright 2018 The containerd Authors. +// Copyright 2019 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. + +// Package cli defines the command line interface for the V2 shim. +package cli + +import ( + containerdshim "github.com/containerd/containerd/runtime/v2/shim" + + "gvisor.dev/gvisor/pkg/shim" +) + +// Main is the main entrypoint. +func Main() { + containerdshim.Run("io.containerd.runsc.v1", shim.New) +} -- cgit v1.2.3