Skip to content

Commit 740baa7

Browse files
committed
More supervisod and Dockerfile updates
1 parent 5166fba commit 740baa7

File tree

2 files changed

+19
-3
lines changed

2 files changed

+19
-3
lines changed

packages/bytebotd/Dockerfile

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -187,6 +187,9 @@ RUN mkdir -p /var/run/dbus && \
187187
chmod 755 /var/run/dbus && \
188188
chown user:user /var/run/dbus
189189

190+
RUN mkdir -p /tmp/bytebot-screenshots && \
191+
chown -R user:user /tmp/bytebot-screenshots
192+
190193
# -----------------------------------------------------------------------------
191194
# Copy staged system files and keep sane permissions
192195
# -----------------------------------------------------------------------------
@@ -211,7 +214,9 @@ RUN mkdir -p /home/user/Desktop && \
211214
chmod +x /home/user/Desktop/*.desktop && \
212215
chown user:user /home/user/Desktop/*.desktop
213216

214-
USER user
217+
RUN mkdir -p /home/user/.config /home/user/.local/share /home/user/.cache \
218+
&& chown -R user:user /home/user/.config /home/user/.local /home/user/.cache
219+
215220
WORKDIR /home/user
216221

217222
# -----------------------------------------------------------------------------

packages/bytebotd/root/etc/supervisor/conf.d/supervisord.conf

Lines changed: 13 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
[supervisord]
2+
user=root
23
nodaemon=true
34
logfile=/dev/stdout
45
logfile_maxbytes=0
@@ -25,6 +26,7 @@ redirect_stderr=true
2526

2627
[program:xvfb]
2728
command=Xvfb :0 -screen 0 1280x960x24 -ac -nolisten tcp
29+
user=user
2830
autostart=true
2931
autorestart=true
3032
startsecs=5
@@ -34,8 +36,15 @@ stdout_logfile_maxbytes=0
3436
redirect_stderr=true
3537

3638
[program:xfce4]
37-
command=sh -c 'sleep 5 && startxfce4'
38-
environment=DISPLAY=":0"
39+
user=user
40+
command=sh -c 'sleep 5 && \
41+
export XDG_CONFIG_HOME=$HOME/.config && \
42+
export XDG_DATA_HOME=$HOME/.local/share && \
43+
export XDG_CACHE_HOME=$HOME/.cache && \
44+
export XDG_CONFIG_DIRS=/etc/xdg && \
45+
export XDG_DATA_DIRS=/usr/share && \
46+
exec dbus-launch --exit-with-session startxfce4'
47+
environment=DISPLAY=":0",HOME="/home/user"
3948
autostart=true
4049
autorestart=true
4150
startsecs=5
@@ -47,6 +56,7 @@ depends_on=xvfb
4756

4857
[program:x11vnc]
4958
command=x11vnc -display :0 -N -forever -shared -rfbport 5900
59+
user=user
5060
autostart=true
5161
autorestart=true
5262
startsecs=5
@@ -69,6 +79,7 @@ redirect_stderr=true
6979
depends_on=x11vnc
7080

7181
[program:bytebotd]
82+
user=user
7283
command=node /bytebotd/dist/main.js
7384
directory=/bytebotd
7485
autostart=true

0 commit comments

Comments
 (0)