Skip to content
Closed
Changes from all commits
Commits
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
10 changes: 10 additions & 0 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,10 @@ ENV DEBIAN_FRONTEND=noninteractive DEBCONF_NONINTERACTIVE_SEEN=true
ENV DISPLAY :99
ENV LANG C.UTF-8

# Set environment variables for metadata
ENV PX4_METADATA=1
ENV CONFIG_BOARD_CONSTRAINED_FLASH=n

RUN apt-get update && \
apt-get install -y wget lsb-release && \
apt-get -y autoremove && \
Expand Down Expand Up @@ -68,6 +72,12 @@ RUN ["/bin/bash", "-c", " \
DONT_RUN=1 make px4_sitl gazebo \
"]

# Create metadata directory with proper permissions
RUN mkdir -p ${FIRMWARE_DIR}/build/px4_sitl_default/component_metadata && \
chmod -R 777 ${FIRMWARE_DIR}/build/px4_sitl_default/component_metadata && \
cd ${FIRMWARE_DIR} && \
DONT_RUN=1 PX4_METADATA=1 CONFIG_BOARD_CONSTRAINED_FLASH=n make px4_sitl_default
Comment on lines +76 to +79
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Do we have to run that after the RUN of line 69? Or could we merge both RUNs?

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can probably merge them

Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Would you mind trying? That would simplify the code 😊


COPY sitl_rtsp_proxy ${SITL_RTSP_PROXY}
RUN cmake -B${SITL_RTSP_PROXY}/build -H${SITL_RTSP_PROXY}
RUN cmake --build ${SITL_RTSP_PROXY}/build
Expand Down
Loading