Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Feature/ros package #11

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
tmp
workspace/.catkin_workspace
workspace/build
workspace/devel
Expand Down
File renamed without changes.
File renamed without changes.
10 changes: 7 additions & 3 deletions docker/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -19,14 +19,14 @@
# Author: Ricardo Martins #
###########################################################################

FROM ubuntu:16.04
FROM ubuntu:18.04

MAINTAINER Ricardo Martins <[email protected]>

ENV DEBIAN_FRONTEND=noninteractive
ENV ROS_VERSION=kinetic
ENV ROS_VERSION=melodic

RUN apt-get update -y && apt-get install -y lsb-release
RUN apt-get update -y && apt-get install -y lsb-release gnupg

# Add ROS repository.
RUN echo "deb http://packages.ros.org/ros/ubuntu $(lsb_release -sc) main" > /etc/apt/sources.list.d/ros-latest.list
Expand All @@ -42,6 +42,7 @@ RUN apt-get update -y && apt-get install -y \
python-rosinstall \
python3-pip \
ros-$ROS_VERSION-ros-base \
python-rosdep \
unzip \
valgrind \
wget \
Expand All @@ -53,6 +54,9 @@ RUN rosdep init
RUN rosdep update
RUN echo "source /opt/ros/$ROS_VERSION/setup.bash" >> ~/.bashrc

# To allow building ROS packages from source
RUN pip3 install -U rosinstall vcstools rospkg

# Install IMC Translator.
ENV IMCTRANS_VERSION=0.1.6
RUN pip3 install "imctrans==$IMCTRANS_VERSION"
Expand Down
17 changes: 12 additions & 5 deletions docker/docker.bash
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,8 @@
###########################################################################

TAG='ros-imc-broker'
VERSION='2017.11.00'
VOLUME="$PWD/../workspace"
VERSION='2020.07.00'
VOLUME="$(realpath $PWD/..)"

build()
{
Expand All @@ -31,14 +31,21 @@ build()

shell()
{
VOLPCK=''
for fx in cfg launch package.xml src CMakeLists.txt include LICENSE README.md start.bash; do
VOLPCK="$VOLPCK -v $VOLUME/$fx:$VOLUME/tmp/workspace/src/$TAG/$fx";
done
#-v "$VOLUME:$VOLUME/tmp/workspace/src/$TAG" \

docker run \
--rm \
-w "$VOLUME" \
-w "$VOLUME/tmp/workspace" \
-i \
-a stdin \
-a stdout \
-v "$VOLUME:$VOLUME" \
-v "$VOLUME/dune-log:/opt/lsts/dune/log" \
-v "$VOLUME/tmp/workspace:$VOLUME/tmp/workspace" \
$VOLPCK \
-v "$VOLUME/tmp/dune-log:/opt/lsts/dune/log" \
-t "$TAG:$VERSION"
}

Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
Loading