From 2f67a62b5b48862948b1ce92aeffbb83c3707ee0 Mon Sep 17 00:00:00 2001 From: unclejack Date: Tue, 4 Jun 2013 21:30:47 +0300 Subject: [PATCH 1/5] run auplink before unmounting aufs --- mount.go | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/mount.go b/mount.go index bb1a40eddb..541c29c13a 100644 --- a/mount.go +++ b/mount.go @@ -2,13 +2,18 @@ package docker import ( "fmt" + "github.com/dotcloud/docker/utils" "os" + "os/exec" "path/filepath" "syscall" "time" ) func Unmount(target string) error { + if err := exec.Command("auplink", target, "flush").Run(); err != nil { + utils.Debugf("[warning]: couldn't run auplink before unmount: %s", err) + } if err := syscall.Unmount(target, 0); err != nil { return err } From e53721ef69b13365c18c9189145ae1fadb931f01 Mon Sep 17 00:00:00 2001 From: unclejack Date: Tue, 4 Jun 2013 21:35:41 +0300 Subject: [PATCH 2/5] add aufs-tools to lxc-docker dependencies --- packaging/debian/control | 2 +- packaging/ubuntu/control | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/packaging/debian/control b/packaging/debian/control index 35a2a28cd1..62a963f59e 100644 --- a/packaging/debian/control +++ b/packaging/debian/control @@ -10,7 +10,7 @@ Homepage: http://github.com/dotcloud/docker Package: lxc-docker Architecture: linux-any -Depends: ${shlibs:Depends}, ${misc:Depends}, lxc, bsdtar +Depends: ${shlibs:Depends}, ${misc:Depends}, lxc, bsdtar, aufs-tools Description: Linux container runtime Docker complements LXC with a high-level API which operates at the process level. It runs unix processes with strong guarantees of isolation and diff --git a/packaging/ubuntu/control b/packaging/ubuntu/control index b0560ebf70..404f38a16d 100644 --- a/packaging/ubuntu/control +++ b/packaging/ubuntu/control @@ -8,7 +8,7 @@ Homepage: http://github.com/dotcloud/docker Package: lxc-docker Architecture: linux-any -Depends: ${misc:Depends},${shlibs:Depends},lxc,bsdtar +Depends: ${misc:Depends},${shlibs:Depends},lxc,bsdtar,aufs-tools Conflicts: docker Description: lxc-docker is a Linux container runtime Docker complements LXC with a high-level API which operates at the process From fb7eaf67d1c01eea28fcbed61d6d8abd8117c965 Mon Sep 17 00:00:00 2001 From: unclejack Date: Fri, 14 Jun 2013 15:07:43 +0300 Subject: [PATCH 3/5] add aufs-tools package to dev env docs page --- docs/sources/contributing/devenvironment.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/sources/contributing/devenvironment.rst b/docs/sources/contributing/devenvironment.rst index 5d937c5a44..ce2ecd41e8 100644 --- a/docs/sources/contributing/devenvironment.rst +++ b/docs/sources/contributing/devenvironment.rst @@ -33,7 +33,7 @@ Installation sudo apt-get install python-software-properties sudo add-apt-repository ppa:gophers/go sudo apt-get update - sudo apt-get -y install lxc wget bsdtar curl golang-stable git + sudo apt-get -y install lxc wget bsdtar curl golang-stable git aufs-tools export GOPATH=~/go/ export PATH=$GOPATH/bin:$PATH From f1d16ea0035ee45341e5d4a143cdce5798847cb5 Mon Sep 17 00:00:00 2001 From: unclejack Date: Fri, 14 Jun 2013 15:09:07 +0300 Subject: [PATCH 4/5] install aufs-tools when setting up the hack vagrant box --- hack/Vagrantfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hack/Vagrantfile b/hack/Vagrantfile index 250731ef47..318f835f4f 100644 --- a/hack/Vagrantfile +++ b/hack/Vagrantfile @@ -22,7 +22,7 @@ Vagrant::Config.run do |config| pkg_cmd = "touch #{DOCKER_PATH}; " # Install docker dependencies pkg_cmd << "export DEBIAN_FRONTEND=noninteractive; apt-get -qq update; " \ - "apt-get install -q -y lxc bsdtar git golang make linux-image-extra-3.8.0-19-generic; " \ + "apt-get install -q -y lxc bsdtar git aufs-tools golang make linux-image-extra-3.8.0-19-generic; " \ "chown -R #{USER}.#{USER} #{GOPATH}; " \ "install -m 0664 #{CFG_PATH}/bash_profile /home/#{USER}/.bash_profile" config.vm.provision :shell, :inline => pkg_cmd From 822abab17e33a0f87ef1d785a9148d3ea11cbb60 Mon Sep 17 00:00:00 2001 From: unclejack Date: Fri, 14 Jun 2013 15:13:27 +0300 Subject: [PATCH 5/5] install aufs-tools when setting up the testing vagrant box --- testing/Vagrantfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/testing/Vagrantfile b/testing/Vagrantfile index 7556b191ac..e304a8d087 100644 --- a/testing/Vagrantfile +++ b/testing/Vagrantfile @@ -30,7 +30,7 @@ Vagrant::Config.run do |config| # Install docker dependencies pkg_cmd << "apt-get install -q -y python-software-properties; " \ "add-apt-repository -y ppa:gophers/go/ubuntu; apt-get update -qq; " \ - "DEBIAN_FRONTEND=noninteractive apt-get install -q -y lxc bsdtar git golang-stable make; " + "DEBIAN_FRONTEND=noninteractive apt-get install -q -y lxc bsdtar git golang-stable aufs-tools make; " # Activate new kernel pkg_cmd << "shutdown -r +1; " config.vm.provision :shell, :inline => pkg_cmd