wpaperd instead of hyprpaper

.github/workflows/docker-build-test.yml

@@ -1,6 +1,8 @@
-name: Build all sequentially to test builds
+name: Docker
 
 on:
+  schedule:
+  - cron: "0 4 * * *" # everyday at 4 am
   push:
     branches:
       - '*'         # matches every branch that doesn't contain a '/'
@@ -15,114 +17,23 @@ on:
   pull_request:
 
 jobs:
-  base:
+  build:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v3
-    - uses: docker/setup-buildx-action@v2
-
-    - name: Build and export
-      uses: docker/build-push-action@v3
-      with:
-        context: base
-        tags: marcpartensky/arch:base
-        outputs: type=docker,dest=/tmp/base.tar
-
-    - name: Upload artifact
-      uses: actions/upload-artifact@v3
-      with:
-        name: base
-        path: /tmp/base.tar
-
-  xorg:
-    needs: base
-    runs-on: ubuntu-latest
-    steps:
-    - uses: actions/checkout@v3
-    - uses: docker/setup-buildx-action@v2
-
-    - name: Download artifact
-      uses: actions/download-artifact@v3
-      with:
-        name: base
-        path: /tmp  
-
-    - name: Load image
-      run: |
-        docker load --input /tmp/base.tar
-        docker image ls -a
-
-    - name: Build and export
-      uses: docker/build-push-action@v3
-      with:
-        context: xorg
-        tags: marcpartensky/arch:xorg
-        outputs: type=docker,dest=/tmp/xorg.tar
-
-    - name: Upload artifact
-      uses: actions/upload-artifact@v3
-      with:
-        name: xorg
-        path: /tmp/xorg.tar
-
-  vnc:
-    needs: xorg
-    runs-on: ubuntu-latest
-    steps:
-    - uses: actions/checkout@v3
-    - uses: docker/setup-buildx-action@v2
-
-    - name: Download artifact
-      uses: actions/download-artifact@v3
-      with:
-        name: xorg
-        path: /tmp  
-
-    - name: Load image
-      run: |
-        docker load --input /tmp/xorg.tar
-        docker image ls -a
-
-    - name: Build and export
-      uses: docker/build-push-action@v3
-      with:
-        context: vnc
-        tags: marcpartensky/arch:vnc
-        outputs: type=docker,dest=/tmp/vnc.tar
-
-    - name: Upload artifact
-      uses: actions/upload-artifact@v3
-      with:
-        name: vnc
-        path: /tmp/vnc.tar
-
-  parabola:
-    needs: xorg
-    runs-on: ubuntu-latest
-    steps:
-    - uses: actions/checkout@v3
-    - uses: docker/setup-buildx-action@v2
-
-    - name: Download artifact
-      uses: actions/download-artifact@v3
-      with:
-        name: xorg
-        path: /tmp  
-
-    - name: Load image
-      run: |
-        docker load --input /tmp/xorg.tar
-        docker image ls -a
-
-    - name: Build and export
-      uses: docker/build-push-action@v3
-      with:
-        context: parabola
-        tags: marcpartensky/arch:parabola
-        outputs: type=docker,dest=/tmp/parabola.tar
-
-    - name: Upload artifact
-      uses: actions/upload-artifact@v3
-      with:
-        name: parabola
-        path: /tmp/parabola.tar
+    - uses: actions/checkout@v2
+    - name: Update apt
+      run: sudo apt update && sudo apt upgrade -y && sudo apt autoremove -y
+    - name: Install make
+      run: sudo apt install make docker-compose -y
+    - name: Set up QEMU
+      uses: docker/setup-qemu-action@v1
+    - name: Set up Docker Buildx
+      uses: docker/setup-buildx-action@v1
+    - name: build base
+      run: make buildbase
+    - name: build xorg
+      run: make buildxorg
+    - name: build vnc
+      run: make buildvnc
+    - name: build parabola
+      run: make buildparabola

.github/workflows/docker-push.yml

@@ -1,4 +1,4 @@
-name: Build all then push
+name: Docker
 
 on:
   schedule:

docker-compose.yml

@@ -42,6 +42,19 @@ services:
       - 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"
+    volumes:
+      # - /var/run/docker.sock:/var/run/docker.sock
+      - arch_pacman:/var/cache/pacman/pkg
+      - arch_home:/home/marc
+
   parabola:
     image: marcpartensky/arch:parabola
     build:

vnc/Dockerfile

@@ -12,7 +12,7 @@ RUN paru -Syyyu --noconfirm \
     # xorg-server-utils \
 	xorg-server-xvfb \
     # xf86-video-dummy \
-	x11vnc \
+	tigervnc \
     novnc \
     cron \
     ttf-meslo-nerd-font-powerlevel10k
@@ -22,6 +22,6 @@ COPY crontab.txt /var/spool/cron/marc
 RUN chmod 600 /var/spool/cron/marc
 
 USER marc
-COPY supervisord.conf entrypoint.sh /opt/arch/
+COPY entrypoint.sh /opt/arch/
+COPY supervisord.conf /etc/supervisord.conf
 ENTRYPOINT [ "/opt/arch/entrypoint.sh" ]
-# ENTRYPOINT ["/usr/bin/supervisord", "-c", "/etc/supervisor.d/supervisord.ini"]

vnc/entrypoint.sh

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

vnc/supervisord.conf

@@ -10,30 +10,18 @@ file=/tmp/supervisord.sock
 [supervisorctl]
 serverurl=unix:///tmp/supervisord.sock
 
-[program:xvfb]
-command=Xvfb :0 -screen 0 1820x980x8
+[program:xvnc]
+command=Xvnc :0 -SecurityTypes None -geometry 1820x980
 autorestart=true
 user=marc
 priority=1
 
-# [program:xdummy]
-# command=/usr/bin/Xdummy :0 -screen 0 1820x980x8
-# autorestart=true
-# user=marc
-# priority=1
-
 [program:picom]
 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
@@ -63,6 +51,7 @@ user=root
 priority=5
 
 [program:alacritty]
-command=alacritty -e sh -c "picom -b"
+command=alacritty -e neofetch"
+autorestart=false
 user=marc
 priority=5

waylandvnc/Dockerfile

@@ -0,0 +1,21 @@
+FROM marcpartensky/arch:waylandvnc
+LABEL maintainer=<marc.partensky@gmail.com>
+
+RUN paru -Syyyu --noconfirm \
+    hyprland-bin \
+    # hyprpaper-git \
+    hyprpaper-git \
+    wpaperd \
+    waybar \
+    grim \
+    wf-recorder \
+    swappy
+
+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

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

waylandvnc/entrypoint.sh

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

waylandvnc/supervisord.conf

@@ -0,0 +1,58 @@
+[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:xvnc]
+command=Xvnc :0 -SecurityTypes None -geometry 1820x980
+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:wpaperd]
+command=wpaperd --no-daemon
+autorestart=true
+user=marc
+priority=4
+
+# [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

@@ -45,7 +45,7 @@ RUN git clone https://github.com/marcpartensky/shell git/shell
 RUN make -C git/shell
 
 USER root
-COPY supervisord.ini /etc/supervisor.d/supervisord.ini
 COPY entrypoint.sh entrypoint.sh
+COPY supervisord.conf /etc/supervisord.conf
 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
-/usr/bin/supervisord -c /etc/supervisor.d/supervisord.ini
+supervisord -l /tmp/supervisord.log