Skip to content

Commit b9c75a5

Browse files
committed
modified Dockerfile
1 parent 5256204 commit b9c75a5

File tree

2 files changed

+44
-22
lines changed

2 files changed

+44
-22
lines changed

.docker/Dockerfile

Lines changed: 17 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -5,14 +5,7 @@ SHELL ["/bin/bash", "-o", "pipefail", "-c"]
55

66
# Install apt dependencies.
77
ARG DEBIAN_FRONTEND=noninteractive
8-
# RUN apt-get update && \
9-
# apt-get upgrade -y && \
10-
# apt-get install -y \
11-
# gcc \
12-
# git \
13-
# wget \
14-
# python3 nlohmann-json3-dev python3-pip portaudio19-dev \
15-
# ros-humble-moveit
8+
169
RUN apt-get update \
1710
&& apt-get -y --quiet --no-install-recommends install \
1811
gcc \
@@ -22,44 +15,41 @@ RUN apt-get update \
2215
python3 \
2316
python3-pip \
2417
ros-humble-moveit \
18+
ros-humble-nav2-bringup \
19+
ros-humble-rmw-cyclonedds-cpp \
2520
nlohmann-json3-dev
2621

2722

2823
# Create a ROS 2 workspace.
2924
RUN mkdir -p /robocup/src/
3025
WORKDIR /robocup
3126

32-
ADD https://raw.githubusercontent.com/mgonzs13/audio_common/refs/heads/main/requirements.txt /robocup/requirements1.txt
33-
ADD https://raw.githubusercontent.com/mgonzs13/whisper_ros/refs/heads/main/requirements.txt /robocup/requirements2.txt
34-
ADD https://raw.githubusercontent.com/mgonzs13/llama_ros/refs/heads/main/requirements.txt /robocup/requirements3.txt
35-
ADD https://raw.githubusercontent.com/jmguerreroh/yolov8_ros/refs/heads/main/requirements.txt /robocup/requirements4.txt
36-
ADD https://raw.githubusercontent.com/mgonzs13/tts_ros/refs/heads/main/requirements.txt /robocup/requirements5.txt
27+
ADD https://raw.githubusercontent.com/mgonzs13/audio_common/refs/heads/main/requirements.txt /robocup/requirements2.txt
28+
ADD https://raw.githubusercontent.com/mgonzs13/whisper_ros/refs/heads/main/requirements.txt /robocup/requirements3.txt
29+
ADD https://raw.githubusercontent.com/mgonzs13/llama_ros/refs/heads/main/requirements.txt /robocup/requirements4.txt
30+
ADD https://raw.githubusercontent.com/jmguerreroh/yolov8_ros/refs/heads/main/requirements.txt /robocup/requirements5.txt
3731

3832
# Install external dependencies.
39-
RUN pip install -r requirements1.txt
33+
RUN pip install coqui-tts
4034
RUN pip install -r requirements2.txt
4135
RUN pip install -r requirements3.txt
4236
RUN pip install -r requirements4.txt
4337
RUN pip install -r requirements5.txt
4438

4539

4640
WORKDIR /robocup/src
47-
RUN git clone https://github.com/juandpenan/CoreSense4Home.git -b humble-devel
41+
RUN git clone https://github.com/CoreSenseEU/CoreSense4Home.git -b humble-devel
4842
RUN vcs import --recursive < ./CoreSense4Home/robocup_bringup/thirdparty.repos
4943

5044
WORKDIR /robocup
5145
RUN rosdep install --from-paths src --ignore-src -r -y
5246

53-
# Remove MatPlotLib display warnings.
54-
RUN mkdir /tmp/runtime-root
55-
ENV XDG_RUNTIME_DIR "/tmp/runtime-root"
56-
RUN chmod -R 0700 /tmp/runtime-root
57-
ENV NO_AT_BRIDGE 1
58-
5947
# Set up the entrypoint.
6048
# Install CUDA nvcc
61-
ARG USE_CUDA
49+
ARG USE_CUDA=1
6250
ARG CUDA_VERSION=12-6
51+
# HOW TO PRINT THE VALUE OF USE_CUDA?
52+
RUN echo "USE_CUDA: $USE_CUDA"
6353

6454
RUN if [ "$USE_CUDA" = "1" ]; then \
6555
wget https://developer.download.nvidia.com/compute/cuda/repos/ubuntu2004/x86_64/cuda-keyring_1.1-1_all.deb && \
@@ -86,16 +76,21 @@ ARG CMAKE_BUILD_TYPE=Release
8676
ENV PATH=/usr/local/cuda/bin${PATH:+:${PATH}}
8777
ENV LD_LIBRARY_PATH=/usr/local/cuda/lib64
8878

79+
RUN echo "export RMW_IMPLEMENTATION=rmw_cyclonedds_cpp" >> ~/.bashrc
80+
8981
RUN source /opt/ros/${ROS_DISTRO}/setup.bash && \
9082
if [ "$USE_CUDA" = "1" ]; then \
9183
source ~/.bashrc && \
9284
colcon build --packages-skip tts_bringup --cmake-args -DGGML_CUDA=ON; \
9385
else \
86+
source ~/.bashrc && \
9487
colcon build --packages-skip tts_bringup; \
9588
fi
9689

9790
# Source the ROS 2 setup file
9891
RUN echo "source /root/robocup/install/setup.bash" >> ~/.bashrc
9992

93+
RUN echo "export ROS_DOMAIN_ID=1" >> ~/.bashrc
94+
10095
# Run a default command, e.g., starting a bash shell
10196
CMD ["bash"]

.github/workflows/humble.yaml

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
name: humble
2+
3+
on:
4+
pull_request:
5+
branches:
6+
- humble-devel
7+
push:
8+
branches:
9+
- humble-devel
10+
schedule:
11+
- cron: '0 0 * * 6'
12+
jobs:
13+
docker_build:
14+
runs-on: ubuntu-latest
15+
steps:
16+
- name: Checkout code
17+
uses: actions/checkout@v4
18+
19+
- name: Set up Docker Buildx
20+
uses: docker/setup-buildx-action@v3
21+
22+
- name: Build Docker
23+
uses: docker/build-push-action@v6
24+
with:
25+
build-args: USE_CUDA=0
26+
file: .docker/Dockerfile
27+
push: false

0 commit comments

Comments
 (0)