524 fix aufs links related warnings
| ... | ... |
@@ -33,7 +33,7 @@ Installation |
| 33 | 33 |
sudo apt-get install python-software-properties |
| 34 | 34 |
sudo add-apt-repository ppa:gophers/go |
| 35 | 35 |
sudo apt-get update |
| 36 |
- sudo apt-get -y install lxc wget bsdtar curl golang-stable git |
|
| 36 |
+ sudo apt-get -y install lxc wget bsdtar curl golang-stable git aufs-tools |
|
| 37 | 37 |
|
| 38 | 38 |
export GOPATH=~/go/ |
| 39 | 39 |
export PATH=$GOPATH/bin:$PATH |
| ... | ... |
@@ -22,7 +22,7 @@ Vagrant::Config.run do |config| |
| 22 | 22 |
pkg_cmd = "touch #{DOCKER_PATH}; "
|
| 23 | 23 |
# Install docker dependencies |
| 24 | 24 |
pkg_cmd << "export DEBIAN_FRONTEND=noninteractive; apt-get -qq update; " \ |
| 25 |
- "apt-get install -q -y lxc bsdtar git golang make linux-image-extra-3.8.0-19-generic; " \ |
|
| 25 |
+ "apt-get install -q -y lxc bsdtar git aufs-tools golang make linux-image-extra-3.8.0-19-generic; " \ |
|
| 26 | 26 |
"chown -R #{USER}.#{USER} #{GOPATH}; " \
|
| 27 | 27 |
"install -m 0664 #{CFG_PATH}/bash_profile /home/#{USER}/.bash_profile"
|
| 28 | 28 |
config.vm.provision :shell, :inline => pkg_cmd |
| ... | ... |
@@ -2,13 +2,18 @@ package docker |
| 2 | 2 |
|
| 3 | 3 |
import ( |
| 4 | 4 |
"fmt" |
| 5 |
+ "github.com/dotcloud/docker/utils" |
|
| 5 | 6 |
"os" |
| 7 |
+ "os/exec" |
|
| 6 | 8 |
"path/filepath" |
| 7 | 9 |
"syscall" |
| 8 | 10 |
"time" |
| 9 | 11 |
) |
| 10 | 12 |
|
| 11 | 13 |
func Unmount(target string) error {
|
| 14 |
+ if err := exec.Command("auplink", target, "flush").Run(); err != nil {
|
|
| 15 |
+ utils.Debugf("[warning]: couldn't run auplink before unmount: %s", err)
|
|
| 16 |
+ } |
|
| 12 | 17 |
if err := syscall.Unmount(target, 0); err != nil {
|
| 13 | 18 |
return err |
| 14 | 19 |
} |
| ... | ... |
@@ -10,7 +10,7 @@ Homepage: http://github.com/dotcloud/docker |
| 10 | 10 |
|
| 11 | 11 |
Package: lxc-docker |
| 12 | 12 |
Architecture: linux-any |
| 13 |
-Depends: ${shlibs:Depends}, ${misc:Depends}, lxc, bsdtar
|
|
| 13 |
+Depends: ${shlibs:Depends}, ${misc:Depends}, lxc, bsdtar, aufs-tools
|
|
| 14 | 14 |
Description: Linux container runtime |
| 15 | 15 |
Docker complements LXC with a high-level API which operates at the process |
| 16 | 16 |
level. It runs unix processes with strong guarantees of isolation and |
| ... | ... |
@@ -8,7 +8,7 @@ Homepage: http://github.com/dotcloud/docker |
| 8 | 8 |
|
| 9 | 9 |
Package: lxc-docker |
| 10 | 10 |
Architecture: linux-any |
| 11 |
-Depends: ${misc:Depends},${shlibs:Depends},lxc,bsdtar
|
|
| 11 |
+Depends: ${misc:Depends},${shlibs:Depends},lxc,bsdtar,aufs-tools
|
|
| 12 | 12 |
Conflicts: docker |
| 13 | 13 |
Description: lxc-docker is a Linux container runtime |
| 14 | 14 |
Docker complements LXC with a high-level API which operates at the process |
| ... | ... |
@@ -30,7 +30,7 @@ Vagrant::Config.run do |config| |
| 30 | 30 |
# Install docker dependencies |
| 31 | 31 |
pkg_cmd << "apt-get install -q -y python-software-properties; " \ |
| 32 | 32 |
"add-apt-repository -y ppa:gophers/go/ubuntu; apt-get update -qq; " \ |
| 33 |
- "DEBIAN_FRONTEND=noninteractive apt-get install -q -y lxc bsdtar git golang-stable make; " |
|
| 33 |
+ "DEBIAN_FRONTEND=noninteractive apt-get install -q -y lxc bsdtar git golang-stable aufs-tools make; " |
|
| 34 | 34 |
# Activate new kernel |
| 35 | 35 |
pkg_cmd << "shutdown -r +1; " |
| 36 | 36 |
config.vm.provision :shell, :inline => pkg_cmd |