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.11.0' into 'release/1.11.0'

Browse Source 
Resolve KASM-5029 "Buildfix/ 1.11.0"

See merge request kasm-technologies/internal/workspaces-images!141
This commit is contained in:
Richard Koliser 2023-09-12 19:41:06 +00:00
commit 314671a636
3 changed files with 4 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
.gitlab-ci.yml
View File

@ -55,7 +55,6 @@ variables:
- postman
- signal
- steam
- tracelabs
- ubuntu-focal-dind
- ubuntu-focal-dind-rootless
- vmware-horizon
@ -179,7 +178,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
@ -197,7 +195,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]
# These jobs should run on the feature/bugfix branches - anything that is not the develop or release branches. It should only push images to the private repos
build_multi_arch_dev:
@ -209,7 +207,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
@ -242,7 +239,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
@ -475,7 +471,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
@ -491,7 +486,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]
update_readmes:
@ -564,7 +559,6 @@ update_readmes:
- terminal
- thunderbird
- tor-browser
- tracelabs
- ubuntu-focal-desktop
- ubuntu-jammy-desktop
- ubuntu-focal-dind

3
src/opensuse/install/terraform/install_terraform.sh
View File

@ -6,6 +6,5 @@ zypper install -yn \
terraform-provider-aws \
terraform-provider-azurerm \
terraform-provider-google \
terraform-provider-kubernetes \
terraform-provider-openstack
terraform-provider-kubernetes
zypper clean --all

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