From 28815bb149ee5ca98630d081c95cb5737ede62a0 Mon Sep 17 00:00:00 2001 From: Akihiro Suda Date: Tue, 28 Jun 2016 06:10:54 +0000 Subject: [PATCH 1/3] update storagedriver/zfs-driver.md for Ubuntu 16.04 LTS Signed-off-by: Akihiro Suda Upstream-commit: ddf9b6f6666d501bc408bdf8cdc4feb10db287ed Component: engine --- .../userguide/storagedriver/zfs-driver.md | 21 +++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/components/engine/docs/userguide/storagedriver/zfs-driver.md b/components/engine/docs/userguide/storagedriver/zfs-driver.md index 0d29f128ab..87d2472240 100644 --- a/components/engine/docs/userguide/storagedriver/zfs-driver.md +++ b/components/engine/docs/userguide/storagedriver/zfs-driver.md @@ -129,6 +129,27 @@ Stop the Docker daemon. Then, ensure that you have a spare block device at `/dev/xvdb`. The device identifier may be be different in your environment and you should substitute your own values throughout the procedure. +### Install Zfs on Ubuntu 16.04 LTS + +1. If it is running, stop the Docker `daemon`. + +2. Install the `zfs` package. + + $ sudo apt-get install -y zfs + Reading package lists... Done + Building dependency tree + + +3. Verify that the `zfs` module is loaded correctly. + + $ lsmod | grep zfs + zfs 2813952 3 + zunicode 331776 1 zfs + zcommon 57344 1 zfs + znvpair 90112 2 zfs,zcommon + spl 102400 3 zfs,zcommon,znvpair + zavl 16384 1 zfs + ### Install Zfs on Ubuntu 14.04 LTS 1. If it is running, stop the Docker `daemon`. From 9de77e3319eba9004e09b12dbec80d734eb550c5 Mon Sep 17 00:00:00 2001 From: danf Date: Tue, 28 Jun 2016 11:09:39 +0300 Subject: [PATCH 2/3] Fix Malformed history layer - missing Sprintf in append of shell in Builder run config Signed-off-by: Dan Feldman Upstream-commit: 29b6a696604d5bc80d1722e3ba123558bce7c7c9 Component: engine --- components/engine/builder/dockerfile/internals.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/components/engine/builder/dockerfile/internals.go b/components/engine/builder/dockerfile/internals.go index c9fcb15f54..a5a46e538a 100644 --- a/components/engine/builder/dockerfile/internals.go +++ b/components/engine/builder/dockerfile/internals.go @@ -172,7 +172,7 @@ func (b *Builder) runContextCommand(args []string, allowRemote bool, allowLocalD } cmd := b.runConfig.Cmd - b.runConfig.Cmd = strslice.StrSlice(append(getShell(b.runConfig), "#(nop) %s %s in %s ", cmdName, srcHash, dest)) + b.runConfig.Cmd = strslice.StrSlice(append(getShell(b.runConfig), fmt.Sprintf("#(nop) %s %s in %s ", cmdName, srcHash, dest))) defer func(cmd strslice.StrSlice) { b.runConfig.Cmd = cmd }(cmd) if hit, err := b.probeCache(); err != nil { From 9d3ea6e1c505a93182821022db45bd718ff170b2 Mon Sep 17 00:00:00 2001 From: Brian Goff Date: Tue, 28 Jun 2016 13:42:38 -0400 Subject: [PATCH 3/3] Add ip_vs to check-config script Signed-off-by: Brian Goff Upstream-commit: 9e14002cedd21d6eedd86ea2a536f1137f88921d Component: engine --- components/engine/contrib/check-config.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/components/engine/contrib/check-config.sh b/components/engine/contrib/check-config.sh index c71c81930e..8279639090 100755 --- a/components/engine/contrib/check-config.sh +++ b/components/engine/contrib/check-config.sh @@ -232,6 +232,7 @@ flags=( CGROUP_HUGETLB NET_CLS_CGROUP $netprio CFS_BANDWIDTH FAIR_GROUP_SCHED RT_GROUP_SCHED + IP_VS ) check_flags "${flags[@]}"