base/arch.Dockerfile

@@ -1,4 +1,4 @@
-# OSIC Stacks - osicstacks-base-arch
+# OSIC Stacks - osicstack-base-arch
 # Base image for OSIC Stacks
 FROM greyltc/archlinux-aur:paru
 
@@ -27,8 +27,8 @@ ENV USER designer
 
 # Add scripts
 RUN mkdir -p .scripts
-COPY --chown=designer:designer --chmod=755 scripts/* /home/designer/.scripts
+COPY --chown=designer:designer --chmod=755 scripts/klayout /home/designer/.scripts
 ENV PATH="/home/designer/.scripts:${PATH}"
 
 # Initialize the enviroment keeping container alive
-CMD ["sleep", "infinity"]
+CMD ["sleep", "infinity"]

base/web-arch.Dockerfile

@@ -9,28 +9,23 @@ RUN sudo pacman -Syuq --noconfirm
 RUN paru -S --noconfirm kasmvncserver-bin
 
 # KASM requires the hostname binary to start
-RUN sudo pacman -S --noconfirm inetutils
+RUN pacman -S --noconfirm inetutils
 
 # KASM requires the "snakeoil" certificate key for SSL authentication
 # This key comes from default in debian based distributions
 # For archlinux this will need to be created manually
 WORKDIR /etc/ssl
 RUN sudo openssl genpkey -algorithm RSA -out private/ssl-cert-snakeoil.key
-RUN sudo openssl req -new -key private/ssl-cert-snakeoil.key -out certs/ssl-cert-snakeoil.csr -subj "/CN=localhost"
+RUN sudo openssl req -new -key private/ssl-cert-snakeoil.key -out certs/ssl-cert-snakeoil.csr -subj "CN=localhost"
 RUN sudo openssl x509 -req -days 365 -in certs/ssl-cert-snakeoil.csr -signkey private/ssl-cert-snakeoil.key -out certs/ssl-cert-snakeoil.pem
 RUN sudo chmod 640 private/ssl-cert-snakeoil.key
 RUN sudo chmod 644 certs/ssl-cert-snakeoil.pem
 RUN sudo usermod -aG root designer
 
-# Install XFCE
+# Set desktop wallpaper
-RUN sudo pacman -S --noconfirm xorg xfce4
+RUN mkdir /home/designer/.media
+COPY media/defaultwallpaper.png /home/designer/.media
+RUN setwallpaper /home/designer/.media/defaultwallpaper.png
 
-# Copy includes
+# Run VNC server & desktop environment
-RUN mkdir -p /home/designer/.media
+CMD["vncserver", "-select-de", "xfce"]
-COPY --chown=designer:designer include/media/* /home/designer/.media
-RUN mkdir -p /home/designer/.config/autostart
-COPY --chown=designer:designer include/desktopinit.desktop /home/designer/.config/autostart
-
-# Start VNC & desktop environment
-WORKDIR /home/designer
-ENTRYPOINT ["startserver"]

include/desktopinit.desktop

@@ -1,4 +0,0 @@
-[Desktop Entry]
-Type=Application
-Name=OSICStacks-DesktopInit
-Exec=sh -c "sleep 1 && desktopinit"

scripts/desktopinit

@@ -1,2 +0,0 @@
-#!/bin/bash
-setwallpaper /home/designer/.media/defaultwallpaper.png

scripts/startserver

@@ -1,16 +0,0 @@
-#!/bin/bash
-cd /home/designer
-
-# Run VNC server
-export DISPLAY=:1
-eval $(vncserver -dry-run) &
-echo -e "password\npassword\n" | vncpasswd -u designer -w -r
-
-# Wait for VNC server to start
-sleep 1
-
-# Run desktop environment (XFCE)
-xfce4-session --display=$DISPLAY
-
-# Keep container alive
-sleep infinity