From aae48d4e6ce07b2488dc615fa408919acb8d8edf Mon Sep 17 00:00:00 2001
From: Tim Kluge <timklge@gmail.com>
Date: Mon, 31 Aug 2020 20:33:26 +0200
Subject: [PATCH] Update Dockerfile: Add umask, fix home dir
---
Dockerfile | 29 +++++++++++++++++++++++------
vnc/simple_simulation.sh | 4 ----
2 files changed, 23 insertions(+), 10 deletions(-)
delete mode 100644 vnc/simple_simulation.sh
diff --git a/Dockerfile b/Dockerfile
index f5a0b56..323d264 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,17 +1,34 @@
-FROM fbottarel/ros-desktop-full-vnc:melodic
+FROM dorowu/ubuntu-desktop-lxde-vnc:bionic
-RUN apt-get update && apt-get dist-upgrade -y
+# Fix dirmngr
+RUN apt-get purge dirmngr -y && apt-get update && apt-get install dirmngr -y
+RUN apt-get dist-upgrade -y
+
+# Adding keys for ROS
+RUN sh -c 'echo "deb http://packages.ros.org/ros/ubuntu $(lsb_release -sc) main" > /etc/apt/sources.list.d/ros-latest.list'
+RUN apt-key adv --keyserver 'hkp://keyserver.ubuntu.com:80' --recv-key C1CF6E31E6BADE8868B172B4F42ED6FBAB17C654
+
+# Installing ROS
+RUN apt-get update && apt-get install -y ros-melodic-desktop-full wget nano python-rosdep
RUN apt-get install -y \
ros-melodic-libfranka python-catkin-tools libeigen3-dev
-COPY ./vnc/simple_simulation.sh /root/Desktop/
-RUN ln -s /usr/share/applications/lxterminal.desktop /root/Desktop/lxterminal.desktop
-RUN chmod a+x /root/Desktop/simple_simulation.sh && mkdir /root/ws_tmp
+RUN apt-get install -y python-rosinstall python-rosinstall-generator python-wstool build-essential
+RUN rosdep init && rosdep update
+
+RUN mkdir -p /root/ws_tmp /root/Desktop && ln -s /usr/share/applications/lxterminal.desktop /root/Desktop/lxterminal.desktop
ENV ROS_DISTRO=melodic
+
+RUN /bin/bash -c "echo -e 'source /root/Desktop/ros_ws/devel/setup.bash\n \
+ umask 000\n \
+ cd /root/Desktop/ros_ws/\n' >> /root/.bashrc "
+
WORKDIR /root/ws_tmp
COPY vnc/copyws.sh /root/copyws.sh
RUN chmod a+x /root/copyws.sh
COPY ./src /root/ws_tmp/src
-RUN apt-get update && rosdep install --from-paths . -r -y && apt-get clean
+
+RUN apt-get update && rosdep install --from-paths . -r -y
+
RUN catkin config \
--extend /opt/ros/melodic && \
catkin build
diff --git a/vnc/simple_simulation.sh b/vnc/simple_simulation.sh
deleted file mode 100644
index ad54642..0000000
--- a/vnc/simple_simulation.sh
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/bash
-
-source /root/Desktop/ros_ws/devel/setup.bash
-lxterminal --command "roslaunch sample_applications simple_simulation.launch"
\ No newline at end of file
--
GitLab