Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove references of the interfaces moved to RA #1

Merged
merged 2 commits into from
Jul 29, 2024
Merged

Remove references of the interfaces moved to RA #1

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c1515b4
Remove references of the interfaces moved to RA
OscarMrZ Jul 25, 2024
9f2c5e6
Updating dockerfile.humble
javizqh Jul 29, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 11 additions & 8 deletions scripts/Dockerfile.humble
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,12 +9,7 @@ RUN mkdir -p /opt/jderobot && \

# create workspace and add Robot packages
RUN mkdir -p /home/ws/src
RUN mv /opt/jderobot/hal_interfaces /opt/jderobot/gui_interfaces /opt/jderobot/console_interfaces /opt/jderobot/CustomRobots /opt/jderobot/jderobot_drones /home/ws/src/

# Compiling and sourcing the workspace
WORKDIR /home/ws
RUN /bin/bash -c "source /home/drones_ws/install/setup.bash; rosdep install --from-paths src --ignore-src -r --rosdistro humble -y"
RUN /bin/bash -c "source /opt/ros/humble/setup.bash; colcon build --symlink-install"
RUN mv /opt/jderobot/CustomRobots /opt/jderobot/jderobot_drones /home/ws/src/

ARG IMAGE_TAG
ENV IMAGE_TAG=${IMAGE_TAG}
Expand All @@ -34,14 +29,22 @@ RUN chmod +x /start_vnc.sh /kill_all.sh /entrypoint.sh /start_vnc_gpu.sh
ARG ROBOTICS_ACADEMY=$ROBOTICS_ACADEMY
RUN git clone --depth 1 https://github.com/JdeRobot/RoboticsAcademy.git -b $ROBOTICS_ACADEMY /RoboticsAcademy/

# Add common packages to workspace
RUN mv /RoboticsAcademy/common/hal_interfaces /RoboticsAcademy/common/gui_interfaces /RoboticsAcademy/common/console_interfaces /home/ws/src/

# Compiling and sourcing the workspace
WORKDIR /home/ws
RUN /bin/bash -c "source /home/drones_ws/install/setup.bash; rosdep install --from-paths src --ignore-src -r --rosdistro humble -y"
RUN /bin/bash -c "source /opt/ros/humble/setup.bash; colcon build --symlink-install"

# Relocate RAM
RUN mkdir /RoboticsAcademy/src && mv /RoboticsApplicationManager/* /RoboticsAcademy/src

# build react_fronted
RUN cd /RoboticsAcademy/react_frontend/ && yarn install && yarn run build

# Django server
EXPOSE 8000
EXPOSE 7164

# Manager websocket
EXPOSE 7163
Expand Down Expand Up @@ -71,4 +74,4 @@ WORKDIR /

# Setting environment in both interactive or non-interactive shells
ENV BASH_ENV /.env
ENTRYPOINT ["./entrypoint.sh"]
ENTRYPOINT ["./entrypoint.sh"]
Loading