From a8e4fd055789f9f33f3c12fcacab9941d49ccb68 Mon Sep 17 00:00:00 2001 From: Justin Newberry Date: Mon, 23 Oct 2023 09:17:31 -0700 Subject: [PATCH] move harware setup up --- Dockerfile.agnos | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/Dockerfile.agnos b/Dockerfile.agnos index 79fdd259..61eaf5c6 100644 --- a/Dockerfile.agnos +++ b/Dockerfile.agnos @@ -103,6 +103,13 @@ RUN export PATH="/usr/local/pyenv/bin:/usr/local/pyenv/shims:$PATH" && \ MAKEFLAGS="-j40" poetry install --no-cache --no-root && \ pyenv rehash +# Hardware setup +RUN mkdir -p /tmp/agnos/debs +COPY ./userspace/debs /tmp/agnos/debs +COPY ./userspace/hardware_setup.sh /tmp/agnos +RUN /tmp/agnos/hardware_setup.sh +RUN mv /data/persist /system/ && rm -rf /data/* + # Install nice to haves COPY ./userspace/install_extras.sh /tmp/agnos/ RUN /tmp/agnos/install_extras.sh @@ -207,13 +214,6 @@ RUN /tmptmp/readonly_setup.sh && rm -rf /tmptmp # copy at the end, after all apt usage COPY ./userspace/files/apt.conf /etc/apt/apt.conf -# Hardware setup -RUN mkdir -p /tmp/agnos/debs -COPY ./userspace/debs /tmp/agnos/debs -COPY ./userspace/hardware_setup.sh /tmp/agnos -RUN /tmp/agnos/hardware_setup.sh -RUN mv /data/persist /system/ && rm -rf /data/* - # Write version file RUN echo -n "8.2" > /VERSION