From eda1267e1ebbc1ee100890ece08c4fae24fb3c7c Mon Sep 17 00:00:00 2001
From: Tim Kluge <timklge@gmail.com>
Date: Fri, 28 Aug 2020 12:58:13 +0200
Subject: [PATCH] Fix workspace location in container, terminal shortcut
---
Dockerfile | 8 ++++----
vnc/simple_simulation.sh | 4 ++--
2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/Dockerfile b/Dockerfile
index 4430957..a85b62b 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -5,11 +5,11 @@ RUN apt-get install -y \
ros-melodic-libfranka python-catkin-tools libeigen3-dev
#WORKDIR /src/
COPY ./vnc/simple_simulation.sh /root/Desktop/
-RUN chmod a+x /root/Desktop/simple_simulation.sh
+RUN ln -s /usr/share/applications/lxterminal.desktop /root/Desktop/lxterminal.desktop
+RUN chmod a+x /root/Desktop/simple_simulation.sh && mkdir /root/Desktop/ros_ws
ENV ROS_DISTRO=melodic
-WORKDIR /home/ubuntu/ros_ws
-RUN rm build devel src -rf
-COPY ./src /home/ubuntu/ros_ws/src
+WORKDIR /root/Desktop/ros_ws
+COPY ./src /root/Desktop/ros_ws/src
RUN apt-get update && rosdep install --from-paths . -r -y && apt-get clean
RUN catkin config \
--extend /opt/ros/melodic && \
diff --git a/vnc/simple_simulation.sh b/vnc/simple_simulation.sh
index f51f750..ad54642 100644
--- a/vnc/simple_simulation.sh
+++ b/vnc/simple_simulation.sh
@@ -1,4 +1,4 @@
#!/bin/bash
-source ~/ros_ws/devel/setup.bash
-roslaunch sample_applications simple_simulation.launch
\ No newline at end of file
+source /root/Desktop/ros_ws/devel/setup.bash
+lxterminal --command "roslaunch sample_applications simple_simulation.launch"
\ No newline at end of file
--
GitLab