From 9131344d309aa7f916de5679b4746e0b098eda9a Mon Sep 17 00:00:00 2001 From: Wanjohi <71614375+wanjohiryan@users.noreply.github.com> Date: Wed, 3 Apr 2024 21:58:29 +0000 Subject: [PATCH] =?UTF-8?q?=E2=9C=A8=20feat(server):=20Integrate=20gpu-scr?= =?UTF-8?q?een-recorder=20into=20the=20server=20(#11)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ## Description **What(what issue does this code solve/what feature does it add):** We succesfully built the gpu-screen-recorder in a separate container... now we need to add it into the main container **How(how does it solve it):** 1. Copy the relevant user/bin files from the separate docker image 2. ## Required Checklist: - [x] I have added any necessary documentation and comments in my code (where appropriate) - [ ] I have added tests to make sure my code runs in all contexts ## Further comments --- server.Dockerfile | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/server.Dockerfile b/server.Dockerfile index dc1aef8a..39a78f5b 100644 --- a/server.Dockerfile +++ b/server.Dockerfile @@ -1,5 +1,7 @@ #This contains all the necessary libs for the server to work. #NOTE: KEEP THIS IMAGE AS LEAN AS POSSIBLE. +FROM ghcr.io/wanjohiryan/netris/recorder:nightly as recorder + FROM ubuntu:23.10 ENV DEBIAN_FRONTEND=noninteractive \ @@ -126,4 +128,7 @@ ADD https://github.com/krallin/tini/releases/download/${TINI_VERSION}/tini /tini RUN chmod +x /tini ENTRYPOINT ["/tini", "--"] +COPY --from=recorder /usr/bin/gpu-screen-recorder /usr/bin/gpu-screen-recorder +COPY --from=recorder /usr/bin/gsr-kms-server /usr/bin/gsr-kms-server + CMD [ "/usr/bin/netris/entrypoint.sh" ] \ No newline at end of file