Merge pull request #1699 from hashicorp/f-lxc-driver

LXC Support
hashicorp · Oct 25, 2016 · 855fe5f · 855fe5f
2 parents b63c349 + b0c665c
commit 855fe5f
Show file tree

Hide file tree

Showing 18 changed files with 4,297 additions and 2 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -15,7 +15,7 @@ branches:
 
 before_install:  
     - sudo apt-get update
-    - sudo apt-get install -y docker-engine
+    - sudo apt-get install -y docker-engine liblxc1 lxc-dev lxc
     - sudo apt-get install -y qemu
     - ./scripts/install_rkt.sh
     - ./scripts/install_consul.sh

diff --git a/Vagrantfile b/Vagrantfile
@@ -10,7 +10,7 @@ GO_VERSION="1.7.1"
 
 # Install Prereq Packages
 sudo apt-get update
-sudo apt-get install -y build-essential curl git-core mercurial bzr libpcre3-dev pkg-config zip default-jre qemu libc6-dev-i386 silversearcher-ag jq htop vim unzip
+sudo apt-get install -y build-essential curl git-core mercurial bzr libpcre3-dev pkg-config zip default-jre qemu libc6-dev-i386 silversearcher-ag jq htop vim unzip liblxc1 lxc-dev
 
 # Setup go, for development of Nomad
 SRCROOT="/opt/go"