File tree 1 file changed +7
-2
lines changed
1 file changed +7
-2
lines changed Original file line number Diff line number Diff line change @@ -30,18 +30,23 @@ def get_cpu_setting(host)
30
30
end
31
31
32
32
Vagrant . configure ( 2 ) do |config |
33
- override . vm . box = "ubuntu/trusty64"
34
33
config . vm . synced_folder "." , "/vagrant"
35
34
config . vm . define "docker-raspbian" do |config |
36
35
config . vm . hostname = "docker-raspbian"
37
36
config . ssh . forward_agent = true
38
37
config . vm . provision "shell" , path : "scripts/provision.sh" , privileged : false
39
- config . vm . provider "virtualbox" do |vb |
38
+ config . vm . provider "virtualbox" do |vb , override |
39
+ override . vm . box = "ubuntu/trusty64"
40
40
# find out on which host os we are running
41
41
host = RbConfig ::CONFIG [ 'host_os' ]
42
42
vb . customize [ "modifyvm" , :id , "--ioapic" , "on" ]
43
43
vb . memory = get_memory_setting ( host )
44
44
vb . cpus = get_cpu_setting ( host )
45
45
end
46
+ config . vm . provider "docker" do |docker |
47
+ docker . image = "tknerr/baseimage-ubuntu:14.04"
48
+ docker . has_ssh = true
49
+ docker . remains_running = false
50
+ end
46
51
end
47
52
end
You can’t perform that action at this time.
0 commit comments