github-mirrors/netris-nestri
1
0
Fork 0
mirror of https://github.com/nestriness/nestri.git synced 2025-12-12 16:55:37 +02:00
Code Issues Packages Projects Releases Wiki Activity

🐛 fix(server): Clean up the supervisord.conf and COPY supervisord.conf to /etc (#22)

Browse Source 
## 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
This commit is contained in:
Wanjohi
2024-04-16 02:39:27 +03:00
committed by GitHub
parent c2c3590b0c
commit cffbf46639
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
.scripts/supervisord.conf
View File

@@ -1,12 +1,12 @@
[supervisord] [supervisord]
user=netris user=ubuntu
nodaemon=true nodaemon=true
loglevel=info loglevel=info
logfile=/tmp/supervisord.log logfile=/tmp/supervisord.log
pidfile=/tmp/supervisord.pid pidfile=/tmp/supervisord.pid
[program:entrypoint] [program:entrypoint]
command=/usr/bin/netris/entrypoint.sh command=/etc/entrypoint.sh
logfile=/tmp/entrypoint.log logfile=/tmp/entrypoint.log
pidfile=/tmp/entrypoint.pid pidfile=/tmp/entrypoint.pid
stopsignal=INT stopsignal=INT
@@ -16,7 +16,7 @@ redirect_stderr=true
priority=1 priority=1
[program:pulseaudio] [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'" 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" environment=DISPLAY=":0"
logfile=/tmp/pulseaudio.log logfile=/tmp/pulseaudio.log

2
server.Dockerfile
View File

@@ -42,7 +42,7 @@ RUN apt-get update && apt-get install --no-install-recommends -y \
COPY warp /usr/bin/netris/ COPY warp /usr/bin/netris/
RUN chmod +x /usr/bin/netris/warp 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 RUN chmod 755 /etc/supervisord.conf /etc/entrypoint.sh
USER 1000 USER 1000