--user only

Makefile

@@ -6,8 +6,6 @@ vnc: buildvnc
 	docker-compose up vnc
 parabola: buildparabola
 	docker-compose up parabola
-artix: buildartix
-	docker-compose up artix
 
 buildbase:
 	docker-compose build base
@@ -17,8 +15,6 @@ buildvnc: buildxorg
 	docker-compose build vnc
 buildparabola: buildbase
 	docker-compose build parabola
-buildartix:
-	docker-compose build artix
 
 buildall: buildbase buildxorg buildvnc buildparabola
 

artix/Dockerfile

@@ -1,59 +0,0 @@
-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

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

artixvnc/supervisord.conf

@@ -1,57 +0,0 @@
-[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

docker-compose.yml

@@ -10,11 +10,6 @@ services:
     volumes:
       - /var/run/docker.sock:/var/run/docker.sock
 
-  artix:
-    image: marcpartensky/artix
-    build:
-      context: artix
-
   xorg:
     image: marcpartensky/arch:xorg
     build:
@@ -52,6 +47,14 @@ services:
     build:
       context: parabola
 
+  openrc:
+    image: marcpartensky/arch:openrc
+    build:
+      context: openrc
+    ports:
+      - "18080:8080"
+      - "15900:5900"
+
 volumes:
   arch_pacman:
   arch_home:

openrc/Dockerfile

@@ -1,4 +1,4 @@
-FROM marcpartensky/artix
+FROM marcpartensky/arch:xorg
 LABEL maintainer=<marc.partensky@gmail.com>
 
 USER marc
@@ -8,7 +8,11 @@ ENV DISPLAY=:0.0
 # Install packages
 RUN paru -Syyyu --noconfirm \
     # xorg-server required for xdummy
-    Hyprland-bin \
+    openrc \
+	xorg-server \
+    # xorg-server-utils \
+	xorg-server-xvfb \
+    # xf86-video-dummy \
 	tigervnc \
     novnc \
     cron \
@@ -20,5 +24,4 @@ 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" ]
+ENTRYPOINT [ "/opt/arch/entrypoint.sh" ]

openrc/entrypoint.sh

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