Merge pull request #460 from lukewaite/docker-update

Add vagrant user to docker group
fideloper · Apr 7, 2015 · cdfad85 · cdfad85
2 parents e374d5a + dff527c
commit cdfad85
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 2 deletions.
diff --git a/Vagrantfile b/Vagrantfile
@@ -188,8 +188,7 @@ Vagrant.configure("2") do |config|
   # config.vm.provision "shell", path: "#{github_url}/scripts/vim.sh", args: github_url
 
   # Provision Docker
-  # config.vm.provision "shell", path: "#{github_url}/scripts/docker.sh"
-
+  # config.vm.provision "shell", path: "#{github_url}/scripts/docker.sh", args: "permissions"
 
   ####
   # Web Servers

diff --git a/scripts/docker.sh b/scripts/docker.sh
@@ -12,3 +12,13 @@ sudo apt-get update
 # Install Docker
 # -qq implies -y --force-yes
 sudo apt-get install -qq lxc-docker
+
+# Make the vagrant user able to interact with docker without sudo
+if [ ! -z "$1" ]; then
+	if [ "$1" == "permissions" ]; then
+		echo ">>> Adding vagrant user to docker group"
+
+		sudo usermod -a -G docker vagrant
+
+	fi # permissions
+fi # arg check