no double imports

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

@@ -0,0 +1,39 @@
+name: Docker
+
+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@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,6 +1,8 @@
 name: Docker
 
 on:
+  schedule:
+  - cron: "0 4 * * *" # everyday at 4 am
   push:
     branches:
       - master
@@ -24,8 +26,16 @@ jobs:
       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:

Makefile

@@ -18,6 +18,14 @@ buildparabola: buildbase
 
 buildall: buildbase buildxorg buildvnc buildparabola
 
+updateall:
+	docker pull archlinux
+	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
 

docker-compose.yml

@@ -15,11 +15,19 @@ 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
@@ -29,9 +37,14 @@ services:
       - "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
+      - /srv/arch/home/marc:/home/marc
 
   parabola:
     image: marcpartensky/arch:parabola
     build:
       context: parabola
+
+volumes:
+  arch_pacman:

vnc/Dockerfile

@@ -1,19 +1,16 @@
 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 \
-    feh \
 	x11vnc \
     novnc \
     cron \
-	xorg-server \
+	# xorg-server \
 	# xorg-server-utils \
     ttf-meslo-nerd-font-powerlevel10k \
 	xorg-server-xvfb

vnc/supervisord.ini

@@ -3,7 +3,7 @@ nodaemon=true
 ; nodaemon=false
 
 [program:X11]
-command=/usr/bin/Xvfb :0 -screen 0 1536x768x24
+command=/usr/bin/Xvfb :0 -screen 0 1820x980x8
 autorestart=true
 user=marc
 priority=1
@@ -20,7 +20,7 @@ autorestart=true
 priority=2
 
 [program:x11vnc]
-command=/usr/bin/x11vnc -pipeinput
+command=/usr/bin/x11vnc -shared -forever
 autorestart=true
 user=marc
 priority=2

xorg/Dockerfile

@@ -4,20 +4,22 @@ RUN paru -Syyy --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.ini /etc/supervisor.d/supervisord.ini
+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
+/usr/bin/supervisord -c /etc/supervisor.d/supervisord.ini

xorg/supervisord.ini

@@ -0,0 +1,59 @@
+[supervisord]
+nodaemon=true
+; nodaemon=false
+
+; [program:Xephyr]
+; command=Xephyr :1 -screen 0 1536x768x24
+; autorestart=true
+; user=marc
+; priority=1
+
+; [program:startx]
+; command=startx
+; autorestart=true
+; priority=1
+
+[program:picom]
+command=zsh -c "sleep 5 && picom -b"
+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
+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 sh -c "picom -b"
+user=marc
+priority=5