From 485b1876c0dbc5b0670fa8437d10d9710d694d0d Mon Sep 17 00:00:00 2001
From: Thies Lennart Alff <lennart.alff@gmail.com>
Date: Sun, 1 May 2022 01:47:57 +0200
Subject: [PATCH] entrypoint update/fix

---
 Dockerfile         | 3 +++
 docker-compose.yml | 5 +----
 entrypoint.sh      | 5 ++---
 3 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index d5b2b43..1f09428 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -62,6 +62,9 @@ RUN cd /home/$USERNAME/.vim/bundle/YouCompleteMe \
     && python3 install.py --clangd-completer
 USER root
 RUN chown -R $USERNAME /home/$USERNAME/
+ADD entrypoint.sh /entrypoint.sh
+RUN chmod +x /entrypoint.sh
+RUN chown $USERNAME /entrypoint.sh
 USER ${USERNAME}
 WORKDIR /home/$USERNAME
 RUN wget https://raw.githubusercontent.com/llvm/llvm-project/main/clang/tools/clang-format/clang-format.py
diff --git a/docker-compose.yml b/docker-compose.yml
index 121eeec..ae5ece1 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -16,10 +16,7 @@ services:
       dockerfile: ./Dockerfile
     stdin_open: true
     tty: true
-    entrypoint:
-      - bash
-      - entrypoint.sh
-    command: byobu
+    entrypoint: ["/entrypoint.sh", "byobu"]
     working_dir: /home/ros-user/uuv/ros2
     devices:
       - "/dev/dri:/dev/dri"
diff --git a/entrypoint.sh b/entrypoint.sh
index 232c7e2..c71f295 100644
--- a/entrypoint.sh
+++ b/entrypoint.sh
@@ -1,12 +1,11 @@
 #!/bin/bash
 set -e
-PX4_DIR="/home/vscode/uuv/PX4-Autopilot"
-WORKSPACE_DIR="/home/vscode/uuv/ros2"
+PX4_DIR="\$HOME/uuv/PX4-Autopilot"
+WORKSPACE_DIR="\$HOME/uuv/ros2"
 echo "source $WORKSPACE_DIR/install/setup.zsh" >> ~/.zshrc
 echo "source $PX4_DIR/Tools/setup_gazebo.bash $PX4_DIR $PX4_DIR/build/px4_sitl_default > /dev/null" >> ~/.zshrc
 echo "export ROS_PACKAGE_PATH=\$ROS_PACKAGE_PATH:$PX4_DIR" >> ~/.zshrc
 echo "export ROS_PACKAGE_PATH=\$ROS_PACKAGE_PATH:$PX4_DIR/Tools/sitl_gazebo" >> ~/.zshrc
-echo "export FASTRTPS_DEFAULT_PROFILES_FILE=/home/vscode/uuv/ros2/test.xml" >> ~/.zshrc
 vim +PluginUpdate +qall
 
 exec $@