diff --git a/ci-scripts/test.sh b/ci-scripts/test.sh index 1bfe94f..54c27b1 100755 --- a/ci-scripts/test.sh +++ b/ci-scripts/test.sh @@ -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 diff --git a/dockerfile-kasm-alpine-317-desktop b/dockerfile-kasm-alpine-317-desktop index 8f398d0..4a298ca 100644 --- a/dockerfile-kasm-alpine-317-desktop +++ b/dockerfile-kasm-alpine-317-desktop @@ -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" diff --git a/dockerfile-kasm-alpine-318-desktop b/dockerfile-kasm-alpine-318-desktop index 0653dfa..f51eefc 100644 --- a/dockerfile-kasm-alpine-318-desktop +++ b/dockerfile-kasm-alpine-318-desktop @@ -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" diff --git a/dockerfile-kasm-alpine-319-desktop b/dockerfile-kasm-alpine-319-desktop index 71645e7..491a73b 100644 --- a/dockerfile-kasm-alpine-319-desktop +++ b/dockerfile-kasm-alpine-319-desktop @@ -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" diff --git a/dockerfile-kasm-alpine-320-desktop b/dockerfile-kasm-alpine-320-desktop index 5003a9c..2a61d9e 100644 --- a/dockerfile-kasm-alpine-320-desktop +++ b/dockerfile-kasm-alpine-320-desktop @@ -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" diff --git a/src/alpine/install/chromium/install_chromium.sh b/src/alpine/install/chromium/install_chromium.sh index d9871bc..9f33bd8 100644 --- a/src/alpine/install/chromium/install_chromium.sh +++ b/src/alpine/install/chromium/install_chromium.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 <