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

@@ -0,0 +1,36 @@
+name: Docker build test
+
+on:
+  schedule:
+  - cron: "0 4 * * *" # everyday at 4 am
+  push:
+    branches:
+      - '*'         # matches every branch that doesn't contain a '/'
+      - '*/*'       # matches every branch containing a single '/'
+      - '**'        # matches every branch
+      - '!master'   # excludes master
+    # Publish `v1.2.3` tags as releases.
+    tags:
+      - v*
+
+  # Run tests for any PRs.
+  pull_request:
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    steps:
+    - 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: 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,6 +1,8 @@
-name: Docker
+name: Docker push
 
 on:
+  schedule:
+  - cron: "0 4 * * *" # everyday at 4 am
   push:
     branches:
       - master
@@ -12,20 +14,25 @@ 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
-      run: make build
+    - name: build base
+      run: make buildbase
+    - name: build xorg
+      run: make buildxorg
+    - name: build vnc
+      run: make buildvnc
+    - name: build parabola
+      run: make buildparabola
+    # - name: build all
+    #   run: make buildall
     - name: Login to DockerHub
       uses: docker/login-action@v1
       with:

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

@@ -15,23 +15,38 @@ services:
     build:
       context: xorg
     environment:
-      DISPLAY: $DISPLAY
+      DISPLAY: :1
+        # ipc: host
+        # privileged: true
+    user: $USER
+      # pid: host
     volumes:
       - /tmp/.X11-unix:/tmp/.X11-unix
-    devices:
-      - /dev/dri
+      - /tmp/.X1-lock:/tmp/.X1-lock
+      # - /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

@@ -18,6 +18,14 @@ buildparabola: buildbase
 
 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 push
+
 push: buildall
 	docker-compose push
 

vnc/Dockerfile

@@ -1,32 +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 \
-    ly \
-    feh \
-	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,5 +1,4 @@
-#!/sbin/zsh
+#!/bin/sh
 
 export WALLPAPERS_PATH=/home/marc/wallpapers
-# /usr/bin/supervisord -c /etc/supervisor.d/supervisord.ini
-ly
+supervisord -l /tmp/supervisord.log

vnc/supervisord.conf

@@ -0,0 +1,57 @@
+[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:picom]
+command=picom
+user=marc
+autorestart=true
+priority=2
+
+[program:dwm]
+command=/usr/local/bin/dwm
+autorestart=true
+user=marc
+priority=3
+
+[program:dwmblocks]
+command=/usr/local/bin/dwmblocks
+autorestart=true
+user=marc
+priority=4
+
+[program:noVNC]
+command=/sbin/novnc --vnc localhost:5900 --listen 8080
+autorestart=true
+user=marc
+priority=3
+
+[program:wallpaper]
+command=zsh -c "sleep 2 && /home/marc/.local/bin/wpp -n"
+user=marc
+priority=5
+
+[program:cron]
+command=crond -f
+user=root
+priority=5
+
+[program:alacritty]
+command=alacritty -e neofetch"
+autorestart=false
+user=marc
+priority=5

xorg/Dockerfile

@@ -1,23 +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
-
-
-# dwm build dependencies
-RUN paru -S --noconfirm libxft libxinerama
+	# xorg-server-xvfb \
 
 # setup dwn
 RUN git clone https://github.com/marcpartensky/dwm git/dwm
@@ -42,4 +44,8 @@ RUN git clone https://github.com/marcpartensky/wallpapers wallpapers
 RUN git clone https://github.com/marcpartensky/shell git/shell
 RUN make -C git/shell
 
-ENTRYPOINT [ "alacritty" ]
+USER root
+COPY entrypoint.sh entrypoint.sh
+COPY supervisord.conf /etc/supervisord.conf
+ENTRYPOINT [ "./entrypoint.sh" ]
+# ENTRYPOINT [ "DISPLAY=:0", "Xephyr", ":1" ]

xorg/entrypoint.sh

@@ -0,0 +1,6 @@
+#!/sbin/zsh
+
+export WALLPAPERS_PATH=/home/marc/wallpapers
+# export DISPLAY=:0
+# Xephyr :1 -extension MIT-SHM
+supervisord -l /tmp/supervisord.log

xorg/supervisord.conf

@@ -2,14 +2,11 @@
 nodaemon=true
 ; nodaemon=false
 
-[program:X11]
-command=/usr/bin/Xvfb :0 -screen 0 1536x768x24
-autorestart=true
-user=marc
-priority=1
-
-; [program:ly]
-; command=ly
+; [program:Xephyr]
+; command=Xephyr :1 -screen 0 1536x768x24
+; autorestart=true
+; user=marc
+; priority=1
 
 ; [program:startx]
 ; command=startx
@@ -22,11 +19,11 @@ user=marc
 autorestart=true
 priority=2
 
-[program:x11vnc]
-command=/usr/bin/x11vnc -pipeinput
-autorestart=true
-user=marc
-priority=2
+; [program:x11vnc]
+; command=/usr/bin/x11vnc
+; autorestart=true
+; user=marc
+; priority=2
 
 [program:dwm]
 command=/usr/local/bin/dwm
@@ -40,11 +37,11 @@ autorestart=true
 user=marc
 priority=4
 
-[program:noVNC]
-command=/sbin/novnc --vnc localhost:5900 --listen 8080
-autorestart=true
-user=marc
-priority=3
+; [program:noVNC]
+; command=/sbin/novnc --vnc localhost:5900 --listen 8080
+; autorestart=true
+; user=marc
+; priority=3
 
 [program:wallpaper]
 command=zsh -c "sleep 2 && /home/marc/.local/bin/wpp -n"