mirror of
https://github.com/kasmtech/workspaces-images.git
synced 2024-11-24 17:13:10 +01:00
Merge branch 'feature/KASM-6543-add-chromium-alpine' into 'develop'
Resolve KASM-6543 "Feature/ add chromium alpine" Closes KASM-6543 See merge request kasm-technologies/internal/workspaces-images!201
This commit is contained in:
commit
fc7d5a9a75
@ -188,7 +188,7 @@ ssh \
|
||||
ready_check
|
||||
|
||||
# Pull tester image
|
||||
docker pull ${ORG_NAME}/kasm-tester:1.15.0
|
||||
docker pull ${ORG_NAME}/kasm-tester:1.16.0
|
||||
|
||||
# Run test
|
||||
cp /root/.ssh/id_rsa $(dirname ${CI_PROJECT_DIR})/sshkey
|
||||
@ -210,7 +210,7 @@ docker run --rm \
|
||||
-e REPO=workspaces-images \
|
||||
-e AUTOMATED=true \
|
||||
-v $(dirname ${CI_PROJECT_DIR})/sshkey:/sshkey:ro ${SLIM_FLAG} \
|
||||
kasmweb/kasm-tester:1.15.0
|
||||
kasmweb/kasm-tester:1.16.0
|
||||
|
||||
# Shutdown Instances
|
||||
turnoff
|
||||
|
@ -28,6 +28,7 @@ ENV SKIP_CLEAN=true \
|
||||
/alpine/install/pinta/install_pinta.sh \
|
||||
/alpine/install/obs/install_obs.sh \
|
||||
/alpine/install/filezilla/install_filezilla.sh \
|
||||
/alpine/install/chromium/install_chromium.sh \
|
||||
/ubuntu/install/langpacks/install_langpacks.sh \
|
||||
/ubuntu/install/cleanup/cleanup.sh"
|
||||
|
||||
|
@ -28,6 +28,7 @@ ENV SKIP_CLEAN=true \
|
||||
/alpine/install/pinta/install_pinta.sh \
|
||||
/alpine/install/obs/install_obs.sh \
|
||||
/alpine/install/filezilla/install_filezilla.sh \
|
||||
/alpine/install/chromium/install_chromium.sh \
|
||||
/ubuntu/install/langpacks/install_langpacks.sh \
|
||||
/ubuntu/install/cleanup/cleanup.sh"
|
||||
|
||||
|
@ -28,6 +28,7 @@ ENV SKIP_CLEAN=true \
|
||||
/alpine/install/pinta/install_pinta.sh \
|
||||
/alpine/install/obs/install_obs.sh \
|
||||
/alpine/install/filezilla/install_filezilla.sh \
|
||||
/alpine/install/chromium/install_chromium.sh \
|
||||
/ubuntu/install/langpacks/install_langpacks.sh \
|
||||
/ubuntu/install/cleanup/cleanup.sh"
|
||||
|
||||
|
@ -28,6 +28,7 @@ ENV SKIP_CLEAN=true \
|
||||
/alpine/install/pinta/install_pinta.sh \
|
||||
/alpine/install/obs/install_obs.sh \
|
||||
/alpine/install/filezilla/install_filezilla.sh \
|
||||
/alpine/install/chromium/install_chromium.sh \
|
||||
/ubuntu/install/langpacks/install_langpacks.sh \
|
||||
/ubuntu/install/cleanup/cleanup.sh"
|
||||
|
||||
|
@ -6,11 +6,6 @@ CHROME_ARGS="--password-store=basic --no-sandbox --ignore-gpu-blocklist --user-
|
||||
apk add --no-cache \
|
||||
chromium
|
||||
|
||||
if [ "$(arch)" == "x86_64" ]; then
|
||||
apk add --no-cache --repository=http://dl-cdn.alpinelinux.org/alpine/edge/testing \
|
||||
virtualgl
|
||||
fi
|
||||
|
||||
REAL_BIN=chromium
|
||||
|
||||
cp /usr/share/applications/chromium.desktop $HOME/Desktop/
|
||||
@ -21,13 +16,8 @@ cat >/usr/bin/chromium-browser <<EOL
|
||||
#!/usr/bin/env bash
|
||||
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
|
||||
if [ -f /opt/VirtualGL/bin/vglrun ] && [ ! -z "\${KASM_EGL_CARD}" ] && [ ! -z "\${KASM_RENDERD}" ] && [ -O "\${KASM_RENDERD}" ] && [ -O "\${KASM_EGL_CARD}" ] ; then
|
||||
echo "Starting Chrome with GPU Acceleration on EGL device \${KASM_EGL_CARD}"
|
||||
vglrun -d "\${KASM_EGL_CARD}" /usr/bin/chromium-browser-orig ${CHROME_ARGS} "\$@"
|
||||
else
|
||||
echo "Starting Chrome"
|
||||
/usr/bin/chromium-browser-orig ${CHROME_ARGS} "\$@"
|
||||
fi
|
||||
echo "Starting Chrome"
|
||||
/usr/bin/chromium-browser-orig ${CHROME_ARGS} "\$@"
|
||||
EOL
|
||||
chmod +x /usr/bin/chromium-browser
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user