mirror of https://github.com/docker/docs.git
testing|stabilization, issue 973: Use docker-golang PPA and lts-raring kernel
This commit is contained in:
parent
a11fc9f067
commit
af2a92f22b
|
@ -19,9 +19,10 @@ Vagrant::Config.run do |config|
|
||||||
config.vm.share_folder "v-data", DOCKER_PATH, "#{File.dirname(__FILE__)}/.."
|
config.vm.share_folder "v-data", DOCKER_PATH, "#{File.dirname(__FILE__)}/.."
|
||||||
config.vm.network :hostonly, BUILDBOT_IP
|
config.vm.network :hostonly, BUILDBOT_IP
|
||||||
|
|
||||||
|
|
||||||
# Deploy buildbot and its dependencies if it was not done
|
# Deploy buildbot and its dependencies if it was not done
|
||||||
if Dir.glob("#{File.dirname(__FILE__)}/.vagrant/machines/default/*/id").empty?
|
if Dir.glob("#{File.dirname(__FILE__)}/.vagrant/machines/default/*/id").empty?
|
||||||
pkg_cmd = "apt-get update -qq; apt-get install -q -y linux-image-3.8.0-19-generic; "
|
pkg_cmd = "apt-get update -qq; apt-get install -q -y linux-image-generic-lts-raring; "
|
||||||
# Deploy buildbot CI
|
# Deploy buildbot CI
|
||||||
pkg_cmd << "apt-get install -q -y python-dev python-pip supervisor; " \
|
pkg_cmd << "apt-get install -q -y python-dev python-pip supervisor; " \
|
||||||
"pip install -r #{CFG_PATH}/requirements.txt; " \
|
"pip install -r #{CFG_PATH}/requirements.txt; " \
|
||||||
|
@ -29,7 +30,7 @@ Vagrant::Config.run do |config|
|
||||||
"#{CFG_PATH}/setup.sh #{USER} #{CFG_PATH}; "
|
"#{CFG_PATH}/setup.sh #{USER} #{CFG_PATH}; "
|
||||||
# Install docker dependencies
|
# Install docker dependencies
|
||||||
pkg_cmd << "apt-get install -q -y python-software-properties; " \
|
pkg_cmd << "apt-get install -q -y python-software-properties; " \
|
||||||
"add-apt-repository -y ppa:gophers/go/ubuntu; apt-get update -qq; " \
|
"add-apt-repository -y ppa:dotcloud/docker-golang/ubuntu; apt-get update -qq; " \
|
||||||
"DEBIAN_FRONTEND=noninteractive apt-get install -q -y lxc git golang-stable aufs-tools make; "
|
"DEBIAN_FRONTEND=noninteractive apt-get install -q -y lxc git golang-stable aufs-tools make; "
|
||||||
# Activate new kernel
|
# Activate new kernel
|
||||||
pkg_cmd << "shutdown -r +1; "
|
pkg_cmd << "shutdown -r +1; "
|
||||||
|
@ -40,6 +41,7 @@ end
|
||||||
# Providers were added on Vagrant >= 1.1.0
|
# Providers were added on Vagrant >= 1.1.0
|
||||||
Vagrant::VERSION >= "1.1.0" and Vagrant.configure("2") do |config|
|
Vagrant::VERSION >= "1.1.0" and Vagrant.configure("2") do |config|
|
||||||
config.vm.provider :aws do |aws, override|
|
config.vm.provider :aws do |aws, override|
|
||||||
|
aws.tags = { 'Name' => 'docker-ci' }
|
||||||
aws.access_key_id = ENV["AWS_ACCESS_KEY_ID"]
|
aws.access_key_id = ENV["AWS_ACCESS_KEY_ID"]
|
||||||
aws.secret_access_key = ENV["AWS_SECRET_ACCESS_KEY"]
|
aws.secret_access_key = ENV["AWS_SECRET_ACCESS_KEY"]
|
||||||
aws.keypair_name = ENV["AWS_KEYPAIR_NAME"]
|
aws.keypair_name = ENV["AWS_KEYPAIR_NAME"]
|
||||||
|
|
Loading…
Reference in New Issue