geometry

docker-compose.yml

@@ -33,13 +33,14 @@ services:
     image: marcpartensky/arch:vnc
     build:
       context: vnc
+    # user: $USER
     ports:
       - "18080:8080"
       - "15900:5900"
     volumes:
       # - /var/run/docker.sock:/var/run/docker.sock
       - arch_pacman:/var/cache/pacman/pkg
-      - /srv/arch/home/marc:/home/marc
+      - arch_home:/home/marc
 
   parabola:
     image: marcpartensky/arch:parabola
@@ -48,3 +49,4 @@ services:
 
 volumes:
   arch_pacman:
+  arch_home:

vnc/Dockerfile

@@ -7,25 +7,21 @@ ENV DISPLAY=:0.0
 
 # Install packages
 RUN paru -Syyyu --noconfirm \
-	x11vnc \
+    # xorg-server required for xdummy
+	xorg-server \
+    # xorg-server-utils \
+	xorg-server-xvfb \
+    # xf86-video-dummy \
+	tigervnc \
     novnc \
     cron \
-	# xorg-server \
-	# xorg-server-utils \
-    ttf-meslo-nerd-font-powerlevel10k \
-	# xorg-server-xvfb
-    xf86-video-dummy
+    ttf-meslo-nerd-font-powerlevel10k
 
 USER root
 COPY crontab.txt /var/spool/cron/marc
 RUN chmod 600 /var/spool/cron/marc
 
 USER marc
-COPY supervisord.ini /etc/supervisor.d/supervisord.ini
-
-USER root
-RUN pwd
-RUN ls
-COPY entrypoint.sh /root/entrypoint.sh
-ENTRYPOINT [ "/root/entrypoint.sh" ]
+COPY supervisord.conf entrypoint.sh /opt/arch/
+ENTRYPOINT [ "/opt/arch/entrypoint.sh" ]
 # ENTRYPOINT ["/usr/bin/supervisord", "-c", "/etc/supervisor.d/supervisord.ini"]

vnc/entrypoint.sh

@@ -1,4 +1,4 @@
-#!/sbin/zsh
+#!/bin/sh
 
 export WALLPAPERS_PATH=/home/marc/wallpapers
-/usr/bin/supervisord -c /etc/supervisor.d/supervisord.ini
+supervisord -c /opt/arch/supervisord.conf -l /tmp/supervisord.log

vnc/supervisord.conf

@@ -1,30 +1,27 @@
 [supervisord]
 nodaemon=true
-; nodaemon=false
 
-[program:X11]
-command=/usr/bin/Xvfb :0 -screen 0 1820x980x8
+[rpcinterface:supervisor]
+supervisor.rpcinterface_factory = supervisor.rpcinterface:make_main_rpcinterface
+
+[unix_http_server]
+file=/tmp/supervisord.sock
+
+[supervisorctl]
+serverurl=unix:///tmp/supervisord.sock
+
+[program:xvnc]
+command=Xvnc :0 -SecurityTypes None -geometry 1820x980
 autorestart=true
 user=marc
 priority=1
 
-; [program:startx]
-; command=startx
-; autorestart=true
-; priority=1
-
 [program:picom]
-command=zsh -c "sleep 5 && picom -b"
+command=picom
 user=marc
 autorestart=true
 priority=2
 
-[program:x11vnc]
-command=/usr/bin/x11vnc -shared -forever
-autorestart=true
-user=marc
-priority=2
-
 [program:dwm]
 command=/usr/local/bin/dwm
 autorestart=true