diff options
author | Andreas Antener <antener_a@gmx.ch> | 2015-01-21 00:01:55 +0100 |
---|---|---|
committer | Andreas Antener <antener_a@gmx.ch> | 2015-01-24 12:39:14 +0100 |
commit | 05589e40dfb39e83681ac909545d20bdb96ca773 (patch) | |
tree | 212877072012a94a8e6ffaddb72adf71bb750b4b | |
parent | 2d65e8cb3b792ae55c953df87fc429cdde2972b5 (diff) | |
download | px4-firmware-05589e40dfb39e83681ac909545d20bdb96ca773.tar.gz px4-firmware-05589e40dfb39e83681ac909545d20bdb96ca773.tar.bz2 px4-firmware-05589e40dfb39e83681ac909545d20bdb96ca773.zip |
updated docker instrumentalization and info
-rw-r--r-- | Tools/ros/vagrant/px4-ros-sitl/Vagrantfile | 33 |
1 files changed, 31 insertions, 2 deletions
diff --git a/Tools/ros/vagrant/px4-ros-sitl/Vagrantfile b/Tools/ros/vagrant/px4-ros-sitl/Vagrantfile index 5357ce94d..5edf8f0ac 100644 --- a/Tools/ros/vagrant/px4-ros-sitl/Vagrantfile +++ b/Tools/ros/vagrant/px4-ros-sitl/Vagrantfile @@ -1,6 +1,14 @@ # -*- mode: ruby -*- # vi: set ft=ruby : +# +# Boot docker SITL environment +# +# Build (first time up): +# Use the "--no-parallel" option so the containers will be built in order. +# e.g.: "vagrant up --no-parallel" +# + Vagrant.configure(2) do |config| # Configure docker host config.vm.provider "docker" do |d| @@ -9,10 +17,31 @@ Vagrant.configure(2) do |config| end # Configure docker apps to run + 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.build_args = ["-t=px4ros/ros-base:no-drcsim"] + + # share docker host x11 socket + d.volumes = ["/tmp/.X11-unix:/tmp/.X11-unix:ro"] + # TODO: get display number from host system + d.env = { + "DISPLAY" => ":0" + } + + d.cmd = ["echo", "Base image done"] + d.remains_running = false + end + end + config.vm.define "gazebo" do |app| app.vm.provider "docker" do |d| d.name = "gazebo" - d.image = "px4ros/ros-sitl:no-drcsim" + #d.image = "px4ros/ros-sitl" + d.build_dir = "../../docker/px4-ros/px4-ros-sitl" + d.build_args = ["-t=px4ros/ros-sitl:no-drcsim"] # share docker host x11 socket d.volumes = ["/tmp/.X11-unix:/tmp/.X11-unix:ro"] @@ -21,7 +50,7 @@ Vagrant.configure(2) do |config| "DISPLAY" => ":0" } - d.cmd = ["xterm"] + d.cmd = ["gazebo"] end end end |