Skip to content

Commit ed5b84f

Browse files
Hector AzpuruaHector Azpurua
authored andcommitted
quality of life improvements
1 parent c51ea06 commit ed5b84f

15 files changed

+55
-17
lines changed

.devcontainer/.vscode/extensions.json

Whitespace-only changes.

.devcontainer/compile_flags.txt

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
-c
2+
-I/opt/ros/$ROS_DISTRO/include
3+
-std=c++11
4+
-fno-exceptions

.devcontainer/devcontainer.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
"remoteUser": "ubuntu",
66
"service": "ros1",
77
"dockerComposeFile": [
8-
"../compose_linux_nvidia.yaml"
8+
"../compose_macos.yaml"
99
],
1010
"waitFor": "postCreateCommand",
1111
"workspaceFolder": "/home/ubuntu",
@@ -37,6 +37,7 @@
3737
"github.copilot"
3838
],
3939
"settings": {
40+
"python.defaultInterpreterPath": "${workspaceFolder}/.py3.8/bin/python",
4041
"terminal.integrated.profiles.linux": {
4142
"bash": {
4243
"path": "/usr/bin/bash",
Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
#!/bin/bash
2+
3+
catkin config --profile release -x _release --extend /opt/ros/noetic --cmake-args -DCMAKE_BUILD_TYPE=RelWithDebInfo -DCMAKE_EXPORT_COMPILE_COMMANDS=ON
4+
catkin config --profile debug -x _debug --extend /opt/ros/noetic --cmake-args -DCMAKE_BUILD_TYPE=Debug -DCMAKE_EXPORT_COMPILE_COMMANDS=ON
5+
catkin profile set release

.github/workflows/build-arm64.yaml

Whitespace-only changes.

compose_jetson.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ services:
44
build:
55
context: .
66
dockerfile: docker/Dockerfile.arm64
7+
hostname: ros_docker
78
ipc: host
89
pid: host
910
privileged: true

compose_linux_nogpu.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ services:
44
build:
55
context: .
66
dockerfile: docker/Dockerfile.amd64
7+
hostname: ros_docker
78
ipc: host
89
pid: host
910
privileged: true

compose_linux_nvidia.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ services:
44
build:
55
context: .
66
dockerfile: docker/Dockerfile.amd64
7+
hostname: ros_docker
78
ipc: host
89
pid: host
910
privileged: true

compose_macos.yaml

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ services:
44
build:
55
context: .
66
dockerfile: docker/Dockerfile.amd64
7+
hostname: ros_docker
78
ipc: host
89
pid: host
910
privileged: true
@@ -12,19 +13,20 @@ services:
1213
- "3080:3080"
1314
- "3081:3081"
1415
- "3022:3022"
16+
- "11311:11311"
1517
environment:
16-
- DISPLAY=${DISPLAY:-:0}
17-
- NVIDIA_DRIVER_CAPABILITIES=all
1818
- TZ=${TZ:-UTC}
19-
- ROS_LOG_DIR=/var/log/val_logger/noetic_devel
2019
- ROS_MASTER_URI=http://localhost:11311/
2120
- DEBIAN_FRONTEND=noninteractive
21+
- ROS_LOG_DIR=/tmp
2222
volumes:
2323
- ${localWorkspaceFolder:-./}local_mount/:/home/ubuntu/ros_ws
2424
- /etc/localtime:/etc/localtime:ro
2525
- /etc/timezone:/etc/timezone:ro
2626
- /tmp/.X11-unix:/tmp/.X11-unix
27-
- /var/log/val_logger:/var/log/val_logger
27+
device_cgroup_rules:
28+
- 'c 81:* rmw'
29+
- 'c 189:* rmw'
2830
cap_add:
2931
- NET_ADMIN
3032
- SYS_MODULE
Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,13 @@
11
[program:sshd]
22
command=/usr/sbin/sshd -D -p 3022
33

4+
[group:vnc-workers]
5+
programs=vnc,novnc
6+
47
[program:vnc]
5-
command=gosu 'ubuntu' bash '/home/ubuntu/.vnc/vnc_run.sh'
8+
command=gosu 'ubuntu' bash -c '(rm -f /tmp/.X11-unix/X2 || true) && sleep 2 && exec /home/ubuntu/.vnc/vnc_run.sh'
9+
priority=100
610

711
[program:novnc]
8-
command=bash -c 'websockify --web=/usr/lib/novnc 3080 localhost:5902'
12+
command=bash -c 'websockify --web=/usr/lib/novnc 3080 localhost:5902'
13+
priority=200

0 commit comments

Comments
 (0)