From cdf7c6a1a786e4148420562b1a8bd887dfe52ef0 Mon Sep 17 00:00:00 2001 From: Vincent Batts Date: Thu, 13 Mar 2014 15:10:35 -0400 Subject: [PATCH 1/4] btrfs: build tags Default to the same build behavior, but allow a go build tag to disable building of the btrfs graphdriver go build -tags no_btrfs' ... $ go build $ objdump -S docker | grep btrfs | wc -l 194 $ go build -tags no_btrfs $ objdump -S docker | grep btrfs | wc -l 1 # that is a comment ;-) Docker-DCO-1.1-Signed-off-by: Vincent Batts (github: vbatts) Upstream-commit: 85a62d9b779bfb351e159f38c2fc95900a0532cd Component: engine --- components/engine/runtime/runtime.go | 1 - components/engine/runtime/runtime_btfs.go | 7 +++++++ 2 files changed, 7 insertions(+), 1 deletion(-) create mode 100644 components/engine/runtime/runtime_btfs.go diff --git a/components/engine/runtime/runtime.go b/components/engine/runtime/runtime.go index 43230488a2..4408e13902 100644 --- a/components/engine/runtime/runtime.go +++ b/components/engine/runtime/runtime.go @@ -16,7 +16,6 @@ import ( "github.com/dotcloud/docker/runtime/execdriver/execdrivers" "github.com/dotcloud/docker/runtime/execdriver/lxc" "github.com/dotcloud/docker/runtime/graphdriver" - _ "github.com/dotcloud/docker/runtime/graphdriver/btrfs" _ "github.com/dotcloud/docker/runtime/graphdriver/vfs" _ "github.com/dotcloud/docker/runtime/networkdriver/lxc" "github.com/dotcloud/docker/runtime/networkdriver/portallocator" diff --git a/components/engine/runtime/runtime_btfs.go b/components/engine/runtime/runtime_btfs.go new file mode 100644 index 0000000000..5e941386c3 --- /dev/null +++ b/components/engine/runtime/runtime_btfs.go @@ -0,0 +1,7 @@ +// +build !no_btrfs + +package runtime + +import ( + _ "github.com/dotcloud/docker/runtime/graphdriver/btrfs" +) From 856d46eee02bcc1eda5582c312b2c07cd5a90a6f Mon Sep 17 00:00:00 2001 From: Vincent Batts Date: Thu, 13 Mar 2014 17:38:54 -0400 Subject: [PATCH 2/4] btrfs: build tags correct filename and make the tag more readable Docker-DCO-1.1-Signed-off-by: Vincent Batts (github: vbatts) Upstream-commit: 5cfea26bcfc218ca72eac7115fa257833f28b9f2 Component: engine --- components/engine/runtime/{runtime_btfs.go => runtime_btrfs.go} | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) rename components/engine/runtime/{runtime_btfs.go => runtime_btrfs.go} (70%) diff --git a/components/engine/runtime/runtime_btfs.go b/components/engine/runtime/runtime_btrfs.go similarity index 70% rename from components/engine/runtime/runtime_btfs.go rename to components/engine/runtime/runtime_btrfs.go index 5e941386c3..c59b103ff9 100644 --- a/components/engine/runtime/runtime_btfs.go +++ b/components/engine/runtime/runtime_btrfs.go @@ -1,4 +1,4 @@ -// +build !no_btrfs +// +build !exclude_graphdriver_btrfs package runtime From 7a2dc6bc24eb6f9a9776c25937c4249e92d9b243 Mon Sep 17 00:00:00 2001 From: Vincent Batts Date: Thu, 13 Mar 2014 17:39:25 -0400 Subject: [PATCH 3/4] packagers: btrfs build tag docs Docker-DCO-1.1-Signed-off-by: Vincent Batts (github: vbatts) Upstream-commit: 29c45e7f4fc616290e416f1b541e1739820af60c Component: engine --- components/engine/hack/PACKAGERS.md | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/components/engine/hack/PACKAGERS.md b/components/engine/hack/PACKAGERS.md index 5afa381005..297d1500db 100644 --- a/components/engine/hack/PACKAGERS.md +++ b/components/engine/hack/PACKAGERS.md @@ -160,15 +160,23 @@ export DOCKER_BUILDTAGS='apparmor' There are build tags for disabling graphdrivers as well. By default, support for all graphdrivers are built in. -To disable devicemapper +To disable btrfs: +```bash +export DOCKER_BUILDTAGS='exclude_graphdriver_btrfs' +``` + +To disable devicemapper: ```bash export DOCKER_BUILDTAGS='exclude_graphdriver_devicemapper' ``` -To disable aufs + +To disable aufs: ```bash export DOCKER_BUILDTAGS='exclude_graphdriver_aufs' ``` +NOTE: if you need to set more than one build tag, space seperate them. + ### Static Daemon If it is feasible within the constraints of your distribution, you should From e8fa51d05ea4e68013c0001d5ca8f61111daf666 Mon Sep 17 00:00:00 2001 From: Vincent Batts Date: Fri, 14 Mar 2014 04:19:05 +0000 Subject: [PATCH 4/4] typo Docker-DCO-1.1-Signed-off-by: Vincent Batts (github: vbatts) Upstream-commit: c76def2dd23cf90fdc80224f08530205b6dcba73 Component: engine --- components/engine/hack/PACKAGERS.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/components/engine/hack/PACKAGERS.md b/components/engine/hack/PACKAGERS.md index 297d1500db..47e8413bf3 100644 --- a/components/engine/hack/PACKAGERS.md +++ b/components/engine/hack/PACKAGERS.md @@ -175,7 +175,7 @@ To disable aufs: export DOCKER_BUILDTAGS='exclude_graphdriver_aufs' ``` -NOTE: if you need to set more than one build tag, space seperate them. +NOTE: if you need to set more than one build tag, space separate them. ### Static Daemon