From 172179ee2ef3bb680ed58b5e7267e0732266e8c4 Mon Sep 17 00:00:00 2001 From: Andreas Antener Date: Thu, 19 Feb 2015 22:01:19 +0100 Subject: removed docker/vagrant stuff, is now in a separate repository --- Tools/ros/docker/px4-ros-full/Dockerfile | 57 -------------------- Tools/ros/docker/px4-ros-full/README.md | 12 ----- .../docker/px4-ros-full/scripts/setup-workspace.sh | 43 --------------- Tools/ros/vagrant/docker-host-base/Vagrantfile | 58 -------------------- .../vagrant/docker-host-base/config/docker-default | 29 ---------- .../ros/vagrant/docker-host-base/config/xsessionrc | 6 --- Tools/ros/vagrant/docker-host/Vagrantfile | 38 -------------- Tools/ros/vagrant/px4-ros/Vagrantfile | 61 ---------------------- 8 files changed, 304 deletions(-) delete mode 100644 Tools/ros/docker/px4-ros-full/Dockerfile delete mode 100644 Tools/ros/docker/px4-ros-full/README.md delete mode 100644 Tools/ros/docker/px4-ros-full/scripts/setup-workspace.sh delete mode 100644 Tools/ros/vagrant/docker-host-base/Vagrantfile delete mode 100644 Tools/ros/vagrant/docker-host-base/config/docker-default delete mode 100644 Tools/ros/vagrant/docker-host-base/config/xsessionrc delete mode 100644 Tools/ros/vagrant/docker-host/Vagrantfile delete mode 100644 Tools/ros/vagrant/px4-ros/Vagrantfile (limited to 'Tools') diff --git a/Tools/ros/docker/px4-ros-full/Dockerfile b/Tools/ros/docker/px4-ros-full/Dockerfile deleted file mode 100644 index 1242b56b5..000000000 --- a/Tools/ros/docker/px4-ros-full/Dockerfile +++ /dev/null @@ -1,57 +0,0 @@ -# -# PX4 full ROS container -# -# License: according to LICENSE.md in the root directory of the PX4 Firmware repository - -FROM ubuntu:14.04.1 -MAINTAINER Andreas Antener - -# Install basics -## Use the "noninteractive" debconf frontend -ENV DEBIAN_FRONTEND noninteractive - -RUN apt-get update \ - && apt-get -y install wget git mercurial - -# Main ROS Setup -# Following http://wiki.ros.org/indigo/Installation/Ubuntu -# Also adding dependencies for gazebo http://gazebosim.org/tutorials?tut=drcsim_install - -## add ROS repositories and keys -## install main ROS pacakges -RUN echo "deb http://packages.ros.org/ros/ubuntu trusty main" > /etc/apt/sources.list.d/ros-latest.list \ - && wget https://raw.githubusercontent.com/ros/rosdistro/master/ros.key -O - | apt-key add - \ - && apt-get update \ - && apt-get -y install ros-indigo-desktop-full - -RUN rosdep init \ - && rosdep update - -## setup environment variables -RUN echo "source /opt/ros/indigo/setup.bash" >> ~/.bashrc - -## get rosinstall -RUN apt-get -y install python-rosinstall - -## additional dependencies -RUN apt-get -y install ros-indigo-octomap-msgs ros-indigo-joy - -## install drcsim -RUN echo "deb http://packages.osrfoundation.org/drc/ubuntu trusty main" > /etc/apt/sources.list.d/drc-latest.list \ - && wget http://packages.osrfoundation.org/drc.key -O - | apt-key add - \ - && apt-get update \ - && 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 mesa-utils - -# Some QT-Apps/Gazebo don't not show controls without this -ENV QT_X11_NO_MITSHM 1 - -# FIXME: this doesn't work when building from vagrant -COPY scripts/setup-workspace.sh /root/scripts/ -RUN chmod +x -R /root/scripts/* -RUN chown -R root:root /root/scripts/* - -CMD ["/usr/bin/xterm"] diff --git a/Tools/ros/docker/px4-ros-full/README.md b/Tools/ros/docker/px4-ros-full/README.md deleted file mode 100644 index af5170c70..000000000 --- a/Tools/ros/docker/px4-ros-full/README.md +++ /dev/null @@ -1,12 +0,0 @@ -# PX4 ROS # - -Full desktop ROS container. - -License: according to LICENSE.md in the root directory of the PX4 Firmware repository - -**TODO:** - -- use https://github.com/phusion/baseimage-docker as base -- add user, best synced with host -- configure ssh to work with vagrant out of the box - diff --git a/Tools/ros/docker/px4-ros-full/scripts/setup-workspace.sh b/Tools/ros/docker/px4-ros-full/scripts/setup-workspace.sh deleted file mode 100644 index 72ab5a609..000000000 --- a/Tools/ros/docker/px4-ros-full/scripts/setup-workspace.sh +++ /dev/null @@ -1,43 +0,0 @@ -#!/bin/sh -# -# Create workspace at current location and fetch source repositories -# - -# License: according to LICENSE.md in the root directory of the PX4 Firmware repository - -WDIR=`pwd` -WORKSPACE=$WDIR/catkin_ws - -# Setup workspace -mkdir -p $WORKSPACE/src -cd $WORKSPACE/src -catkin_init_workspace -cd $WORKSPACE -catkin_make -echo "source $WORKSPACE/devel/setup.bash" >> ~/.bashrc - -# PX4 Firmware -cd $WORKSPACE/src -git clone https://github.com/PX4/Firmware.git - -# euroc simulator -cd $WORKSPACE/src -git clone https://github.com/PX4/euroc_simulator.git \ - && cd euroc_simulator \ - && git checkout px4_nodes - -# mav comm -cd $WORKSPACE/src -git clone https://github.com/PX4/mav_comm.git - -# glog catkin -cd $WORKSPACE/src -git clone https://github.com/ethz-asl/glog_catkin.git - -# catkin simple -cd $WORKSPACE/src -git clone https://github.com/catkin/catkin_simple.git - -cd $WORKSPACE -catkin_make - diff --git a/Tools/ros/vagrant/docker-host-base/Vagrantfile b/Tools/ros/vagrant/docker-host-base/Vagrantfile deleted file mode 100644 index 06e4e897d..000000000 --- a/Tools/ros/vagrant/docker-host-base/Vagrantfile +++ /dev/null @@ -1,58 +0,0 @@ -# -*- mode: ruby -*- -# vi: set ft=ruby : - -# -# 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 uaventure/docker-host-base package.box" -# -# License: according to LICENSE.md in the root directory of the PX4 Firmware repository - -Vagrant.configure(2) do |config| - config.vm.box = "ubuntu/trusty64" - - config.vm.define "docker-host-base" - - config.vm.provider "virtualbox" do |vb| - vb.name = "docker-host-base" - vb.gui = true - vb.memory = "1024" - end - - config.vm.provision "file", source: "config/docker-default", destination: "/home/vagrant/docker-default" - config.vm.provision "file", source: "config/xsessionrc", destination: "/home/vagrant/.xsessionrc" - - config.vm.provision "shell", inline: <<-SHELL - # Update and install apps - export DEBIAN_FRONTEND=noninteractive - sudo apt-get update - sudo apt-get upgrade -y - sudo apt-get install -y --no-install-recommends ubuntu-desktop - sudo apt-get install -y gnome-terminal unity-lens-applications - - # Reset the ssh key (because vagrant regenerates it during provisioning) - sudo wget --no-check-certificate https://raw.github.com/mitchellh/vagrant/master/keys/vagrant.pub -O /home/vagrant/.ssh/authorized_keys - sudo chmod 0700 /home/vagrant/.ssh - sudo chmod 0600 /home/vagrant/.ssh/authorized_keys - sudo chown -R vagrant /home/vagrant/.ssh - - # Copy docker config - sudo mv /home/vagrant/docker-default /etc/default/docker - - # Enable autologin so docker can start GUI apps - sudo echo "autologin-user=vagrant" >> /usr/share/lightdm/lightdm.conf.d/50-unity-greeter.conf - sudo echo "autologin-user-timeout=0" >> /usr/share/lightdm/lightdm.conf.d/50-unity-greeter.conf - - # X session RC - chmod +x /home/vagrant/.xsessionrc - SHELL - - config.vm.provision "docker" - - # Shutdown after provisioning. "vagrant halt" doesn't recognize the original ssh key anymore - # and would just kill the VM. This might lead to FS inconsistencies (e.g. in the docker DB). - config.vm.provision "shell", inline: "sudo shutdown -h now" -end diff --git a/Tools/ros/vagrant/docker-host-base/config/docker-default b/Tools/ros/vagrant/docker-host-base/config/docker-default deleted file mode 100644 index 19c466b6b..000000000 --- a/Tools/ros/vagrant/docker-host-base/config/docker-default +++ /dev/null @@ -1,29 +0,0 @@ -# -# Default config for docker /etc/default/docker -# Copied from a provisioned vagrant box -# -# Modifications: -# - listen to TCP port -# - removing deprecated "-r=true" option which apparently doesn't work anymore -# > use restart policies for specific containers if necessary -# - -# Docker Upstart and SysVinit configuration file - -# Customize location of Docker binary (especially for development testing). -#DOCKER="/usr/local/bin/docker" - -# Use DOCKER_OPTS to modify the daemon startup options. -#DOCKER_OPTS="--dns 8.8.8.8 --dns 8.8.4.4" - -# If you need Docker to use an HTTP proxy, it can also be specified here. -#export http_proxy="http://127.0.0.1:3128/" - -# This is also a handy place to tweak where Docker's temporary files go. -#export TMPDIR="/mnt/bigdrive/docker-tmp" - -# Expose TCP port in addition to socket - -# License: according to LICENSE.md in the root directory of the PX4 Firmware repository - -DOCKER_OPTS="${DOCKER_OPTS} -H unix:///var/run/docker.sock -H 0.0.0.0:2375" diff --git a/Tools/ros/vagrant/docker-host-base/config/xsessionrc b/Tools/ros/vagrant/docker-host-base/config/xsessionrc deleted file mode 100644 index 1bd4f8d3f..000000000 --- a/Tools/ros/vagrant/docker-host-base/config/xsessionrc +++ /dev/null @@ -1,6 +0,0 @@ -#!/bin/sh -# -# Disable X access control so we can easily start GUI apps -# -# License: according to LICENSE.md in the root directory of the PX4 Firmware repository -xhost + diff --git a/Tools/ros/vagrant/docker-host/Vagrantfile b/Tools/ros/vagrant/docker-host/Vagrantfile deleted file mode 100644 index 2a0a02271..000000000 --- a/Tools/ros/vagrant/docker-host/Vagrantfile +++ /dev/null @@ -1,38 +0,0 @@ -# -*- mode: ruby -*- -# vi: set ft=ruby : - -# -# Actual docker host VM to run. -# -# Maintainer: Andreas Antener -# -# To add local docker images into the docker host, configure your local -# docker client to control the docker daemon on the running "docker-host" VM. -# The box ("docker-host-base") configures docker to listen on any IP on port 2375. -# You can then load an existing image, e.g.: -# "docker load -i container-image.tar" -# -# License: according to LICENSE.md in the root directory of the PX4 Firmware repository - -Vagrant.configure(2) do |config| - config.vm.box = "uaventure/docker-host-base" - - config.vm.define "docker-host" - - config.vm.provider "virtualbox" do |vb| - vb.name = "docker-host" - vb.gui = true - vb.memory = "4096" - vb.cpus = 2 - vb.customize ["modifyvm", :id, "--graphicscontroller", "vboxvga"] - vb.customize ["modifyvm", :id, "--accelerate3d", "on"] - vb.customize ["modifyvm", :id, "--ioapic", "on"] - vb.customize ["modifyvm", :id, "--vram", "128"] - vb.customize ["modifyvm", :id, "--hwvirtex", "on"] - end - - config.vm.network "private_network", ip: "192.168.59.104" - - # TBD: would it be better to provision docker here instead of in the base box? - #config.vm.provision "docker" -end diff --git a/Tools/ros/vagrant/px4-ros/Vagrantfile b/Tools/ros/vagrant/px4-ros/Vagrantfile deleted file mode 100644 index 5b372a94d..000000000 --- a/Tools/ros/vagrant/px4-ros/Vagrantfile +++ /dev/null @@ -1,61 +0,0 @@ -# -*- mode: ruby -*- -# vi: set ft=ruby : - -# -# Boot docker SITL environment -# -# Maintainer: Andreas Antener -# -# "vagrant up" will build the images. Should eventually start "xterm" from within the docker container. -# -# Notes: -# (will change, need proper docs) -# -# Build with multiple dependent docker containers: -# Use the "--no-parallel" option so the containers will be built/started in order. -# e.g.: "vagrant up --no-parallel" -# -# Running apps directly: -# "vagrant docker-run ros -- " -# Attention: will loose all data when stopped, vagrant runs docker always with "--rm" -# -# TODO -# - do not run the docker container with "--rm" (vagrant default). is that even possible? -# - maybe map a local working directory to compile stuff without loosing it in side the docker container -# -# License: according to LICENSE.md in the root directory of the PX4 Firmware repository - -Vagrant.configure(2) do |config| - # Configure docker host - config.vm.provider "docker" do |d| - d.vagrant_machine = "docker-host" - d.vagrant_vagrantfile = "../docker-host/Vagrantfile" - end - - # Configure docker apps to run - config.vm.define "ros" do |app| - app.vm.provider "docker" do |d| - d.name = "ros" - d.image = "uaventure/px4-ros-full" - #d.build_dir = "../../docker/px4-ros-full" - #d.build_args = ["-t=uaventure/px4-ros-full"] - - # Share docker host x11 socket - # Run privileged to support 3d acceleration - d.volumes = [ - "/tmp/.X11-unix:/tmp/.X11-unix:ro" - ] - d.create_args = ["--privileged"] - - # TODO: get display number from host system - d.env = { - "DISPLAY" => ":0" - } - - d.remains_running = true - d.cmd = ["xterm"] - #d.has_ssh = true - end - end - -end -- cgit v1.2.3