diff --git a/Dockerfile b/Dockerfile index bbb4a08..cf89195 100644 --- a/Dockerfile +++ b/Dockerfile @@ -330,6 +330,13 @@ RUN \ usermod -s /bin/bash abc && \ echo '%wheel ALL=(ALL) NOPASSWD:ALL' > /etc/sudoers.d/wheel && \ usermod -G wheel abc && \ + echo "**** proot-apps ****" && \ + mkdir /proot-apps/ && \ + PAPPS_RELEASE=$(curl -sX GET "https://api.github.com/repos/linuxserver/proot-apps/releases/latest" \ + | awk '/tag_name/{print $4;exit}' FS='[""]') && \ + curl -L https://github.com/linuxserver/proot-apps/releases/download/${PAPPS_RELEASE}/proot-apps-x86_64.tar.gz \ + | tar -xzf - -C /proot-apps/ && \ + echo "${PAPPS_RELEASE}" > /proot-apps/pversion && \ echo "**** kasm support ****" && \ useradd \ -u 1000 -U \ diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64 index ea27b2d..5bca516 100644 --- a/Dockerfile.aarch64 +++ b/Dockerfile.aarch64 @@ -332,6 +332,13 @@ RUN \ usermod -s /bin/bash abc && \ echo '%wheel ALL=(ALL) NOPASSWD:ALL' > /etc/sudoers.d/wheel && \ usermod -G wheel abc && \ + echo "**** proot-apps ****" && \ + mkdir /proot-apps/ && \ + PAPPS_RELEASE=$(curl -sX GET "https://api.github.com/repos/linuxserver/proot-apps/releases/latest" \ + | awk '/tag_name/{print $4;exit}' FS='[""]') && \ + curl -L https://github.com/linuxserver/proot-apps/releases/download/${PAPPS_RELEASE}/proot-apps-aarch64.tar.gz \ + | tar -xzf - -C /proot-apps/ && \ + echo "${PAPPS_RELEASE}" > /proot-apps/pversion && \ echo "**** kasm support ****" && \ useradd \ -u 1000 -U \ diff --git a/root/etc/s6-overlay/s6-rc.d/init-kasmvnc-config/run b/root/etc/s6-overlay/s6-rc.d/init-kasmvnc-config/run index e71ec9b..db7590d 100755 --- a/root/etc/s6-overlay/s6-rc.d/init-kasmvnc-config/run +++ b/root/etc/s6-overlay/s6-rc.d/init-kasmvnc-config/run @@ -45,3 +45,18 @@ if [[ ! -z ${NO_FULL+x} ]] && [[ ! -f /fulllock ]]; then /etc/xdg/openbox/rc.xml touch /fulllock fi + +# Add proot-apps +if [ ! -f "${HOME}/.local/bin/proot-apps" ]; then + mkdir -p ${HOME}/.local/bin/ + cp /proot-apps/* ${HOME}/.local/bin/ + echo 'export PATH="$HOME/.local/bin:$PATH"' >> $HOME/.bashrc + chown abc:abc \ + ${HOME}/.bashrc \ + ${HOME}/.local/ \ + ${HOME}/.local/bin \ + ${HOME}/.local/bin/{ncat,proot-apps,proot,jq,pversion} +elif ! diff -q /proot-apps/pversion ${HOME}/.local/bin/pversion > /dev/null; then + cp /proot-apps/* ${HOME}/.local/bin/ + chown abc:abc ${HOME}/.local/bin/{ncat,proot-apps,proot,jq,pversion} +fi diff --git a/root/kasminit b/root/kasminit index 65e1cd7..ea8c4b2 100755 --- a/root/kasminit +++ b/root/kasminit @@ -65,6 +65,14 @@ cp \ /defaults/startwm.sh \ $HOME/.vnc/xstartup touch $HOME/.vnc/.de-was-selected +# Add proot-apps +if [ ! -f "${HOME}/.local/bin/proot-apps" ]; then + mkdir -p ${HOME}/.local/bin/ + cp /proot-apps/* ${HOME}/.local/bin/ + echo 'export PATH="$HOME/.local/bin:$PATH"' >> $HOME/.bashrc +elif ! diff -q /proot-apps/pversion ${HOME}/.local/bin/pversion > /dev/null; then + cp /proot-apps/* ${HOME}/.local/bin/ +fi ## KasmVNC init ## # Password