Skip to content

Commit 67943a3

Browse files
committed
🐋 update dockerfile
1 parent 0de5f28 commit 67943a3

File tree

1 file changed

+24
-13
lines changed

1 file changed

+24
-13
lines changed

Dockerfile

+24-13
Original file line numberDiff line numberDiff line change
@@ -1,36 +1,47 @@
1-
FROM ros:melodic-ros-core
1+
FROM ros:noetic-ros-core
22

33
# Install packages
44
RUN apt-get update && apt-get install -y \
55
vim \
6-
default-jdk \
7-
python-pathlib \
86
wget \
97
unzip \
8+
python3-rosdep \
9+
python3-rosinstall \
10+
python3-rosinstall-generator \
11+
python3-wstool \
12+
build-essential \
13+
openjdk-17-jdk \
1014
&& rm -rf /var/lib/apt/lists/
1115

16+
RUN rosdep init
17+
1218
# Set java home
13-
ENV JAVA_HOME=/usr/lib/jvm/default-java
19+
ENV JAVA_HOME=/usr/lib/jvm/java-17-openjdk-amd64
1420

1521
# Install gradle
16-
RUN ["/bin/bash", "-c", "wget https://services.gradle.org/distributions/gradle-5.5.1-bin.zip -P /tmp && \
22+
RUN ["/bin/bash", "-c", "wget https://services.gradle.org/distributions/gradle-8.1-bin.zip -P /tmp && \
1723
unzip -d /opt/gradle /tmp/gradle-*.zip"]
18-
ENV GRADLE_HOME=/opt/gradle/gradle-5.5.1
24+
ENV GRADLE_HOME=/opt/gradle/gradle-8.1
1925
ENV PATH=${GRADLE_HOME}/bin:${PATH}
2026

21-
RUN [ "/bin/bash","-c","source /opt/ros/melodic/setup.bash && \
27+
RUN [ "/bin/bash","-c","source /opt/ros/noetic/setup.bash && \
2228
mkdir -p /jason_ros_ws/src && \
2329
cd /jason_ros_ws/src && catkin_init_workspace"]
2430

25-
COPY hw_bridge/ /jason_ros_ws/src
26-
COPY jason_msgs/ /jason_ros_ws/src
31+
COPY jason_ros/ /jason_ros_ws/src/jason_ros/jason_ros/
32+
COPY jason_ros_msgs/ /jason_ros_ws/src/jason_ros/jason_ros_msgs/
33+
COPY jason_ros_comm/ /jason_ros_ws/src/jason_ros/jason_ros_comm/
34+
35+
WORKDIR /jason_ros_ws/
36+
RUN [ "/bin/bash","-c","source /opt/ros/noetic/setup.bash \
37+
&& apt update && rosdep update \
38+
&& rosdep install --from-paths src --ignore-src -r -y \
39+
&& rm -rf /var/lib/apt/lists/"]
2740

28-
RUN [ "/bin/bash","-c","source /opt/ros/melodic/setup.bash && \
41+
RUN [ "/bin/bash","-c","source /opt/ros/noetic/setup.bash && \
2942
cd /jason_ros_ws && catkin_make"]
3043

31-
COPY rosjava_agents/ /rosjava_agents/
32-
WORKDIR /rosjava_agents
33-
RUN ["/bin/bash","-c","gradle build"]
44+
COPY examples/ /jason_ros_ws/src/jason_ros/examples/
3445

3546
COPY entrypoint.sh /
3647
ENTRYPOINT ["/entrypoint.sh"]

0 commit comments

Comments
 (0)