File tree Expand file tree Collapse file tree 1 file changed +3
-2
lines changed Expand file tree Collapse file tree 1 file changed +3
-2
lines changed Original file line number Diff line number Diff line change @@ -55,6 +55,7 @@ WORKING_DIR=$(docker inspect -f '{{.Config.WorkingDir}}' "$CONTAINER_NAME")
5555ROS_DISTRO=$( docker exec " $CONTAINER_NAME " /bin/bash -c " printenv ROS_DISTRO" )
5656COLCON_WORKSPACE_FOLDER=$( docker exec " $CONTAINER_NAME " /bin/bash -c " printenv COLCON_WORKSPACE_FOLDER" )
5757
58+
5859# Take container WORKING_DIR when $COLCON_WORKSPACE_FOLDER is not defined in the container
5960COLCON_WORKSPACE_FOLDER=${COLCON_WORKSPACE_FOLDER:- $WORKING_DIR }
6061
@@ -72,7 +73,7 @@ envsubst <.devcontainer.json >"$CONTAINER_CONFIG_FOLDER/$CONTAINER_NAME.json"
7273docker cp ros2.code-workspace " $CONTAINER_NAME :$COLCON_WORKSPACE_FOLDER /"
7374docker cp .vscode-format/ " $CONTAINER_NAME :$COLCON_WORKSPACE_FOLDER /"
7475
75- docker exec orise-foxy-devel apt-get install -y \
76+ docker exec " $CONTAINER_NAME " apt-get install -y \
7677 python3-pip \
7778 ros-" $ROS_DISTRO " -ament-copyright \
7879 ros-" $ROS_DISTRO " -ament-cppcheck \
@@ -83,7 +84,7 @@ docker exec orise-foxy-devel apt-get install -y \
8384 ros-" $ROS_DISTRO " -ament-uncrustify \
8485 ros-" $ROS_DISTRO " -ament-xmllint
8586
86- docker exec orise-foxy-devel pip3 install \
87+ docker exec " $CONTAINER_NAME " pip3 install \
8788 cmake-format \
8889 yapf \
8990 flake8 \
You can’t perform that action at this time.
0 commit comments