funding

This reverts commit 4b3712029e.

.github/FUNDING.yml

@@ -1,5 +1,7 @@
+liberapay: marcpartensky
 patreon: marcpartensky
 github: marcpartensky
 custom:
   # - monero:43J2XmRtjDPRLD35UsYGH2AZamFBQz7dt4VdvZXVm3SuadTrvcoXUXBRUNHqukFte23Q5TWXqhbwaLJJgoVQzzbe2AJDANQ
   - https://paypal.me/marcpartensky
+  - https://buymeacoffee.com/marcpartensky

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

@@ -1,4 +1,4 @@
-name: Docker
+name: Docker build test
 
 on:
   schedule:
@@ -20,15 +20,12 @@ jobs:
   build:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v2
-    - name: Update apt
-      run: sudo apt update && sudo apt upgrade -y && sudo apt autoremove -y
+    - uses: actions/checkout@v3
+    - uses: docker/setup-qemu-action@v2
+    - uses: docker/setup-buildx-action@v2
+
     - 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

.github/workflows/docker-push.yml

@@ -1,4 +1,4 @@
-name: Docker
+name: Docker push
 
 on:
   schedule:
@@ -14,18 +14,15 @@ on:
   pull_request:
 
 jobs:
-  build:
+  buildandpush:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v2
-    - name: Update apt
-      run: sudo apt update && sudo apt upgrade -y && sudo apt autoremove -y
+    - uses: actions/checkout@v3
+    - uses: docker/setup-qemu-action@v2
+    - uses: docker/setup-buildx-action@v2
+
     - 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

README.md

@@ -1,6 +1,15 @@
 # Custom environment images
 
-- [marcpartensky/arch](https://hub.docker.com/r/marcpartensky/arch)
-- [marcpartensky/arch:xorg](https://hub.docker.com/r/marcpartensky/arch:xorg)
-- [marcpartensky/arch:vnc](https://hub.docker.com/r/marcpartensky/arch:vnc)
+
+## Shell
+[marcpartensky/arch](https://hub.docker.com/r/marcpartensky/arch)
+
+## Xephyr
+[marcpartensky/arch:xorg](https://hub.docker.com/r/marcpartensky/arch:xorg)
+
+## VNC/NoVNC
+[marcpartensky/arch:vnc](https://hub.docker.com/r/marcpartensky/arch:vnc)
+
+## Parabola
+Parabola is an arch derivative that focuses on foss.
 - [marcpartensky/arch:parabola](https://hub.docker.com/r/marcpartensky/arch:parabola)

docker-compose.yml

@@ -26,18 +26,27 @@ services:
       # - /tmp:/tmp
       # devices:
       # - /dev/dri
+      - arch_pacman:/var/cache/pacman/pkg
+      - /srv/arch/home/marc:/home/marc
 
   vnc:
     image: marcpartensky/arch:vnc
     build:
       context: vnc
+    # user: $USER
     ports:
       - "18080:8080"
       - "15900:5900"
     volumes:
-      - /var/run/docker.sock:/var/run/docker.sock
+      # - /var/run/docker.sock:/var/run/docker.sock
+      - arch_pacman:/var/cache/pacman/pkg
+      - arch_home:/home/marc
 
   parabola:
     image: marcpartensky/arch:parabola
     build:
       context: parabola
+
+volumes:
+  arch_pacman:
+  arch_home:

makefile

@@ -19,10 +19,11 @@ buildparabola: buildbase
 buildall: buildbase buildxorg buildvnc buildparabola
 
 updateall:
-	docker-compose build --no-cache
-	# docker-compose build --no-cache xorg
-	# docker-compose build --no-cache vnc
-	# docker-compose build --no-cache parabola
+	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 push
 
 push: buildall

vnc/Dockerfile

@@ -1,30 +1,27 @@
 FROM marcpartensky/arch:xorg
 LABEL maintainer=<marc.partensky@gmail.com>
 
+USER marc
 EXPOSE 5900 8080
 ENV DISPLAY=:0.0
 
 # Install packages
-RUN paru -Syyy --noconfirm \
-	net-tools \
-	supervisor \
-	alacritty \
-	x11vnc \
+RUN paru -Syyyu --noconfirm \
+    # 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
+    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
-COPY entrypoint.sh entrypoint.sh
-ENTRYPOINT [ ".//entrypoint.sh" ]
-# ENTRYPOINT ["/usr/bin/supervisord", "-c", "/etc/supervisor.d/supervisord.ini"]
+COPY entrypoint.sh /opt/arch/
+COPY supervisord.conf /etc/supervisord.conf
+ENTRYPOINT [ "/opt/arch/entrypoint.sh" ]

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 -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 1536x768x24
+[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
-autorestart=true
-user=marc
-priority=2
-
 [program:dwm]
 command=/usr/local/bin/dwm
 autorestart=true
@@ -54,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

xorg/Dockerfile

@@ -1,25 +1,25 @@
 FROM marcpartensky/arch
 
-RUN paru -Syyy --noconfirm \
+RUN paru -Syyyu --noconfirm \
 	net-tools \
 	supervisor \
     firefox \
+	alacritty \
     picom \
     rofi \
     feh \
+    ttf-meslo-nerd-font-powerlevel10k \
+    # for nested x
+    xorg-server-xephyr \
+    # dwm build dependencies
+    libxft \
+    libxinerama
     # ttf-menlo-powerline-git \
     # ttf-meslo \
-    ttf-meslo-nerd-font-powerlevel10k \
-	alacritty \
-    xorg-xinit \
-	xorg-server \
+    # xorg-xinit \
+	# xorg-server \
 	# xorg-server-utils \
 	# xorg-server-xvfb \
-    xorg-server-xephyr
-
-
-# dwm build dependencies
-RUN paru -S --noconfirm libxft libxinerama
 
 # setup dwn
 RUN git clone https://github.com/marcpartensky/dwm git/dwm
@@ -46,6 +46,6 @@ RUN make -C git/shell
 
 USER root
 COPY entrypoint.sh entrypoint.sh
-COPY supervisord.ini /etc/supervisor.d/supervisord.ini
+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