mawei/agnos-builder
1
0
Fork 0
mirror of https://github.com/commaai/agnos-builder.git synced 2026-10-01 03:43:49 +08:00
Code Issues Packages Projects Releases Wiki Activity

Reverted apt capnproto & ffmpeg

Browse Source
This commit is contained in:
Andrei Radulescu
2024-01-18 19:56:39 +02:00
parent 76f7b744db
commit 80ec8c6d58
1 changed files with 11 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Dockerfile.agnos
+11 -22
View File
@@ -32,8 +32,7 @@ RUN /tmp/agnos/openpilot_dependencies.sh
# ################## #
FROM agnos-base as agnos-compiler
# checkinstall issue
# RUN apt-get update && apt-get install --no-install-recommends checkinstall
RUN apt-get update && apt-get install --no-install-recommends checkinstall
# Install openpilot dependencies, probably needed for build,
# but we don't want these in the base image
@@ -42,15 +41,13 @@ FROM agnos-base as agnos-compiler
# Individual compiling images
# checkinstall issue
# FROM agnos-compiler as agnos-compiler-capnp
# COPY ./userspace/compile-capnp.sh /tmp/agnos/
# RUN /tmp/agnos/compile-capnp.sh
FROM agnos-compiler as agnos-compiler-capnp
COPY ./userspace/compile-capnp.sh /tmp/agnos/
RUN /tmp/agnos/compile-capnp.sh
# checkinstall issue
# FROM agnos-compiler as agnos-compiler-ffmpeg
# COPY ./userspace/compile-ffmpeg.sh /tmp/agnos/
# RUN /tmp/agnos/compile-ffmpeg.sh
FROM agnos-compiler as agnos-compiler-ffmpeg
COPY ./userspace/compile-ffmpeg.sh /tmp/agnos/
RUN /tmp/agnos/compile-ffmpeg.sh
FROM agnos-compiler as agnos-compiler-mapbox-gl-native
COPY ./userspace/compile-mapbox-gl-native.sh /tmp/agnos/
@@ -73,12 +70,8 @@ COPY ./userspace/compile-modemmanager.sh /tmp/agnos/
RUN /tmp/agnos/compile-modemmanager.sh
# Pre-compiled capnp (must be before python install)
# Install capnproto from ubuntu (because checkinstall issue)
RUN apt-get update && apt-get install -y --no-install-recommends capnproto libcapnp-dev
# COPY --from=agnos-compiler-capnp /tmp/capnproto.deb /tmp/capnproto.deb
# RUN cd /tmp && apt-get -o Dpkg::Options::="--force-overwrite" install -yq ./capnproto.deb
COPY --from=agnos-compiler-capnp /tmp/capnproto.deb /tmp/capnproto.deb
RUN cd /tmp && apt-get -o Dpkg::Options::="--force-overwrite" install -yq ./capnproto.deb
# Install openpilot dependencies
# COPY ./userspace/openpilot_dependencies.sh /tmp/agnos/
@@ -87,12 +80,8 @@ COPY ./userspace/openpilot_python_dependencies.sh /tmp/agnos/
RUN /tmp/agnos/openpilot_python_dependencies.sh
# Use other pre-compiled packages
# Install ffmpeg from ubuntu (because checkinstall issue)
RUN apt-get update && apt-get install -y --no-install-recommends ffmpeg
# COPY --from=agnos-compiler-ffmpeg /tmp/ffmpeg.deb /tmp/ffmpeg.deb
# RUN cd /tmp && apt-get -o Dpkg::Options::="--force-overwrite" install -yq ./ffmpeg.deb
COPY --from=agnos-compiler-ffmpeg /tmp/ffmpeg.deb /tmp/ffmpeg.deb
RUN cd /tmp && apt-get -o Dpkg::Options::="--force-overwrite" install -yq ./ffmpeg.deb
COPY --from=agnos-compiler-mapbox-gl-native /tmp/libqmapboxgl.so /lib/aarch64-linux-gnu/libqmapboxgl.so