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

Merge branch 'buildfix/KASM-5029-1.12.0' into 'release/1.12.0'

Browse Source 
KASM-5029 build fixes for 1.12.0 run apt update for firefox installs and point...

See merge request kasm-technologies/internal/workspaces-images!142
This commit is contained in:
Richard Koliser 2023-09-12 19:43:34 +00:00
commit 2c5becd274
4 changed files with 5 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
.gitlab-ci.yml
View File

@ -61,7 +61,6 @@ variables:
- postman
- signal
- steam
- tracelabs
- ubuntu-focal-dind
- ubuntu-focal-dind-rootless
- ubuntu-jammy-dind
@ -189,7 +188,6 @@ build_non_ubuntu:
- ls docs/$KASM_IMAGE/description.txt
# Set base image based on kasm_image variable
- if [[ $KASM_IMAGE =~ 'centos-7-desktop' ]]; then CORE_IMAGE=core-centos-7; fi
- if [[ $KASM_IMAGE =~ 'tracelabs' ]]; then CORE_IMAGE=core-kali-rolling; fi
- if [[ $KASM_IMAGE =~ 'oracle-7-desktop' ]]; then CORE_IMAGE=core-oracle-7; fi
- if [[ $KASM_IMAGE =~ 'oracle-8-desktop' ]]; then CORE_IMAGE=core-oracle-8; fi
- if [[ $KASM_IMAGE =~ 'opensuse-15-desktop' ]]; then CORE_IMAGE=core-opensuse-15; fi
@ -207,7 +205,7 @@ build_non_ubuntu:
- aws-autoscale
parallel:
matrix:
- KASM_IMAGE: [centos-7-desktop, tracelabs, opensuse-15-desktop, oracle-7-desktop, oracle-8-desktop]
- KASM_IMAGE: [centos-7-desktop, opensuse-15-desktop, oracle-7-desktop, oracle-8-desktop]
build_games:
stage: build
@ -248,7 +246,6 @@ build_multi_arch_dev:
- ls docs/$KASM_IMAGE/description.txt
# Set core image names
- if [[ $KASM_IMAGE =~ 'centos-7-desktop' ]]; then CORE_IMAGE=core-centos-7; fi
- if [[ $KASM_IMAGE =~ 'tracelabs' ]]; then CORE_IMAGE=core-kali-rolling; fi
- if [[ $KASM_IMAGE =~ 'oracle-7-desktop' ]]; then CORE_IMAGE=core-oracle-7; fi
- if [[ $KASM_IMAGE =~ 'oracle-8-desktop' ]]; then CORE_IMAGE=core-oracle-8; fi
- if [[ $KASM_IMAGE =~ 'opensuse-15-desktop' ]]; then CORE_IMAGE=core-opensuse-15; fi
@ -281,7 +278,6 @@ build_multi_arch_dev2:
- ls docs/$KASM_IMAGE/description.txt
# Set core image names
- if [[ $KASM_IMAGE =~ 'centos-7-desktop' ]]; then CORE_IMAGE=core-centos-7; fi
- if [[ $KASM_IMAGE =~ 'tracelabs' ]]; then CORE_IMAGE=core-kali-rolling; fi
- if [[ $KASM_IMAGE =~ 'oracle-7-desktop' ]]; then CORE_IMAGE=core-oracle-7; fi
- if [[ $KASM_IMAGE =~ 'oracle-8-desktop' ]]; then CORE_IMAGE=core-oracle-8; fi
- if [[ $KASM_IMAGE =~ 'opensuse-15-desktop' ]]; then CORE_IMAGE=core-opensuse-15; fi
@ -314,7 +310,6 @@ build_single_arch_dev:
- ls docs/$KASM_IMAGE/description.txt
# Set core image names
- if [[ $KASM_IMAGE =~ 'centos-7-desktop' ]]; then CORE_IMAGE=core-centos-7; fi
- if [[ $KASM_IMAGE =~ 'tracelabs' ]]; then CORE_IMAGE=core-kali-rolling; fi
- if [[ $KASM_IMAGE =~ 'oracle-7-desktop' ]]; then CORE_IMAGE=core-oracle-7; fi
- if [[ $KASM_IMAGE =~ 'oracle-8-desktop' ]]; then CORE_IMAGE=core-oracle-8; fi
- if [[ $KASM_IMAGE =~ 'opensuse-15-desktop' ]]; then CORE_IMAGE=core-opensuse-15; fi
@ -623,7 +618,6 @@ build_schedules_non_ubuntu:
- ls docs/$KASM_IMAGE/description.txt
# Set base image based on kasm_image variable
- if [[ $KASM_IMAGE =~ 'centos-7-desktop' ]]; then CORE_IMAGE=core-centos-7; fi
- if [[ $KASM_IMAGE =~ 'tracelabs' ]]; then CORE_IMAGE=core-kali-rolling; fi
- if [[ $KASM_IMAGE =~ 'oracle-7-desktop' ]]; then CORE_IMAGE=core-oracle-7; fi
- if [[ $KASM_IMAGE =~ 'oracle-8-desktop' ]]; then CORE_IMAGE=core-oracle-8; fi
- if [[ $KASM_IMAGE =~ 'opensuse-15-desktop' ]]; then CORE_IMAGE=core-opensuse-15; fi
@ -639,7 +633,7 @@ build_schedules_non_ubuntu:
- aws-autoscale
parallel:
matrix:
- KASM_IMAGE: [centos-7-desktop, tracelabs, opensuse-15-desktop, oracle-7-desktop, oracle-8-desktop]
- KASM_IMAGE: [centos-7-desktop, opensuse-15-desktop, oracle-7-desktop, oracle-8-desktop]
build_schedules_games:
image: ${ORG_NAME}/docker-buildx-private:develop
@ -726,7 +720,6 @@ update_readmes:
- terminal
- thunderbird
- tor-browser
- tracelabs
- ubuntu-focal-desktop
- ubuntu-jammy-desktop
- ubuntu-focal-dind

1
README.md
View File

@ -42,3 +42,4 @@ A self-guided on-demand demo is available at [**kasmweb.com**](https://www.kasmw
[logo]: https://cdn2.hubspot.net/hubfs/5856039/dockerhub/kasm_logo.png "Kasm Logo"
[Kasm_Workflow]: https://cdn2.hubspot.net/hubfs/5856039/dockerhub/kasm_workflow_960.gif "Kasm Workflow"

1
src/ubuntu/install/firefox/install_firefox.sh
View File

@ -27,6 +27,7 @@ Pin-Priority: 1001
fi
apt-get install -y firefox p11-kit-modules
else
apt-get update
apt-mark unhold firefox
apt-get remove firefox
apt-get update

2
src/ubuntu/install/retroarch/install_retroarch.sh
View File

@ -1,7 +1,7 @@
#!/usr/bin/env bash
set -ex
SCRIPT_PATH="$( cd "$(dirname "$0")" ; pwd -P )"
add-apt-repository -y ppa:libretro/testing
add-apt-repository -y ppa:libretro/stable
apt-get update
apt-get install -y retroarch
cp /usr/share/applications/retroarch.desktop $HOME/Desktop/