From cffbf46639303abf9ec94121ad317637a26a8216 Mon Sep 17 00:00:00 2001
From: Wanjohi <71614375+wanjohiryan@users.noreply.github.com>
Date: Tue, 16 Apr 2024 02:39:27 +0300
Subject: [PATCH] =?UTF-8?q?=F0=9F=90=9B=20fix(server):=20Clean=20up=20the?=
 =?UTF-8?q?=20supervisord.conf=20and=20COPY=20supervisord.conf=20to=20/etc?=
 =?UTF-8?q?=20(#22)?=
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):**
Docker build server fails because `supervisord.conf` is getting copied
to a different directory other than `/etc`
**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
---
 .scripts/supervisord.conf | 6 +++---
 server.Dockerfile         | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/.scripts/supervisord.conf b/.scripts/supervisord.conf
index 9b12c64c..a7571015 100644
--- a/.scripts/supervisord.conf
+++ b/.scripts/supervisord.conf
@@ -1,12 +1,12 @@
 [supervisord]
-user=netris
+user=ubuntu
 nodaemon=true
 loglevel=info
 logfile=/tmp/supervisord.log
 pidfile=/tmp/supervisord.pid
 
 [program:entrypoint]
-command=/usr/bin/netris/entrypoint.sh
+command=/etc/entrypoint.sh
 logfile=/tmp/entrypoint.log
 pidfile=/tmp/entrypoint.pid
 stopsignal=INT
@@ -16,7 +16,7 @@ redirect_stderr=true
 priority=1
 
 [program:pulseaudio]
-user=netris
+user=ubuntu
 command=bash -c "until [ -S \"/tmp/.X11-unix/X${DISPLAY/:/}\" ]; do sleep 1; done; sudo /usr/bin/pulseaudio -k >/dev/null 2>&1 || sudo /usr/bin/pulseaudio --system --verbose --log-target=stderr --realtime=true --disallow-exit -L 'module-native-protocol-tcp auth-ip-acl=127.0.0.0/8 port=4713 auth-anonymous=1'"
 environment=DISPLAY=":0"
 logfile=/tmp/pulseaudio.log
diff --git a/server.Dockerfile b/server.Dockerfile
index 790e2eea..c73a2027 100644
--- a/server.Dockerfile
+++ b/server.Dockerfile
@@ -42,7 +42,7 @@ RUN apt-get update && apt-get install --no-install-recommends -y \
 
 COPY warp /usr/bin/netris/
 RUN chmod +x /usr/bin/netris/warp
-COPY .scripts/entrypoint.sh .scripts/supervisord.conf /etc/netris/
+COPY .scripts/entrypoint.sh .scripts/supervisord.conf /etc/
 RUN chmod 755 /etc/supervisord.conf /etc/entrypoint.sh
 
 USER 1000