Merge pull request #2025 from wizardbyron/master

Run docker in vagrant without sudo and won't check locale settings
This commit is contained in:
wing328 2016-02-03 15:52:58 +08:00
commit 76c3d26c65
2 changed files with 3 additions and 1 deletions

View File

@ -121,7 +121,7 @@ cd swagger-codegen
vagrant up
vagrant ssh
cd /vagrant
sudo ./run-in-docker.sh mvn package
./run-in-docker.sh mvn package
```
#### Public Docker image

2
Vagrantfile vendored
View File

@ -23,12 +23,14 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
#Provision
config.vm.provision "shell", inline: <<-SHELL
sudo touch /var/lib/cloud/instance/locale-check.skip
sudo apt-key adv --keyserver hkp://pgp.mit.edu:80 --recv-keys 58118E89F3A912897C070ADBF76221572C52609D
sudo sh -c 'echo "deb https://apt.dockerproject.org/repo ubuntu-trusty main" > /etc/apt/sources.list.d/docker.list'
sudo apt-cache policy docker-engine
sudo apt-get update
sudo apt-get upgrade -y
sudo apt-get install -y docker-engine
sudo usermod -aG docker vagrant
SHELL
end