From 9edcf66eeeaa19b2015d6d0878edf62f4515c9c1 Mon Sep 17 00:00:00 2001 From: MaOrMann Date: Sun, 5 Nov 2023 10:39:08 +0100 Subject: [PATCH 1/3] fix cleanupBSN --- .devcontainer/.tmux.conf | 2 +- .devcontainer/additional_bashrc.sh | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/.devcontainer/.tmux.conf b/.devcontainer/.tmux.conf index 26b4da99..2444fd8d 100644 --- a/.devcontainer/.tmux.conf +++ b/.devcontainer/.tmux.conf @@ -93,4 +93,4 @@ bind -n S-M-Up resize-pane -Z bind -n S-M-Down resize-pane -Z # see file .devcontainer/additional_bashrc for this command's source -set-hook -g session-closed "cleanupBSN" +set-hook -g session-closed "/bin/bash -c cleanupBSN" diff --git a/.devcontainer/additional_bashrc.sh b/.devcontainer/additional_bashrc.sh index 2715a087..627b58fe 100644 --- a/.devcontainer/additional_bashrc.sh +++ b/.devcontainer/additional_bashrc.sh @@ -18,3 +18,5 @@ function cleanupBSN() { kill $(cat /var/tmp/strategy_manager.pid && rm /var/tmp/strategy_manager.pid) & sleep 1s kill $(pgrep roscore) } + +export -f cleanupBSN From 0d0141d52256286b1f72b4459f42a68dcf4c0398 Mon Sep 17 00:00:00 2001 From: MaOrMann Date: Sun, 5 Nov 2023 10:39:27 +0100 Subject: [PATCH 2/3] remove python-rospy --- .devcontainer/postCreate.sh | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/.devcontainer/postCreate.sh b/.devcontainer/postCreate.sh index 6ac7ef41..c66c16ca 100755 --- a/.devcontainer/postCreate.sh +++ b/.devcontainer/postCreate.sh @@ -1,4 +1,3 @@ -python-rospy -cd /workspaces/bsn &&\ - rosdep install --from-paths src --ignore-src -r -y &&\ - catkin_make \ No newline at end of file +cd /workspaces/bsn +rosdep install --from-paths src --ignore-src -r -y +catkin_make From b277535129326f4f5e7b5791c846341452565f64 Mon Sep 17 00:00:00 2001 From: MaOrMann Date: Sun, 5 Nov 2023 10:39:35 +0100 Subject: [PATCH 3/3] cleanup --- .devcontainer/devcontainer.json | 13 +------------ 1 file changed, 1 insertion(+), 12 deletions(-) diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json index 0800c910..f2f26e56 100644 --- a/.devcontainer/devcontainer.json +++ b/.devcontainer/devcontainer.json @@ -1,19 +1,8 @@ // For format details, see https://aka.ms/devcontainer.json. For config options, see the README at: // https://github.com/microsoft/vscode-dev-containers/tree/v0.245.2/containers/docker-existing-dockerfile { - "name": "Existing Dockerfile", - // Sets the run context to one level up instead of the .devcontainer folder. + "name": "SA-BSN", "context": "..", - // Update the 'dockerFile' property if you aren't using the standard 'Dockerfile' filename. "dockerFile": "../Dockerfile.dev", - // Use 'forwardPorts' to make a list of ports inside the container available locally. - // "forwardPorts": [], - // Uncomment the next line to run commands after the container is created - for example installing curl. "postCreateCommand": "bash -c \"/workspaces/bsn/.devcontainer/postCreate.sh\"" - // Uncomment when using a ptrace-based debugger like C++, Go, and Rust - // "runArgs": [ "--cap-add=SYS_PTRACE", "--security-opt", "seccomp=unconfined" ], - // Uncomment to use the Docker CLI from inside the container. See https://aka.ms/vscode-remote/samples/docker-from-docker. - // "mounts": [ "source=/var/run/docker.sock,target=/var/run/docker.sock,type=bind" ], - // Uncomment to connect as a non-root user if you've added one. See https://aka.ms/vscode-remote/containers/non-root. - // "remoteUser": "vscode" } \ No newline at end of file