Skip to content

Commit 6066a42

Browse files
Fix container name on docker exec calls
1 parent 2912143 commit 6066a42

File tree

1 file changed

+3
-2
lines changed

1 file changed

+3
-2
lines changed

setup_workspace.sh

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,7 @@ WORKING_DIR=$(docker inspect -f '{{.Config.WorkingDir}}' "$CONTAINER_NAME")
5555
ROS_DISTRO=$(docker exec "$CONTAINER_NAME" /bin/bash -c "printenv ROS_DISTRO")
5656
COLCON_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
5960
COLCON_WORKSPACE_FOLDER=${COLCON_WORKSPACE_FOLDER:-$WORKING_DIR}
6061

@@ -72,7 +73,7 @@ envsubst <.devcontainer.json >"$CONTAINER_CONFIG_FOLDER/$CONTAINER_NAME.json"
7273
docker cp ros2.code-workspace "$CONTAINER_NAME:$COLCON_WORKSPACE_FOLDER/"
7374
docker 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 \

0 commit comments

Comments
 (0)