From 067874dba9c233436f39f8a248eb61b97f5f86d2 Mon Sep 17 00:00:00 2001 From: app/github-actions Date: Thu, 5 Mar 2026 22:32:09 +0000 Subject: [PATCH 1/7] pr commit From 0fb5b8849276bfe070a60adc290bbd61553bac64 Mon Sep 17 00:00:00 2001 From: aldmbmtl Date: Thu, 5 Mar 2026 18:53:25 -0500 Subject: [PATCH 2/7] Remove the vLLM tooling and have it be mounted instead. --- common/build/system.sh | 24 ------------------------ common/root/etc/skel/.bashrc | 19 ------------------- common/root/etc/skel/.zshrc | 19 ------------------- common/root/opt/helios/startwm.sh | 3 +++ compose.yml | 2 ++ 5 files changed, 5 insertions(+), 62 deletions(-) diff --git a/common/build/system.sh b/common/build/system.sh index d6404b1..364b7e4 100644 --- a/common/build/system.sh +++ b/common/build/system.sh @@ -32,29 +32,5 @@ fc-cache -f -v mv /usr/bin/thunar /usr/bin/thunar-real mv /usr/bin/sudo /usr/bin/sudo-real -# build out conda tooling -mkdir -p /opt -wget https://repo.anaconda.com/miniconda/Miniconda3-latest-Linux-x86_64.sh -P /opt -chmod -v +x /opt/Miniconda3-latest-Linux-x86_64.sh -/opt/Miniconda3-latest-Linux-x86_64.sh -b -p /opt/miniconda -eval "$(/opt/miniconda/bin/conda shell.bash hook)" -export PATH="/opt/miniconda/bin:/opt/miniconda/condabin:/usr/local/cuda/bin:$PATH" -export LD_LIBRARY_PATH="/usr/local/cuda/lib64:$LD_LIBRARY_PATH" -conda tos accept --override-channels --channel https://repo.anaconda.com/pkgs/main -conda tos accept --override-channels --channel https://repo.anaconda.com/pkgs/r -conda config --set channel_priority strict - -# setup vllm environment -conda create -p /opt/conda/envs/vllm python=3.12 -y -conda activate /opt/conda/envs/vllm -pip install vllm "huggingface_hub[cli]" "open-webui[all]" -conda deactivate - -# setup shared conda environments -chmod -R 7777 /opt/conda -chmod -R 7777 /opt/miniconda - # Cleanup -rm -f /opt/Miniconda3-latest-Linux-x86_64.sh -conda clean -afy rm -rf /tmp/* diff --git a/common/root/etc/skel/.bashrc b/common/root/etc/skel/.bashrc index 6596372..51fc35c 100644 --- a/common/root/etc/skel/.bashrc +++ b/common/root/etc/skel/.bashrc @@ -8,25 +8,6 @@ case $- in *) return;; esac -# >>> conda initialize >>> -__conda_setup="$('/opt/miniconda/bin/conda' 'shell.bash' 'hook' 2> /dev/null)" -if [ $? -eq 0 ]; then - eval "$__conda_setup" -else - if [ -f "/opt/miniconda/etc/profile.d/conda.sh" ]; then - . "/opt/miniconda/etc/profile.d/conda.sh" - else - export PATH="/opt/miniconda/bin:$PATH" - fi -fi -unset __conda_setup -# <<< conda initialize <<< - -export LD_LIBRARY_PATH="/usr/local/cuda/lib64:$LD_LIBRARY_PATH" - -# Shared conda environments -export CONDA_ENVS_PATH="/opt/conda/envs" - # UTF-8 locale export LANG=en_US.UTF-8 export LC_ALL=en_US.UTF-8 diff --git a/common/root/etc/skel/.zshrc b/common/root/etc/skel/.zshrc index 6717a9c..a03abdd 100644 --- a/common/root/etc/skel/.zshrc +++ b/common/root/etc/skel/.zshrc @@ -1,25 +1,6 @@ # If you come from bash you might have to change your $PATH. # export PATH=$HOME/bin:/usr/local/bin:$PATH -# >>> conda initialize >>> -__conda_setup="$('/opt/miniconda/bin/conda' 'shell.zsh' 'hook' 2> /dev/null)" -if [ $? -eq 0 ]; then - eval "$__conda_setup" -else - if [ -f "/opt/miniconda/etc/profile.d/conda.sh" ]; then - . "/opt/miniconda/etc/profile.d/conda.sh" - else - export PATH="/opt/miniconda/bin:$PATH" - fi -fi -unset __conda_setup -# <<< conda initialize <<< - -export LD_LIBRARY_PATH="/usr/local/cuda/lib64:$LD_LIBRARY_PATH" - -# Shared conda environments -export CONDA_ENVS_PATH="/opt/conda/envs" - # UTF-8 locale export LANG=en_US.UTF-8 export LC_ALL=en_US.UTF-8 diff --git a/common/root/opt/helios/startwm.sh b/common/root/opt/helios/startwm.sh index 9efdb0e..7588c87 100644 --- a/common/root/opt/helios/startwm.sh +++ b/common/root/opt/helios/startwm.sh @@ -82,6 +82,9 @@ $(gpu_selector_verbose "$chosen") EOF +export PATH=$PATH_EXTRA:$PATH +export LD_LIBRARY_PATH=$LD_LIBRARY_PATH_EXTRA:$LD_LIBRARY_PATH + if [ -x /usr/bin/xfce4-session ]; then if [[ -n "$DISABLE_VGL" ]]; then # Run without vglrun if DISABLE_VGL is set diff --git a/compose.yml b/compose.yml index 7153785..a2beffe 100644 --- a/compose.yml +++ b/compose.yml @@ -18,6 +18,8 @@ services: - USER=helios - UID=5040 - SUDO=true + - PATH_EXTRA=/opt/miniconda/bin:/opt/miniconda/condabin + - LD_LIBRARY_PATH_EXTRA=/usr/local/cuda/lib64 # - DISABLE_VGL=1 # - DESKTOP_FILES="/desktops/*.desktop:/tmp/*.desktop" # - IDLE_TIME=1 From bdfae4e8b63ed5de70f9153b91a863e4f29dc21d Mon Sep 17 00:00:00 2001 From: aldmbmtl Date: Thu, 5 Mar 2026 20:51:09 -0500 Subject: [PATCH 3/7] Adding in browser and removing old vLLM conda setup in favor of location installer. --- Dockerfile | 4 +++- Makefile | 29 ++++++++++++++++++++++++ common/build/system.sh | 16 +++++++++++++ common/root/usr/bin/google-chrome | 3 +++ common/root/usr/bin/google-chrome-stable | 3 +++ 5 files changed, 54 insertions(+), 1 deletion(-) create mode 100644 common/root/usr/bin/google-chrome create mode 100644 common/root/usr/bin/google-chrome-stable diff --git a/Dockerfile b/Dockerfile index 0165fc5..f0134b7 100644 --- a/Dockerfile +++ b/Dockerfile @@ -119,7 +119,9 @@ COPY common/root/ / # LD_PRELOAD wrapper handlers (selkies hack) RUN chmod +x /usr/bin/thunar \ - && chmod +x /usr/bin/sudo + && chmod +x /usr/bin/sudo \ + && chmod +x /usr/bin/google-chrome-stable \ + && chmod +x /usr/bin/google-chrome # copy in distro specific custom rootfs changes COPY ${SRC}/root/ / diff --git a/Makefile b/Makefile index c23c4e0..075c733 100644 --- a/Makefile +++ b/Makefile @@ -38,6 +38,35 @@ build-all: @docker build . --build-arg IMAGE=rockylinux:9 --build-arg SRC=rocky-9 -t rocky-9 @docker build . --build-arg IMAGE=almalinux:9 --build-arg SRC=alma-9 -t alma-9 +push-all: + @docker build . --build-arg IMAGE=debian:bookworm --build-arg SRC=bookworm -t junoinnovations/helios-ai:unstable-bookworm + @docker push junoinnovations/helios-ai:unstable-bookworm + @docker system prune -af + + @docker build . --build-arg IMAGE=debian:sid --build-arg SRC=sid -t junoinnovations/helios-ai:unstable-sid + @docker push junoinnovations/helios-ai:unstable-sid + @docker system prune -af + + @docker build . --build-arg IMAGE=kalilinux/kali-rolling:latest --build-arg SRC=kali -t junoinnovations/helios-ai:unstable-kali + @docker push junoinnovations/helios-ai:unstable-kali + @docker system prune -af + + @docker build . --build-arg IMAGE=ubuntu:jammy --build-arg SRC=jammy -t junoinnovations/helios-ai:unstable-jammy + @docker push junoinnovations/helios-ai:unstable-jammy + @docker system prune -af + + @docker build . --build-arg IMAGE=ubuntu:noble --build-arg SRC=noble -t junoinnovations/helios-ai:unstable-noble + @docker push junoinnovations/helios-ai:unstable-noble + @docker system prune -af + + @docker build . --build-arg IMAGE=rockylinux:9 --build-arg SRC=rocky-9 -t junoinnovations/helios-ai:unstable-rocky-9 + @docker push junoinnovations/helios-ai:unstable-rocky-9 + @docker system prune -af + + @docker build . --build-arg IMAGE=almalinux:9 --build-arg SRC=alma-9 -t junoinnovations/helios-ai:unstable-alma-9 + @docker push junoinnovations/helios-ai:unstable-alma-9 + @docker system prune -af + # DEBIAN bookworm: @docker compose build --build-arg IMAGE=debian:bookworm --build-arg SRC=bookworm diff --git a/common/build/system.sh b/common/build/system.sh index 364b7e4..315b516 100644 --- a/common/build/system.sh +++ b/common/build/system.sh @@ -28,9 +28,25 @@ mv -v otf/static/* /usr/share/fonts/cascadia-code/ rm -rfv /tmp/* fc-cache -f -v +# install chrome +if command -v apt &> /dev/null; then + apt update + apt install -y wget unzip + wget https://dl.google.com/linux/direct/google-chrome-stable_current_amd64.deb + dpkg -i google-chrome-stable_current_amd64.deb || apt -f install -y + rm google-chrome-stable_current_amd64.deb +else + dnf install -y wget unzip + wget https://dl.google.com/linux/direct/google-chrome-stable_current_x86_64.rpm + dnf install -y google-chrome-stable_current_x86_64.rpm + rm google-chrome-stable_current_x86_64.rpm +fi + # LD_PRELOAD fix mv /usr/bin/thunar /usr/bin/thunar-real mv /usr/bin/sudo /usr/bin/sudo-real +mv /usr/bin/google-chrome-stable /usr/bin/google-chrome-stable-real +mv /usr/bin/google-chrome /usr/bin/google-chrome-real # Cleanup rm -rf /tmp/* diff --git a/common/root/usr/bin/google-chrome b/common/root/usr/bin/google-chrome new file mode 100644 index 0000000..fea520b --- /dev/null +++ b/common/root/usr/bin/google-chrome @@ -0,0 +1,3 @@ +#!/bin/bash +unset LD_PRELOAD +google-chrome-real --no-sandbox "$@" diff --git a/common/root/usr/bin/google-chrome-stable b/common/root/usr/bin/google-chrome-stable new file mode 100644 index 0000000..cb46683 --- /dev/null +++ b/common/root/usr/bin/google-chrome-stable @@ -0,0 +1,3 @@ +#!/bin/bash +unset LD_PRELOAD +google-chrome-stable-real --no-sandbox "$@" From 88afa71bcbf5e9b0b86ab450253d465e41c6a8b1 Mon Sep 17 00:00:00 2001 From: aldmbmtl Date: Thu, 5 Mar 2026 22:48:47 -0500 Subject: [PATCH 4/7] Adding in the gcc compiler for vLLM --- packages/system.yaml | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/packages/system.yaml b/packages/system.yaml index 2fafcfc..1f277c5 100644 --- a/packages/system.yaml +++ b/packages/system.yaml @@ -1,18 +1,15 @@ packages: - - noble: firefox - jammy: firefox - debian: firefox-esr - kali: firefox-esr - sid: firefox-esr - rhel: firefox - # ==================================== # Common packages across all distributions # ==================================== + # gcc compiler for building native extensions and compiling code; essential for development and many Python packages with C extensions. + - common: gcc + # sudo for privilege escalation - common: sudo + # zsh shell, an alternative to bash with enhanced features and user experience. - common: zsh # keyboard/mouse simulation for x11 From ee8b1e4b2ab475a0294cc24d571c2c94547933cc Mon Sep 17 00:00:00 2001 From: aldmbmtl Date: Tue, 24 Mar 2026 22:47:24 -0400 Subject: [PATCH 5/7] Pushing for tooling merge --- .github/workflows/build.yaml | 2 +- Makefile | 29 ----------------------------- 2 files changed, 1 insertion(+), 30 deletions(-) diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index ae5c296..981f464 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -21,7 +21,7 @@ on: jobs: build: runs-on: - - HELIOS-AI + - STANDARD-RUNNER strategy: matrix: distro: diff --git a/Makefile b/Makefile index 075c733..c23c4e0 100644 --- a/Makefile +++ b/Makefile @@ -38,35 +38,6 @@ build-all: @docker build . --build-arg IMAGE=rockylinux:9 --build-arg SRC=rocky-9 -t rocky-9 @docker build . --build-arg IMAGE=almalinux:9 --build-arg SRC=alma-9 -t alma-9 -push-all: - @docker build . --build-arg IMAGE=debian:bookworm --build-arg SRC=bookworm -t junoinnovations/helios-ai:unstable-bookworm - @docker push junoinnovations/helios-ai:unstable-bookworm - @docker system prune -af - - @docker build . --build-arg IMAGE=debian:sid --build-arg SRC=sid -t junoinnovations/helios-ai:unstable-sid - @docker push junoinnovations/helios-ai:unstable-sid - @docker system prune -af - - @docker build . --build-arg IMAGE=kalilinux/kali-rolling:latest --build-arg SRC=kali -t junoinnovations/helios-ai:unstable-kali - @docker push junoinnovations/helios-ai:unstable-kali - @docker system prune -af - - @docker build . --build-arg IMAGE=ubuntu:jammy --build-arg SRC=jammy -t junoinnovations/helios-ai:unstable-jammy - @docker push junoinnovations/helios-ai:unstable-jammy - @docker system prune -af - - @docker build . --build-arg IMAGE=ubuntu:noble --build-arg SRC=noble -t junoinnovations/helios-ai:unstable-noble - @docker push junoinnovations/helios-ai:unstable-noble - @docker system prune -af - - @docker build . --build-arg IMAGE=rockylinux:9 --build-arg SRC=rocky-9 -t junoinnovations/helios-ai:unstable-rocky-9 - @docker push junoinnovations/helios-ai:unstable-rocky-9 - @docker system prune -af - - @docker build . --build-arg IMAGE=almalinux:9 --build-arg SRC=alma-9 -t junoinnovations/helios-ai:unstable-alma-9 - @docker push junoinnovations/helios-ai:unstable-alma-9 - @docker system prune -af - # DEBIAN bookworm: @docker compose build --build-arg IMAGE=debian:bookworm --build-arg SRC=bookworm From b55e6056f9fac7dab13e59639c58c34782cb2fa5 Mon Sep 17 00:00:00 2001 From: aldmbmtl Date: Tue, 24 Mar 2026 22:51:04 -0400 Subject: [PATCH 6/7] Adding in Singleton locks --- common/root/usr/bin/google-chrome | 1 + common/root/usr/bin/google-chrome-stable | 1 + 2 files changed, 2 insertions(+) diff --git a/common/root/usr/bin/google-chrome b/common/root/usr/bin/google-chrome index fea520b..608e1a4 100644 --- a/common/root/usr/bin/google-chrome +++ b/common/root/usr/bin/google-chrome @@ -1,3 +1,4 @@ #!/bin/bash +rm -rf $HOME/.config/google-chrome/Singleton* || true unset LD_PRELOAD google-chrome-real --no-sandbox "$@" diff --git a/common/root/usr/bin/google-chrome-stable b/common/root/usr/bin/google-chrome-stable index cb46683..9e708c2 100644 --- a/common/root/usr/bin/google-chrome-stable +++ b/common/root/usr/bin/google-chrome-stable @@ -1,3 +1,4 @@ #!/bin/bash +rm -rf $HOME/.config/google-chrome/Singleton* || true unset LD_PRELOAD google-chrome-stable-real --no-sandbox "$@" From 47d7ec6817fabdfb5b0ed5bdd4b6da175642c965 Mon Sep 17 00:00:00 2001 From: aldmbmtl Date: Tue, 24 Mar 2026 22:52:59 -0400 Subject: [PATCH 7/7] Removing LD and PATH adjustment support for now. --- common/root/opt/helios/startwm.sh | 3 --- compose.yml | 2 -- 2 files changed, 5 deletions(-) diff --git a/common/root/opt/helios/startwm.sh b/common/root/opt/helios/startwm.sh index 7588c87..9efdb0e 100644 --- a/common/root/opt/helios/startwm.sh +++ b/common/root/opt/helios/startwm.sh @@ -82,9 +82,6 @@ $(gpu_selector_verbose "$chosen") EOF -export PATH=$PATH_EXTRA:$PATH -export LD_LIBRARY_PATH=$LD_LIBRARY_PATH_EXTRA:$LD_LIBRARY_PATH - if [ -x /usr/bin/xfce4-session ]; then if [[ -n "$DISABLE_VGL" ]]; then # Run without vglrun if DISABLE_VGL is set diff --git a/compose.yml b/compose.yml index a2beffe..7153785 100644 --- a/compose.yml +++ b/compose.yml @@ -18,8 +18,6 @@ services: - USER=helios - UID=5040 - SUDO=true - - PATH_EXTRA=/opt/miniconda/bin:/opt/miniconda/condabin - - LD_LIBRARY_PATH_EXTRA=/usr/local/cuda/lib64 # - DISABLE_VGL=1 # - DESKTOP_FILES="/desktops/*.desktop:/tmp/*.desktop" # - IDLE_TIME=1