Skip to content

Commit f1de47c

Browse files
committed
fix : 修改docker image
1 parent 46b11d3 commit f1de47c

File tree

2 files changed

+3
-33
lines changed

2 files changed

+3
-33
lines changed

.github/workflows/build-CI.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ jobs:
66
build:
77
runs-on: ubuntu-20.04
88
container:
9-
image: ghcr.io/irobot-algorithm/sentry_navigation:latest
9+
image: ghcr.io/irobot-algorithm/sentry_navigation/environment:latest
1010

1111
steps:
1212
- name: Checkout code
@@ -19,5 +19,5 @@ jobs:
1919
2020
- name: Run tests
2121
run: |
22-
source /opt/ros/noetic/setup.sh
22+
. /opt/ros/noetic/setup.sh
2323
catkin_test_results build

Dockerfile

Lines changed: 1 addition & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -1,43 +1,13 @@
1-
FROM ros:noetic-ros-core-focal
1+
FROM ghcr.io/irobot-algorithm/sentry_navigation/environment:latest
22

33
# Create workspace
44
RUN mkdir -p /home/nav_ws
55
WORKDIR /home/nav_ws
66

77
# Copy files
88
ADD src /home/nav_ws/src
9-
ADD thirdparty /home/nav_ws/thirdparty
109
ADD build.sh /home/nav_ws
1110

12-
# Install dependencies
13-
RUN apt-key adv --keyserver keyserver.ubuntu.com --recv-key F6E65AC044F831AC80A06380C8B3A55A6F3EFCDE || apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-key F6E65AC044F831AC80A06380C8B3A55A6F3EFCDE
14-
RUN echo "deb https://librealsense.intel.com/Debian/apt-repo $(lsb_release -cs) main" > /etc/apt/sources.list.d/realsense.list
15-
RUN apt-get update && \
16-
DEBIAN_FRONTEND=noninteractive apt-get install -y build-essential cmake libeigen3-dev libpcl-dev libgoogle-glog-dev libudev-dev git libxrandr-dev libxi-dev libxinerama-dev libsdl2-dev libusb-1.0.0-dev && \
17-
cp -rf /usr/include/eigen3/Eigen /usr/include/Eigen -R
18-
19-
# Install thirdparty dependencies
20-
RUN for file in /home/nav_ws/thirdparty/*; do \
21-
if [ -f "$file" ]; then \
22-
case "$file" in \
23-
*.tar.gz) tar -xzf "$file" -C /home/nav_ws/thirdparty ;; \
24-
*.zip) unzip "$file" -d /home/nav_ws/thirdparty ;; \
25-
*.tar.bz2) tar -xjf "$file" -C /home/nav_ws/thirdparty ;; \
26-
*.tar.xz) tar -xJf "$file" -C /home/nav_ws/thirdparty ;; \
27-
esac; \
28-
rm "$file"; \
29-
fi; \
30-
done
31-
RUN find /home/nav_ws/thirdparty -name "install.sh" -type f -exec bash -c 'cd "$(dirname "{}")" && chmod 777 install.sh && ./install.sh' \;
32-
33-
# # Install ROS dependencies
34-
RUN apt-get install -y ros-noetic-rviz ros-noetic-cv-bridge ros-noetic-pcl-ros \
35-
ros-noetic-tf-conversions ros-noetic-eigen-conversions \
36-
ros-noetic-ddynamic-reconfigure ros-noetic-diagnostic-updater \
37-
ros-noetic-image-geometry ros-noetic-costmap-2d \
38-
ros-noetic-nav-core ros-noetic-navfn
39-
40-
4111
# Build the workspace
4212
RUN chmod 777 build.sh && \
4313
./build.sh

0 commit comments

Comments
 (0)