ly test

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

@@ -1,39 +0,0 @@
-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,8 +1,6 @@
 name: Docker
 
 on:
-  schedule:
-  - cron: "0 4 * * *" # everyday at 4 am
   push:
     branches:
       - master
@@ -26,16 +24,8 @@ jobs:
       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
-    # - name: build all
-    #   run: make buildall
+    - name: build
+      run: make build
     - name: Login to DockerHub
       uses: docker/login-action@v1
       with:

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,19 +15,9 @@ 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 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
 

README.md

@@ -1,15 +1,6 @@
 # Custom environment images
 
-
-## 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](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)
 - [marcpartensky/arch:parabola](https://hub.docker.com/r/marcpartensky/arch:parabola)

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/Dockerfile

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

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

artixvnc/entrypoint.sh

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

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,48 +10,28 @@ services:
     volumes:
       - /var/run/docker.sock:/var/run/docker.sock
 
-  artix:
-    image: marcpartensky/artix
-    build:
-      context: artix
-
   xorg:
     image: marcpartensky/arch:xorg
     build:
       context: xorg
     environment:
-      DISPLAY: :1
-        # ipc: host
-        # privileged: true
-    user: $USER
-      # pid: host
+      DISPLAY: $DISPLAY
     volumes:
       - /tmp/.X11-unix:/tmp/.X11-unix
-      - /tmp/.X1-lock:/tmp/.X1-lock
-      # - /tmp:/tmp
-      # devices:
-      # - /dev/dri
-      - arch_pacman:/var/cache/pacman/pkg
-      - /srv/arch/home/marc:/home/marc
+    devices:
+      - /dev/dri
 
   vnc:
     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
-      - arch_home:/home/marc
+      - /var/run/docker.sock:/var/run/docker.sock
 
   parabola:
     image: marcpartensky/arch:parabola
     build:
       context: parabola
-
-volumes:
-  arch_pacman:
-  arch_home:

vnc/Dockerfile

@@ -1,27 +1,32 @@
 FROM marcpartensky/arch:xorg
 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
-	xorg-server \
-    # xorg-server-utils \
-	xorg-server-xvfb \
-    # xf86-video-dummy \
-	tigervnc \
+RUN paru -Syyy --noconfirm \
+	net-tools \
+	supervisor \
+	alacritty \
+    ly \
+    feh \
+	x11vnc \
     novnc \
     cron \
-    ttf-meslo-nerd-font-powerlevel10k
+	xorg-server \
+	# xorg-server-utils \
+    ttf-meslo-nerd-font-powerlevel10k \
+	xorg-server-xvfb
 
 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" ]
+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"]

vnc/entrypoint.sh

@@ -1,4 +1,5 @@
-#!/bin/sh
+#!/sbin/zsh
 
 export WALLPAPERS_PATH=/home/marc/wallpapers
-supervisord -l /tmp/supervisord.log
+# /usr/bin/supervisord -c /etc/supervisor.d/supervisord.ini
+ly

vnc/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

vnc/supervisord.ini

@@ -2,11 +2,14 @@
 nodaemon=true
 ; nodaemon=false
 
-; [program:Xephyr]
-; command=Xephyr :1 -screen 0 1536x768x24
-; autorestart=true
-; user=marc
-; priority=1
+[program:X11]
+command=/usr/bin/Xvfb :0 -screen 0 1536x768x24
+autorestart=true
+user=marc
+priority=1
+
+; [program:ly]
+; command=ly
 
 ; [program:startx]
 ; command=startx
@@ -19,11 +22,11 @@ user=marc
 autorestart=true
 priority=2
 
-; [program:x11vnc]
-; command=/usr/bin/x11vnc
-; autorestart=true
-; user=marc
-; priority=2
+[program:x11vnc]
+command=/usr/bin/x11vnc -pipeinput
+autorestart=true
+user=marc
+priority=2
 
 [program:dwm]
 command=/usr/local/bin/dwm
@@ -37,11 +40,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"

xorg/Dockerfile

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

xorg/entrypoint.sh

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