From 622b3e63e2e013867b5122a0ca0845aaff1ccf68 Mon Sep 17 00:00:00 2001
From: none <none>
Date: Tue, 25 Oct 2022 15:38:26 +0200
Subject: [PATCH] copy from local directory, instead of git clone

---
 Dockerfile             | 7 ++++---
 manipulability_metrics | 2 +-
 scripts/prepare.sh     | 7 -------
 3 files changed, 5 insertions(+), 11 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 99c041d..ee41e99 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -6,8 +6,8 @@ RUN apt update; apt install -y vim tmux git sudo stow
 
 # add nonroot user 'user' with sudo abilities and nice configurations
 RUN adduser user --home /home/user
-RUN echo 'root:DOCKER'|chpasswd
-RUN echo 'user:docker'|chpasswd
+RUN echo 'root:root'|chpasswd
+RUN echo 'user:user'|chpasswd
 RUN echo "user ALL=(ALL:ALL) ALL" >> /etc/sudoers
 #RUN echo "source /opt/ros/melodic/setup.bash" >> /home/user/.bashrc
 # covenience, this entire block can be removed without affecting the functionality
@@ -22,7 +22,8 @@ RUN echo 'PS1="\u:\wΣ "' >> /home/user/.bashrc
 # setup workspace
 RUN mkdir -p  /home/user/catkin_ws/src
 WORKDIR /home/user/catkin_ws/src
-RUN git clone https://github.com/tecnalia-medical-robotics/manipulability_metrics
+COPY manipulability_metrics /home/user/catkin_ws/src
+#RUN git clone https://github.com/tecnalia-medical-robotics/manipulability_metrics
 
 # entry script
 COPY scripts/* /home/user/catkin_ws/scripts/
diff --git a/manipulability_metrics b/manipulability_metrics
index 0e13603..cb45bc2 160000
--- a/manipulability_metrics
+++ b/manipulability_metrics
@@ -1 +1 @@
-Subproject commit 0e1360376a49fdc623e761fc8ca769e99fa11ac9
+Subproject commit cb45bc21aadbf41eac0fbad18889fd9524401a7c
diff --git a/scripts/prepare.sh b/scripts/prepare.sh
index 4edcd96..5149919 100644
--- a/scripts/prepare.sh
+++ b/scripts/prepare.sh
@@ -1,10 +1,3 @@
-# remove namespace to avoid problem
-vim -E /home/user/catkin_ws/src/manipulability_metrics/manipulability_metrics_examples/urdf/panda.urdf.xacro << EOF
-	normal GkWWdE
-	w
-	q
-EOF
-
 # install dependencies
 rosdep update
 rosdep install --from-paths src --ignore-src -r -y
-- 
GitLab