Skip to content

Commit 8e685f7

Browse files
committed
support building with BUILDTAGS="no_zfs no_aufs"
These plugins do not always need to be built-in. Signed-off-by: Akihiro Suda <akihiro.suda.cz@hco.ntt.co.jp>
1 parent 3fe2281 commit 8e685f7

File tree

3 files changed

+42
-2
lines changed

3 files changed

+42
-2
lines changed
Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
// +build !no_aufs
2+
3+
/*
4+
Copyright The containerd Authors.
5+
6+
Licensed under the Apache License, Version 2.0 (the "License");
7+
you may not use this file except in compliance with the License.
8+
You may obtain a copy of the License at
9+
10+
http://www.apache.org/licenses/LICENSE-2.0
11+
12+
Unless required by applicable law or agreed to in writing, software
13+
distributed under the License is distributed on an "AS IS" BASIS,
14+
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
15+
See the License for the specific language governing permissions and
16+
limitations under the License.
17+
*/
18+
19+
package main
20+
21+
import _ "github.com/containerd/aufs"

cmd/containerd/builtins_linux.go

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,13 +17,11 @@
1717
package main
1818

1919
import (
20-
_ "github.com/containerd/aufs"
2120
_ "github.com/containerd/containerd/metrics/cgroups"
2221
_ "github.com/containerd/containerd/metrics/cgroups/v2"
2322
_ "github.com/containerd/containerd/runtime/v1/linux"
2423
_ "github.com/containerd/containerd/runtime/v2"
2524
_ "github.com/containerd/containerd/runtime/v2/runc/options"
2625
_ "github.com/containerd/containerd/snapshots/native"
2726
_ "github.com/containerd/containerd/snapshots/overlay"
28-
_ "github.com/containerd/zfs"
2927
)
Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
// +build !no_zfs
2+
3+
/*
4+
Copyright The containerd Authors.
5+
6+
Licensed under the Apache License, Version 2.0 (the "License");
7+
you may not use this file except in compliance with the License.
8+
You may obtain a copy of the License at
9+
10+
http://www.apache.org/licenses/LICENSE-2.0
11+
12+
Unless required by applicable law or agreed to in writing, software
13+
distributed under the License is distributed on an "AS IS" BASIS,
14+
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
15+
See the License for the specific language governing permissions and
16+
limitations under the License.
17+
*/
18+
19+
package main
20+
21+
import _ "github.com/containerd/zfs"

0 commit comments

Comments
 (0)