Merge commit '68f4897e67ce1802ec814a462c6e4e5e16a6aef4'

Author: h3ct0r

compose_linux_host.yaml

@@ -7,7 +7,7 @@ services:
     ipc: host
     pid: host
     privileged: true
-    runtime: nvidia
+    network_mode: host
     environment:
       - DISPLAY=${DISPLAY:-:0}
       - NVIDIA_DRIVER_CAPABILITIES=all
@@ -16,51 +16,20 @@ services:
       - ROS_MASTER_URI=http://localhost:11311/
       - DEBIAN_FRONTEND=noninteractive
     network_mode: host
-    # ports:
-    #   - "3022:22" # sshd
-    #   - "3080:80" # novnc
-    #   - "3081:3000" # vscode-server
-    #   - "11311:11311" # ros
-
-    # extra_hosts:
-    #   - "simulator:127.0.0.1" # fix rviz hostname
     volumes:
       - ${localWorkspaceFolder:-./local_mount}:/home/ubuntu/ros_ws
       - /etc/localtime:/etc/localtime:ro
       - /etc/timezone:/etc/timezone:ro
       - /tmp/.X11-unix:/tmp/.X11-unix
       - /var/log/val_logger:/var/log/val_logger
-      # - ${HOME}/.Xauthority:/home/ubuntu/.Xauthority
-    # linux network configuration
-    #mac_address: EE:9E:AB:F9:31:AF          # <-- MAC needs to be unique in this network (gerated randomly)
-    # networks:
-    #   macvlan_ros1_network:                         # <-- MACVlan Name no need to change, but it needs to be unique
-    #     ipv4_address: 150.164.212.235       # <-- Update; must be the IP that you want to use as for the container
     cap_add:
       - NET_ADMIN
       - SYS_MODULE
-    # sysctls:
-    #   - net.ipv4.ip_forward=1
-    #   - net.ipv4.conf.all.src_valid_mark=1
-    #   - net.ipv6.conf.all.disable_ipv6=0
-    #   - net.ipv6.conf.all.forwarding=1
-    #   - net.ipv6.conf.default.forwarding=1
+    runtime: nvidia
     deploy:
       resources:
         reservations:
           devices:
             - driver: nvidia
               capabilities: [gpu]
-              count: 1
-
-# networks:
-#   macvlan_ros1_network:
-#     driver: ipvlan                            # using macvlan is faster but prevents the host from connecting to it direcly
-#     driver_opts:
-#       ipvlan_mode: l3
-#       parent: enxa0cec8831e24                          # <- Update to match your NIC
-#     ipam:
-#       config:
-#         - subnet: 150.164.212.0/24            # <-- Update
-#           gateway: 150.164.212.1              # <-- Update
-#           ip_range: 150.164.212.0/24          # <-- Update
+              count: 1

compose_macos_host.yaml

@@ -0,0 +1,29 @@
+services:
+  ros1:
+    container_name: ros1_noetic_devel
+    build:
+      context: .
+      dockerfile: Dockerfile
+    ipc: host
+    pid: host
+    privileged: true
+    network_mode: bridge
+    ports:
+      - "3080:3080"
+      - "3081:3000"
+      - "3022:3022"
+    environment:
+      - DISPLAY=${DISPLAY:-:0}
+      - NVIDIA_DRIVER_CAPABILITIES=all
+      - TZ=${TZ:-UTC}
+      - ROS_LOG_DIR=/var/log/val_logger/noetic_devel
+      - ROS_MASTER_URI=http://localhost:11311/
+    volumes:
+      - ${localWorkspaceFolder:-./local_mount}:/home/ubuntu/ros_ws
+      - /etc/localtime:/etc/localtime:ro
+      - /etc/timezone:/etc/timezone:ro
+      - /tmp/.X11-unix:/tmp/.X11-unix
+      - /var/log/val_logger:/var/log/val_logger
+    cap_add:
+      - NET_ADMIN
+      - SYS_MODULE