瀏覽代碼

chore: update ros-galactic Dockerfile

lujw2 6 月之前
父節點
當前提交
02078a3411
共有 3 個文件被更改,包括 35 次插入31 次删除
  1. 31 29
      docker-compose.yml
  2. 1 2
      ros2-galactic.Dockerfile
  3. 3 0
      run_ros2_galactic.sh

+ 31 - 29
docker-compose.yml

@@ -1,7 +1,7 @@
 version: '3'
 services:
   ros2-galactic-dev:
-    image: ros2-galactic-dev:v1.0
+    image: ros:galactic-dev
     container_name: ros2-galactic-dev
     privileged: true
     stdin_open: true
@@ -18,40 +18,42 @@ services:
     volumes:
       - /tmp/.X11-unix:/tmp/.X11-unix
       # nvim and some tools
-      - /home/jasper/.config/:/home/jasper/.config/
+      - /home/jasper/.config/dotfiles:/home/jasper/.config/dotfiles
       - /home/jasper/.local/share/nvim:/home/jasper/.local/share/nvim
       - /home/jasper/.local/state/nvim:/home/jasper/.local/state/nvim
       - /home/jasper/Software:/home/jasper/Software
-      - /usr/local/bin:/usr/local/bin
+      - /opt/lib:/opt/lib
       # Work
       - /dev:/dev
-      - /home/jasper/Work/Robot/:/home/jasper/Work/Robot/
+      - /home/jasper/Work:/home/jasper/Work
+      - /home/jasper/Android:/home/jasper/Android
+      - /home/jasper/Library:/home/jasper/Library
 
-  ros-melodic-dev:
-    image: ros:melodic-cuda11.4-v0.1
-    container_name: cuda-ros-melodic
-    privileged: true
-    stdin_open: true
-    tty: true
-    deploy:
-      resources:
-        reservations:
-          devices:
-            - driver: nvidia
-              count: 1
-              capabilities: [gpu]
-    environment:
-        DISPLAY: $DISPLAY
-    volumes:
-      - /tmp/.X11-unix:/tmp/.X11-unix
-      # nvim and some tools
-      - /home/jasper/.config/:/home/jasper/.config/
-      - /home/jasper/.local/share/nvim:/home/jasper/.local/share/nvim
-      - /home/jasper/.local/state/nvim:/home/jasper/.local/state/nvim
-      - /home/jasper/Software:/home/jasper/Software
-      # Work
-      - /dev:/dev
-      - /home/jasper/Work/Robot/:/home/jasper/Work/Robot/
+  # ros-melodic-dev:
+  #   image: ros:melodic-cuda11.4-v0.1
+  #   container_name: cuda-ros-melodic
+  #   privileged: true
+  #   stdin_open: true
+  #   tty: true
+  #   deploy:
+  #     resources:
+  #       reservations:
+  #         devices:
+  #           - driver: nvidia
+  #             count: 1
+  #             capabilities: [gpu]
+  #   environment:
+  #       DISPLAY: $DISPLAY
+  #   volumes:
+  #     - /tmp/.X11-unix:/tmp/.X11-unix
+  #     # nvim and some tools
+  #     - /home/jasper/.config/:/home/jasper/.config/
+  #     - /home/jasper/.local/share/nvim:/home/jasper/.local/share/nvim
+  #     - /home/jasper/.local/state/nvim:/home/jasper/.local/state/nvim
+  #     - /home/jasper/Software:/home/jasper/Software
+  #     # Work
+  #     - /dev:/dev
+  #     - /home/jasper/Work/Robot/:/home/jasper/Work/Robot/
 
   # ros-melodic-dev2:
   #   image: nvidia/cuda:11.4.3-devel-ubuntu18.04

+ 1 - 2
ros2-galactic.Dockerfile

@@ -19,8 +19,7 @@ RUN sed -i 's/http:\/\/archive.ubuntu.com\//http:\/\/mirrors.aliyun.com\//g' /et
 # ********************************************************
 # * Anything else you want to do like clean up goes here *
 # ********************************************************
-RUN echo "source /opt/ros/${ROS_DISTRO}/setup.bash" >> /home/jasper/.bashrc \
-    && echo 'cd ~/Work/Robot' >> /home/jasper/.bashrc
+RUN echo "source /opt/ros/${ROS_DISTRO}/setup.bash" >> /home/jasper/.bashrc
 
 # [Optional] Set the default user. Omit if you want to keep the default as root.
 USER $user

+ 3 - 0
run_ros2_galactic.sh

@@ -12,7 +12,10 @@ docker run -d -it \
     -v /home/jasper/.local/share/nvim:/home/jasper/.local/share/nvim \
     -v /home/jasper/.local/state/nvim:/home/jasper/.local/state/nvim \
     -v /home/jasper/Software:/home/jasper/Software \
+    -v /home/jasper/.local/bin:/home/jasper/.local/bin \
     -v /home/jasper/Work:/home/jasper/Work \
+    -v /home/jasper/Android:/home/jasper/Android \
+    -v /home/jasper/Library:/home/jasper/Library \
     -v /opt/lib:/opt/lib \
     -v /opt/arm:/opt/arm \
     ros:galactic-dev