From 4c6bc98bdc5ee0eb414b65fc086c8fb7b227a8a6 Mon Sep 17 00:00:00 2001 From: Wanjohi <71614375+wanjohiryan@users.noreply.github.com> Date: Tue, 16 Apr 2024 05:04:00 +0300 Subject: [PATCH] =?UTF-8?q?=E2=9C=A8=20feat(server):=20Copy=20warp=20from?= =?UTF-8?q?=20docker=20(#24)?= 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):** **How(how does it solve it):** ## Required Checklist: - [ ] 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 | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/server.Dockerfile b/server.Dockerfile index a101e584..c967f4f4 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/warp:nightly as warp + FROM ghcr.io/wanjohiryan/netris/base:nightly ENV TZ=UTC \ @@ -40,8 +42,8 @@ RUN apt-get update && apt-get install --no-install-recommends -y \ && chown $USERNAME:$USERNAME /home/$USERNAME \ && ln -snf "/usr/share/zoneinfo/$TZ" /etc/localtime && echo "$TZ" > /etc/timezone -# COPY warp /usr/bin/netris/ -# RUN chmod +x /usr/bin/netris/warp +COPY --from=warp /usr/bin/warp /usr/bin/ +RUN chmod +x /usr/bin/warp COPY .scripts/entrypoint.sh .scripts/supervisord.conf /etc/ RUN chmod 755 /etc/supervisord.conf /etc/entrypoint.sh