Skip to content
Snippets Groups Projects
Commit 6262eb64 authored by Montaño Sarria, Andres Felipe's avatar Montaño Sarria, Andres Felipe
Browse files

Update melodic dockerfile

parent 09f50579
No related branches found
No related tags found
No related merge requests found
FROM osrf/ros:melodic-desktop-full
ENV ROS_DISTRO melodic
ENV RUNNING_IN_DOCKER true
# Avoid warnings by switching to noninteractive
ENV DEBIAN_FRONTEND=noninteractive
......@@ -194,7 +196,9 @@ RUN apt-get update && apt-get install -y \
ros-melodic-interactive-marker-twist-server \
ros-melodic-industrial-core \
ros-melodic-lms1xx \
ros-melodic-serial
ros-melodic-serial \
ros-melodic-spacenav-node \
spacenavd
# Update final image
RUN apt-get update && apt-get -y upgrade && apt-get -y autoremove
......
......@@ -1591,7 +1591,7 @@
# p10k segment -f 208 -i '⭐' -t '%n'
#}
function prompt_docker() {
if [[ -f /ros_entrypoint.sh ]]; then
if [[ -n $RUNNING_IN_DOCKER ]]; then
p10k segment -f 226 -i $'\uF308'
fi
}
......
......@@ -45,15 +45,19 @@ function drma() {
}
function dat() {
docker exec -it melodic bash -c "cd ~/ros/melodic/$1 && bash"
docker exec -it melodic bash -c "cd ~/ros/melodic/$1 && $ext"
}
function datmelodic() {
docker exec -it melodic bash -c "cd ~/ros/melodic/$1 && zsh"
}
function datnoetic() {
docker exec -it noetic bash
docker exec -it noetic -c "cd ~/ros/noetic/$1 && $ext"
}
function datkinetic() {
docker exec -it kinetic bash
docker exec -it kinetic -c "cd ~/ros/kinetic/$1 && $ext"
}
function runpythonsyntax(){
......
......@@ -25,29 +25,32 @@ function sourcews(){
# Source the current workspace
function sourcethis(){
pwd_bck=${PWD}
pwd_st=${PWD}
roshome && source ./devel/setup.${ext} && smon
cd ${pwd_bck}
cd ${pwd_st}
}
# Automatic catkin build
function cb() {
pwd_cb=${PWD}
roshome
catkin build --summarize "$@"
sourcethis
cd ${pwd_cb}
}
# Clean workspace (delete the generated folders, then catkin build)
function cbclean(){
roshome && rm -rf build devel install && cb
roshome && rm -rf build devel install && catkin build --summarize
}
# Initialize catkin workspace, configure and build it
function cib(){
catkin init && catkin config --extend /opt/ros/${ROS_DISTRO} && cb
catkin init && catkin config --extend /opt/ros/${ROS_DISTRO} && catkin build --summarize
}
# If terminal starts in a ws, auto source it (useful for vscode)
pwd_bck=${PWD}
pwd_init=${PWD}
cropped=${PWD#${HOME}/ros/${ROS_DISTRO}/}
WS_name=${cropped%%/*}
WS_path=${HOME}/ros/${ROS_DISTRO}/${WS_name}
......@@ -55,7 +58,7 @@ FILE=${WS_path}/devel/setup.${ext}
if [[ -f $FILE ]]; then
cd ${WS_path}
source $FILE
cd ${pwd_bck}
cd ${pwd_init}
else
source /opt/ros/${ROS_DISTRO}/setup.${ext}
fi
......@@ -12,7 +12,9 @@
cursor_color = "#aaaaaa"
font = Hack Nerd Font Mono 12
show_titlebar = False
scrollbar_position = hidden
scrollback_infinite = True
custom_command = byobu
use_system_font = False
copy_on_selection = True
[layouts]
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment