artixvnc

This reverts commit 4b3712029e.

Makefile

@@ -6,6 +6,8 @@ vnc: buildvnc
 	docker-compose up vnc
 parabola: buildparabola
 	docker-compose up parabola
+artix: buildartix
+	docker-compose up artix
 
 buildbase:
 	docker-compose build base
@@ -15,15 +17,17 @@ buildvnc: buildxorg
 	docker-compose build vnc
 buildparabola: buildbase
 	docker-compose build parabola
+buildartix:
+	docker-compose build artix
 
 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 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

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)

artix/Dockerfile

@@ -0,0 +1,59 @@
+FROM artixlinux/openrc:latest
+LABEL maintainer="Marc Partensky"
+
+
+RUN pacman -Syyyu --needed --noconfirm base-devel
+RUN pacman -S --noconfirm git
+
+RUN useradd --create-home --groups wheel --shell /usr/bin/zsh marc
+RUN passwd -d marc
+RUN echo "%wheel ALL=(ALL) ALL" >> /etc/sudoers
+
+USER marc
+WORKDIR /tmp
+RUN git clone https://aur.archlinux.org/paru.git
+WORKDIR /tmp/paru
+RUN makepkg -si --noconfirm
+
+RUN paru -Syyyu --noconfirm \
+    zsh \
+    neovim \
+    exa \
+    paruz \
+    make \
+    npm \
+    go \
+    pod2man \
+    openssh \
+    stow-git
+
+# RUN paru -aS --noconfirm \
+#     bat
+
+COPY entrypoint.sh /tmp/entrypoint.sh
+
+USER root
+RUN cat /etc/locale.gen
+# RUN sed -i -e 's/en_US.UTF-8 UTF-8/fr_FR.UTF-8 UTF-8/' /etc/locale.gen
+# RUN cat /etc/locale.gen
+# RUN locale-gen
+# RUN cat /etc/locale.gen
+ENV LC_ALL fr_FR.UTF-8
+ENV LANG fr_FR.UTF-8
+ENV LANGUAGE fr_FR:fr
+
+USER marc
+ENV HOST docker
+
+WORKDIR /home/marc
+RUN mkdir git
+
+RUN git clone https://github.com/marcpartensky/dotfiles git/dotfiles
+RUN zsh git/dotfiles/main.sh
+RUN make -C git/dotfiles stow
+RUN touch .profile
+
+RUN git clone https://github.com/marcpartensky/nvim ~/.config/nvim
+RUN make -C ~/.config/nvim setup
+
+ENTRYPOINT [ "/tmp/entrypoint.sh" ]

artix/entrypoint.sh

@@ -0,0 +1,4 @@
+#!/usr/bin/zsh
+
+ssh-keygen -q -t rsa -N '' -f $HOME/.ssh/id_rsa
+exec zsh

artixvnc/Dockerfile

@@ -0,0 +1,24 @@
+FROM marcpartensky/artix
+LABEL maintainer=<marc.partensky@gmail.com>
+
+USER marc
+EXPOSE 5900 8080
+ENV DISPLAY=:0.0
+
+# Install packages
+RUN paru -Syyyu --noconfirm \
+    # xorg-server required for xdummy
+    Hyprland-bin \
+	tigervnc \
+    novnc \
+    cron \
+    ttf-meslo-nerd-font-powerlevel10k
+
+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" ]

artixvnc/crontab.txt

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

artixvnc/entrypoint.sh

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

artixvnc/supervisord.conf

@@ -1,30 +1,27 @@
 [supervisord]
 nodaemon=true
-; nodaemon=false
 
-[program:X11]
-command=/usr/bin/Xvfb :0 -screen 0 1820x980x8
+[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 -shared -forever
-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

docker-compose.yml

@@ -10,6 +10,11 @@ services:
     volumes:
       - /var/run/docker.sock:/var/run/docker.sock
 
+  artix:
+    image: marcpartensky/artix
+    build:
+      context: artix
+
   xorg:
     image: marcpartensky/arch:xorg
     build:
@@ -33,13 +38,14 @@ 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
-      - /srv/arch/home/marc:/home/marc
+      - arch_home:/home/marc
 
   parabola:
     image: marcpartensky/arch:parabola
@@ -48,3 +54,4 @@ services:
 
 volumes:
   arch_pacman:
+  arch_home:

vnc/Dockerfile

@@ -6,26 +6,22 @@ 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

@@ -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,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