updated setup, added maintainer

This commit is contained in:
Andreas Antener
2015-01-24 12:39:15 +01:00
parent 6db56b8df0
commit 6ab1f21680
5 changed files with 14 additions and 9 deletions
+2
View File
@@ -4,6 +4,8 @@
#
# Vagrantfile to create docker-host-base
#
# Maintainer: Andreas Antener <andreas@uaventure.com>
#
# After build, do "vagrant package --base docker-host-base" to package,
# and import as box: "vagrant box add --name docker-host-base package.box"
#
+2
View File
@@ -4,6 +4,8 @@
#
# Actual docker host VM to run.
#
# Maintainer: Andreas Antener <andreas@uaventure.com>
#
Vagrant.configure(2) do |config|
config.vm.box = "docker-host-base"
+5 -3
View File
@@ -4,7 +4,9 @@
#
# Boot docker SITL environment
#
# "vagrant up" will build the images. Should start "xterm" in the end.
# Maintainer: Andreas Antener <andreas@uaventure.com>
#
# "vagrant up" will build the images. Should eventually start "xterm" from within the docker container.
#
# Notes:
# (will change, need proper docs)
@@ -33,8 +35,8 @@ Vagrant.configure(2) do |config|
config.vm.define "ros" do |app|
app.vm.provider "docker" do |d|
d.name = "ros"
#d.image = "px4ros/ros-base:no-drcsim"
d.build_dir = "../../docker/px4-ros"
#d.image = "px4ros/ros-base"
d.build_dir = "../../docker/px4-ros-base"
d.build_args = ["-t=px4ros/ros-base:no-drcsim"]
# Share docker host x11 socket