From 0642d0b787344647058944a4ba60de7e98bdc4de Mon Sep 17 00:00:00 2001 From: Kristian Ollikainen <14197772+DatCaptainHorse@users.noreply.github.com> Date: Sat, 1 Feb 2025 16:30:03 +0200 Subject: [PATCH] =?UTF-8?q?=F0=9F=90=9C=20fix(runner):=20gst-wayland-displ?= =?UTF-8?q?ay=20directory=20fix=20(#178)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: DatCaptainHorse --- containers/runner.Containerfile | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/containers/runner.Containerfile b/containers/runner.Containerfile index 2705ddb9..40e6d521 100644 --- a/containers/runner.Containerfile +++ b/containers/runner.Containerfile @@ -100,7 +100,7 @@ ENV CARGO_TARGET_DIR=/builder/target # Build and install directly to artifacts RUN --mount=type=cache,target=${CARGO_HOME}/registry \ --mount=type=cache,target=/builder/target \ - cargo cinstall --prefix=${ARTIFACTS}/usr --release + cargo cinstall --prefix=${ARTIFACTS} --release #****************************************************************************** # Final Runtime Stage @@ -171,7 +171,7 @@ RUN mkdir -p /run/dbus && \ ### Artifacts and Verification ### COPY --from=nestri-server-cached-builder /artifacts/nestri-server /usr/bin/ -COPY --from=gst-wayland-cached-builder /artifacts/usr/ /usr/ +COPY --from=gst-wayland-cached-builder /artifacts/lib/ /usr/lib/ RUN which nestri-server && ls -la /usr/lib/gstreamer-1.0/ | grep 'waylanddisplaysrc' ### Scripts and Final Configuration ### @@ -179,7 +179,4 @@ COPY packages/scripts/ /etc/nestri/ RUN chmod +x /etc/nestri/{envs.sh,entrypoint*.sh} && \ locale-gen -COPY --from=nestri-server-cached-builder /artifacts /artifacts -RUN ls -la /artifacts/ - ENTRYPOINT ["supervisord", "-c", "/etc/nestri/supervisord.conf"]