Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fedora39 proot #57

Merged
merged 2 commits into from
Apr 15, 2024
Merged

Fedora39 proot #57

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c5df2d9
add proot-apps fedora39
thelamer Apr 15, 2024
561b6bb
typo
thelamer Apr 15, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand Down
7 changes: 7 additions & 0 deletions Dockerfile.aarch64
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand Down
15 changes: 15 additions & 0 deletions root/etc/s6-overlay/s6-rc.d/init-kasmvnc-config/run
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
8 changes: 8 additions & 0 deletions root/kasminit
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down