Skip to content

Commit

Permalink
Merge pull request #7 from tiiuae/fix-mismatch-gz-transport-dep
Browse files Browse the repository at this point in the history
Use build base image from gz-sim-server
  • Loading branch information
haitomatic authored May 31, 2024
2 parents 67d2e44 + 7eb240c commit 02fd3d4
Showing 1 changed file with 2 additions and 11 deletions.
13 changes: 2 additions & 11 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,6 +1,4 @@
FROM ubuntu:22.04 AS builder

ENV DEBIAN_FRONTEND=noninteractive
FROM ghcr.io/tiiuae/gz-sim-server:main AS builder

RUN apt-get update -y \
&& apt install -y \
Expand All @@ -11,12 +9,6 @@ RUN apt-get update -y \
libboost-filesystem-dev \
libtinyxml-dev

RUN sh -c 'echo "deb http://packages.osrfoundation.org/gazebo/ubuntu-stable `lsb_release -cs` main" > /etc/apt/sources.list.d/gazebo-stable.list' \
&& wget http://packages.osrfoundation.org/gazebo.key -O - | apt-key add - \
&& apt update -y

RUN apt install -y libgz-sim8-dev

# Clone c_library_v2 commit matching with current px4-firmware mavlink commit
# => mavlink/c_library_v2:fbdb7c29 is built from mavlink/mavlink:08112084
RUN git clone -q https://github.com/mavlink/c_library_v2.git /usr/local/include/mavlink && \
Expand All @@ -35,5 +27,4 @@ RUN ./build.sh
FROM busybox

WORKDIR /artifacts
COPY --from=builder /px4-plugins/build/*.so /artifacts

COPY --from=builder /px4-plugins/build/*.so /artifacts

0 comments on commit 02fd3d4

Please sign in to comment.