From 6ab1f2168059bb7689548635ab4e746c8f320295 Mon Sep 17 00:00:00 2001 From: Andreas Antener Date: Thu, 22 Jan 2015 21:53:11 +0100 Subject: [PATCH] updated setup, added maintainer --- Tools/ros/docker/{px4-ros => px4-ros-base}/Dockerfile | 11 +++++------ .../scripts/setup-workspace.sh | 0 Tools/ros/vagrant/docker-host-base/Vagrantfile | 2 ++ Tools/ros/vagrant/docker-host/Vagrantfile | 2 ++ Tools/ros/vagrant/px4-ros/Vagrantfile | 8 +++++--- 5 files changed, 14 insertions(+), 9 deletions(-) rename Tools/ros/docker/{px4-ros => px4-ros-base}/Dockerfile (89%) rename Tools/ros/docker/{px4-ros => px4-ros-base}/scripts/setup-workspace.sh (100%) diff --git a/Tools/ros/docker/px4-ros/Dockerfile b/Tools/ros/docker/px4-ros-base/Dockerfile similarity index 89% rename from Tools/ros/docker/px4-ros/Dockerfile rename to Tools/ros/docker/px4-ros-base/Dockerfile index d896c76e7e..a8c3772881 100644 --- a/Tools/ros/docker/px4-ros/Dockerfile +++ b/Tools/ros/docker/px4-ros-base/Dockerfile @@ -1,5 +1,5 @@ # -# Base ROS Indigo +# PX4 ROS base container # # TODO # - use https://github.com/phusion/baseimage-docker as base @@ -8,7 +8,7 @@ # FROM ubuntu:14.04.1 -MAINTAINER Andreas Antener "andreas@uaventure.com" +MAINTAINER Andreas Antener # Install basics ## Use the "noninteractive" debconf frontend @@ -48,14 +48,13 @@ RUN apt-get -y install ros-indigo-octomap-msgs # && apt-get -y install drcsim # Install x11-utils to get xdpyinfo, for X11 display debugging -# mesa-utils provides glxinfo, handy for understanding the 3D support. -#RUN apt-get -y install x11-utils -#RUN apt-get -y install mesa-utils +# mesa-utils provides glxinfo, handy for understanding the 3D support +RUN apt-get -y install x11-utils mesa-utils # Some QT-Apps/Gazebo don't not show controls without this ENV QT_X11_NO_MITSHM 1 -# FIXME: this doesn't work yet when building from vagrant +# FIXME: this doesn't work when building from vagrant COPY scripts/setup-workspace.sh /root/scripts #RUN chmod +x /root/scripts/setup-workspace.sh diff --git a/Tools/ros/docker/px4-ros/scripts/setup-workspace.sh b/Tools/ros/docker/px4-ros-base/scripts/setup-workspace.sh similarity index 100% rename from Tools/ros/docker/px4-ros/scripts/setup-workspace.sh rename to Tools/ros/docker/px4-ros-base/scripts/setup-workspace.sh diff --git a/Tools/ros/vagrant/docker-host-base/Vagrantfile b/Tools/ros/vagrant/docker-host-base/Vagrantfile index 516be528cd..cb66d4a682 100644 --- a/Tools/ros/vagrant/docker-host-base/Vagrantfile +++ b/Tools/ros/vagrant/docker-host-base/Vagrantfile @@ -4,6 +4,8 @@ # # Vagrantfile to create docker-host-base # +# Maintainer: Andreas Antener +# # After build, do "vagrant package --base docker-host-base" to package, # and import as box: "vagrant box add --name docker-host-base package.box" # diff --git a/Tools/ros/vagrant/docker-host/Vagrantfile b/Tools/ros/vagrant/docker-host/Vagrantfile index 42e63567ae..9fd4695dd5 100644 --- a/Tools/ros/vagrant/docker-host/Vagrantfile +++ b/Tools/ros/vagrant/docker-host/Vagrantfile @@ -4,6 +4,8 @@ # # Actual docker host VM to run. # +# Maintainer: Andreas Antener +# Vagrant.configure(2) do |config| config.vm.box = "docker-host-base" diff --git a/Tools/ros/vagrant/px4-ros/Vagrantfile b/Tools/ros/vagrant/px4-ros/Vagrantfile index ffe3a00ea0..7009fd78ac 100644 --- a/Tools/ros/vagrant/px4-ros/Vagrantfile +++ b/Tools/ros/vagrant/px4-ros/Vagrantfile @@ -4,7 +4,9 @@ # # Boot docker SITL environment # -# "vagrant up" will build the images. Should start "xterm" in the end. +# Maintainer: Andreas Antener +# +# "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