Skip to content

Commit 4b5dfae

Browse files
jterry75jterry75
committed
Completely remove Windows v2 in-tree shim
Signed-off-by: Justin Terry (VM) <[email protected]>
1 parent 29e56c5 commit 4b5dfae

17 files changed

Lines changed: 1063 additions & 2632 deletions

File tree

‎Makefile‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -194,10 +194,6 @@ bin/containerd-shim-runc-v2: cmd/containerd-shim-runc-v2 FORCE # set !cgo and om
194194
@echo "$(WHALE) bin/containerd-shim-runc-v2"
195195
@CGO_ENABLED=0 go build ${GO_BUILD_FLAGS} -o bin/containerd-shim-runc-v2 ${SHIM_GO_LDFLAGS} ${GO_TAGS} ./cmd/containerd-shim-runc-v2
196196

197-
bin/containerd-shim-runhcs-v1: cmd/containerd-shim-runhcs-v1 FORCE # set !cgo and omit pie for a static shim build: https://github.com/golang/go/issues/17789#issuecomment-258542220
198-
@echo "$(WHALE) bin/containerd-shim-runhcs-v1${BINARY_SUFFIX}"
199-
@CGO_ENABLED=0 go build ${GO_BUILD_FLAGS} -o bin/containerd-shim-runhcs-v1${BINARY_SUFFIX} ${SHIM_GO_LDFLAGS} ${GO_TAGS} ./cmd/containerd-shim-runhcs-v1
200-
201197
binaries: $(BINARIES) ## build binaries
202198
@echo "$(WHALE) $@"
203199

‎Makefile.windows‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@
1616
#Windows specific settings.
1717
WHALE = "+"
1818
ONI = "-"
19-
COMMANDS += containerd-shim-runhcs-v1
2019

2120
BINARY_SUFFIX=".exe"
2221

‎Protobuild.toml‎

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -69,11 +69,3 @@ ignore_files = [
6969
"google/protobuf/descriptor.proto",
7070
"gogoproto/gogo.proto"
7171
]
72-
73-
[[descriptors]]
74-
prefix = "github.com/containerd/containerd/runtime/v2/runhcs/options"
75-
target = "runtime/v2/runhcs/options/next.pb.txt"
76-
ignore_files = [
77-
"google/protobuf/descriptor.proto",
78-
"gogoproto/gogo.proto"
79-
]

‎cmd/containerd-shim-runhcs-v1/main.go‎

Lines changed: 0 additions & 28 deletions
This file was deleted.

‎cmd/ctr/commands/run/run_windows.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,11 +19,11 @@ package run
1919
import (
2020
gocontext "context"
2121

22+
"github.com/Microsoft/hcsshim/cmd/containerd-shim-runhcs-v1/options"
2223
"github.com/containerd/console"
2324
"github.com/containerd/containerd"
2425
"github.com/containerd/containerd/cmd/ctr/commands"
2526
"github.com/containerd/containerd/oci"
26-
"github.com/containerd/containerd/runtime/v2/runhcs/options"
2727
specs "github.com/opencontainers/runtime-spec/specs-go"
2828
"github.com/sirupsen/logrus"
2929
"github.com/urfave/cli"

‎runtime/v2/runhcs/io.go‎

Lines changed: 0 additions & 159 deletions
This file was deleted.

‎runtime/v2/runhcs/options/doc.go‎

Lines changed: 0 additions & 17 deletions
This file was deleted.

‎runtime/v2/runhcs/options/next.pb.txt‎

Lines changed: 0 additions & 83 deletions
This file was deleted.

0 commit comments

Comments
 (0)