extern/workspaces-images
1
0
Fork 0
mirror of https://github.com/kasmtech/workspaces-images.git synced 2024-11-21 23:53:10 +01:00
Code Issues Packages Projects Releases Wiki Activity

Resolve KASM-6543 "Feature/ add chromium alpine"

Browse Source
This commit is contained in:
Ryan Kuba 2024-10-17 20:27:53 +00:00 committed by Justin Travis
parent bdaf149d40
commit 0b8d6a3740
6 changed files with 8 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ci-scripts/test.sh
View File

@ -188,7 +188,7 @@ ssh \
ready_check ready_check
# Pull tester image # Pull tester image
docker pull ${ORG_NAME}/kasm-tester:1.15.0 docker pull ${ORG_NAME}/kasm-tester:1.16.0
# Run test # Run test
cp /root/.ssh/id_rsa $(dirname ${CI_PROJECT_DIR})/sshkey cp /root/.ssh/id_rsa $(dirname ${CI_PROJECT_DIR})/sshkey
@ -210,7 +210,7 @@ docker run --rm \
-e REPO=workspaces-images \ -e REPO=workspaces-images \
-e AUTOMATED=true \ -e AUTOMATED=true \
-v $(dirname ${CI_PROJECT_DIR})/sshkey:/sshkey:ro ${SLIM_FLAG} \ -v $(dirname ${CI_PROJECT_DIR})/sshkey:/sshkey:ro ${SLIM_FLAG} \
kasmweb/kasm-tester:1.15.0 kasmweb/kasm-tester:1.16.0
# Shutdown Instances # Shutdown Instances
turnoff turnoff

1
dockerfile-kasm-alpine-317-desktop
View File

@ -28,6 +28,7 @@ ENV SKIP_CLEAN=true \
/alpine/install/pinta/install_pinta.sh \ /alpine/install/pinta/install_pinta.sh \
/alpine/install/obs/install_obs.sh \ /alpine/install/obs/install_obs.sh \
/alpine/install/filezilla/install_filezilla.sh \ /alpine/install/filezilla/install_filezilla.sh \
/alpine/install/chromium/install_chromium.sh \
/ubuntu/install/langpacks/install_langpacks.sh \ /ubuntu/install/langpacks/install_langpacks.sh \
/ubuntu/install/cleanup/cleanup.sh" /ubuntu/install/cleanup/cleanup.sh"

1
dockerfile-kasm-alpine-318-desktop
View File

@ -28,6 +28,7 @@ ENV SKIP_CLEAN=true \
/alpine/install/pinta/install_pinta.sh \ /alpine/install/pinta/install_pinta.sh \
/alpine/install/obs/install_obs.sh \ /alpine/install/obs/install_obs.sh \
/alpine/install/filezilla/install_filezilla.sh \ /alpine/install/filezilla/install_filezilla.sh \
/alpine/install/chromium/install_chromium.sh \
/ubuntu/install/langpacks/install_langpacks.sh \ /ubuntu/install/langpacks/install_langpacks.sh \
/ubuntu/install/cleanup/cleanup.sh" /ubuntu/install/cleanup/cleanup.sh"

1
dockerfile-kasm-alpine-319-desktop
View File

@ -28,6 +28,7 @@ ENV SKIP_CLEAN=true \
/alpine/install/pinta/install_pinta.sh \ /alpine/install/pinta/install_pinta.sh \
/alpine/install/obs/install_obs.sh \ /alpine/install/obs/install_obs.sh \
/alpine/install/filezilla/install_filezilla.sh \ /alpine/install/filezilla/install_filezilla.sh \
/alpine/install/chromium/install_chromium.sh \
/ubuntu/install/langpacks/install_langpacks.sh \ /ubuntu/install/langpacks/install_langpacks.sh \
/ubuntu/install/cleanup/cleanup.sh" /ubuntu/install/cleanup/cleanup.sh"

1
dockerfile-kasm-alpine-320-desktop
View File

@ -28,6 +28,7 @@ ENV SKIP_CLEAN=true \
/alpine/install/pinta/install_pinta.sh \ /alpine/install/pinta/install_pinta.sh \
/alpine/install/obs/install_obs.sh \ /alpine/install/obs/install_obs.sh \
/alpine/install/filezilla/install_filezilla.sh \ /alpine/install/filezilla/install_filezilla.sh \
/alpine/install/chromium/install_chromium.sh \
/ubuntu/install/langpacks/install_langpacks.sh \ /ubuntu/install/langpacks/install_langpacks.sh \
/ubuntu/install/cleanup/cleanup.sh" /ubuntu/install/cleanup/cleanup.sh"

14
src/alpine/install/chromium/install_chromium.sh
View File

@ -6,11 +6,6 @@ CHROME_ARGS="--password-store=basic --no-sandbox --ignore-gpu-blocklist --user-
apk add --no-cache \ apk add --no-cache \
chromium chromium
if [ "$(arch)" == "x86_64" ]; then
apk add --no-cache --repository=http://dl-cdn.alpinelinux.org/alpine/edge/testing \
virtualgl
fi
REAL_BIN=chromium REAL_BIN=chromium
cp /usr/share/applications/chromium.desktop $HOME/Desktop/ cp /usr/share/applications/chromium.desktop $HOME/Desktop/
@ -21,13 +16,8 @@ cat >/usr/bin/chromium-browser <<EOL
#!/usr/bin/env bash #!/usr/bin/env bash
sed -i 's/"exited_cleanly":false/"exited_cleanly":true/' ~/.config/chromium/Default/Preferences sed -i 's/"exited_cleanly":false/"exited_cleanly":true/' ~/.config/chromium/Default/Preferences
sed -i 's/"exit_type":"Crashed"/"exit_type":"None"/' ~/.config/chromium/Default/Preferences sed -i 's/"exit_type":"Crashed"/"exit_type":"None"/' ~/.config/chromium/Default/Preferences
if [ -f /opt/VirtualGL/bin/vglrun ] && [ ! -z "\${KASM_EGL_CARD}" ] && [ ! -z "\${KASM_RENDERD}" ] && [ -O "\${KASM_RENDERD}" ] && [ -O "\${KASM_EGL_CARD}" ] ; then echo "Starting Chrome"
echo "Starting Chrome with GPU Acceleration on EGL device \${KASM_EGL_CARD}" /usr/bin/chromium-browser-orig ${CHROME_ARGS} "\$@"
vglrun -d "\${KASM_EGL_CARD}" /usr/bin/chromium-browser-orig ${CHROME_ARGS} "\$@"
else
echo "Starting Chrome"
/usr/bin/chromium-browser-orig ${CHROME_ARGS} "\$@"
fi
EOL EOL
chmod +x /usr/bin/chromium-browser chmod +x /usr/bin/chromium-browser