no double imports

Makefile

@@ -6,8 +6,6 @@ vnc: buildvnc
 	docker-compose up vnc
 parabola: buildparabola
 	docker-compose up parabola
-waylandvnc: buildwaylandvnc
-	docker-compose up waylandvnc
 
 buildbase:
 	docker-compose build base
@@ -17,21 +15,18 @@ buildvnc: buildxorg
 	docker-compose build vnc
 buildparabola: buildbase
 	docker-compose build parabola
-buildwaylandvnc: buildxorg
-	docker-compose build waylandvnc
 
 buildall: buildbase buildxorg buildvnc buildparabola
 
 updateall:
 	docker pull archlinux
-	docker-compose build --no-cache base
-	docker-compose build --no-cache xorg
-	docker-compose build --no-cache vnc
-	docker-compose build --no-cache parabola
-	docker-compose build --no-cache waylandvnc
+	docker-compose build --no-cache
+	# docker-compose build --no-cache xorg
+	# docker-compose build --no-cache vnc
+	# docker-compose build --no-cache parabola
 	docker-compose push
 
 push: buildall
 	docker-compose push
 
-.PHONY: base xorg vnc parabola waylandvnc
+.PHONY: base xorg vnc parabola

docker-compose.yml

@@ -33,31 +33,13 @@ 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
-      - arch_home:/home/marc
-
-  waylandvnc:
-    image: marcpartensky/arch:waylandvnc
-    build:
-      context: waylandvnc
-    # user: $USER
-    ports:
-      - "18080:8080"
-      - "15900:5900"
-    tmpfs:
-      - /tmp
-      - /run
-    volumes:
-      # - /var/run/docker.sock:/var/run/docker.sock
-      - /sys/fs/cgroup:/sys/fs/cgroup:ro
-      - arch_pacman:/var/cache/pacman/pkg
-      - arch_home:/home/marc
+      - /srv/arch/home/marc:/home/marc
 
   parabola:
     image: marcpartensky/arch:parabola
@@ -66,4 +48,3 @@ services:
 
 volumes:
   arch_pacman:
-  arch_home:

vnc/Dockerfile

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

vnc/entrypoint.sh

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

vnc/supervisord.ini

@@ -1,27 +1,30 @@
 [supervisord]
 nodaemon=true
+; nodaemon=false
 
-[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
+[program:X11]
+command=/usr/bin/Xvfb :0 -screen 0 1820x980x8
 autorestart=true
 user=marc
 priority=1
 
+; [program:startx]
+; command=startx
+; autorestart=true
+; priority=1
+
 [program:picom]
-command=picom
+command=zsh -c "sleep 5 && picom -b"
 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
@@ -51,7 +54,6 @@ user=root
 priority=5
 
 [program:alacritty]
-command=alacritty -e neofetch"
-autorestart=false
+command=alacritty -e sh -c "picom -b"
 user=marc
 priority=5

waylandvnc/Dockerfile

@@ -1,27 +0,0 @@
-FROM marcpartensky/arch:xorg
-LABEL maintainer=<marc.partensky@gmail.com>
-
-USER marc
-RUN paru -Syyyu --noconfirm \
-    hyprland-bin \
-    hyprpaper-git \
-    wayvnc \
-    waybar \
-    wpaperd \
-    grim \
-    wf-recorder \
-    swappy
-
-RUN go env -w GO111MODULE=off
-RUN go get -u github.com/d4l3k/go-sct/cmd/waysct
-
-# waysct, wpaperd
-
-USER root
-COPY crontab.txt /var/spool/cron/marc
-RUN chmod 600 /var/spool/cron/marc
-
-USER marc
-COPY entrypoint.sh /opt/arch/
-COPY supervisord.conf /etc/supervisord.conf
-ENTRYPOINT [ "/opt/arch/entrypoint.sh" ]

waylandvnc/crontab.txt

@@ -1 +0,0 @@
-* * * * * /home/marc/.local/bin/wpp -n

waylandvnc/entrypoint.sh

@@ -1,4 +0,0 @@
-#!/bin/sh
-
-export WALLPAPERS_PATH=/home/marc/wallpapers
-supervisord -l /tmp/supervisord.log

waylandvnc/supervisord.conf

@@ -1,52 +0,0 @@
-[supervisord]
-nodaemon=true
-
-[rpcinterface:supervisor]
-supervisor.rpcinterface_factory = supervisor.rpcinterface:make_main_rpcinterface
-
-[unix_http_server]
-file=/tmp/supervisord.sock
-
-[supervisorctl]
-serverurl=unix:///tmp/supervisord.sock
-
-[program:wayvnc]
-command=wayvnc
-autorestart=true
-user=marc
-priority=1
-
-[program:hyprland]
-command=Hyprland
-autorestart=true
-user=marc
-priority=3
-
-[program:noVNC]
-command=/sbin/novnc --vnc localhost:5900 --listen 8080
-autorestart=true
-user=marc
-priority=3
-
-[program:hyprpaper]
-command=hyprpaper
-autorestart=true
-user=marc
-priority=4
-
-[program:waybar]
-command=waybar
-autorestart=true
-user=marc
-priority=4
-
-[program:cron]
-command=crond -f
-user=root
-priority=5
-
-[program:alacritty]
-command=alacritty -e neofetch"
-autorestart=false
-user=marc
-priority=5

xorg/Dockerfile

@@ -1,6 +1,6 @@
 FROM marcpartensky/arch
 
-RUN paru -Syyyu --noconfirm \
+RUN paru -Syyy --noconfirm \
 	net-tools \
 	supervisor \
     firefox \
@@ -46,6 +46,6 @@ RUN make -C git/shell
 
 USER root
 COPY entrypoint.sh entrypoint.sh
-COPY supervisord.conf /etc/supervisord.conf
+COPY supervisord.ini /etc/supervisor.d/supervisord.ini
 ENTRYPOINT [ "./entrypoint.sh" ]
 # ENTRYPOINT [ "DISPLAY=:0", "Xephyr", ":1" ]

xorg/entrypoint.sh

@@ -3,4 +3,4 @@
 export WALLPAPERS_PATH=/home/marc/wallpapers
 # export DISPLAY=:0
 # Xephyr :1 -extension MIT-SHM
-supervisord -l /tmp/supervisord.log
+/usr/bin/supervisord -c /etc/supervisor.d/supervisord.ini