From ee3f70ab83edc62839ac0a022d8c6955c03088a2 Mon Sep 17 00:00:00 2001 From: Andrei Radulescu Date: Mon, 15 Jan 2024 15:45:57 +0000 Subject: [PATCH] openpilot_dependencies.sh change --- Dockerfile.agnos | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/Dockerfile.agnos b/Dockerfile.agnos index f40a20d..781dba7 100644 --- a/Dockerfile.agnos +++ b/Dockerfile.agnos @@ -23,6 +23,10 @@ RUN echo "resolvconf resolvconf/linkify-resolvconf boolean false" | debconf-set- COPY ./userspace/base_setup.sh /tmp/agnos RUN /tmp/agnos/base_setup.sh +# Install openpilot dependencies +COPY ./userspace/openpilot_dependencies.sh /tmp/agnos/ +RUN /tmp/agnos/openpilot_dependencies.sh + # ################## # # #### Compiler #### # # ################## # @@ -31,8 +35,8 @@ FROM agnos-base as agnos-compiler 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 -COPY ./userspace/openpilot_dependencies.sh /tmp/agnos/ -RUN /tmp/agnos/openpilot_dependencies.sh +# COPY ./userspace/openpilot_dependencies.sh /tmp/agnos/ +# RUN /tmp/agnos/openpilot_dependencies.sh # Individual compiling images FROM agnos-compiler as agnos-compiler-capnp @@ -68,8 +72,8 @@ 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/ -RUN /tmp/agnos/openpilot_dependencies.sh +# COPY ./userspace/openpilot_dependencies.sh /tmp/agnos/ +# RUN /tmp/agnos/openpilot_dependencies.sh COPY ./userspace/openpilot_python_dependencies.sh /tmp/agnos/ RUN /tmp/agnos/openpilot_python_dependencies.sh