From 1e0b015538e2b2b6f78bec753d17da29b3102288 Mon Sep 17 00:00:00 2001 From: Justin Travis Date: Wed, 5 Mar 2025 17:04:46 -0500 Subject: [PATCH 1/2] KASM-5954 KasmOS to multi arch images --- ci-scripts/template-vars.yaml | 40 +++++++++++++++++------------------ 1 file changed, 20 insertions(+), 20 deletions(-) diff --git a/ci-scripts/template-vars.yaml b/ci-scripts/template-vars.yaml index 9e58364..30944fc 100644 --- a/ci-scripts/template-vars.yaml +++ b/ci-scripts/template-vars.yaml @@ -78,6 +78,26 @@ multiImages: - src/ubuntu/install/firefox/** - src/ubuntu/install/chrome/** - src/ubuntu/install/eclipse/** + - name: kasmos-desktop + singleapp: false + base: core-kasmos + dockerfile: dockerfile-kasmos-desktop + changeFiles: + - src/ubuntu/install/chrome/** + - src/ubuntu/install/chromium/** + - src/ubuntu/intall/only_office/** + - src/ubuntu/install/libre_office/** + - src/ubuntu/install/misc/** + - src/kasmos/install/browser/** + - src/ubuntu/install/vs_code/** + - src/ubuntu/install/nextcloud/** + - src/ubuntu/install/remmina/** + - src/kasmos/install/office/** + - src/ubuntu/install/zoom/** + - src/ubuntu/install/thunderbird/** + - src/ubuntu/install/slack/** + - src/ubuntu/install/gamepad_utils/** + - src/ubuntu/install/cleanup/** - name: libre-office singleapp: true base: core-ubuntu-focal @@ -770,26 +790,6 @@ singleImages: dockerfile: dockerfile-kasm-only-office changeFiles: - dockerfile-kasm-only-office - - name: kasmos-desktop - singleapp: false - base: core-kasmos - dockerfile: dockerfile-kasmos-desktop - changeFiles: - - src/ubuntu/install/chrome/** - - src/ubuntu/install/chromium/** - - src/ubuntu/intall/only_office/** - - src/ubuntu/install/libre_office/** - - src/ubuntu/install/misc/** - - src/kasmos/install/browser/** - - src/ubuntu/install/vs_code/** - - src/ubuntu/install/nextcloud/** - - src/ubuntu/install/remmina/** - - src/kasmos/install/office/** - - src/ubuntu/install/zoom/** - - src/ubuntu/install/thunderbird/** - - src/ubuntu/install/slack/** - - src/ubuntu/install/gamepad_utils/** - - src/ubuntu/install/cleanup/** - name: postman singleapp: true base: core-ubuntu-focal From c658d57ae1da173148e313cc9dc6a46e11ae7d9a Mon Sep 17 00:00:00 2001 From: Justin Travis Date: Thu, 6 Mar 2025 01:42:42 -0500 Subject: [PATCH 2/2] KASM-5954 Fixup arm64 libreoffice --- src/kasmos/install/office/install_office_app.sh | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/kasmos/install/office/install_office_app.sh b/src/kasmos/install/office/install_office_app.sh index 49c33b7..f14fc96 100644 --- a/src/kasmos/install/office/install_office_app.sh +++ b/src/kasmos/install/office/install_office_app.sh @@ -9,5 +9,9 @@ if [ "$ARCH" == "amd64" ] ; then cp ${INST_DIR}/kasmos/resources/onlyoffice/*.desktop /usr/share/applications/ else apt update - apt install -y libreoffice-plasma + apt install -y libreoffice + # Replace built in launcher app shortcuts to launch libreoffice apps + sed -i "s/^Exec=.*/Exec=libreoffice --writer/g" /usr/share/applications/docs-editor.desktop + sed -i "s/^Exec=.*/Exec=libreoffice --calc/g" /usr/share/applications/sheets-editor.desktop + sed -i "s/^Exec=.*/Exec=libreoffice --impress/g" /usr/share/applications/present-editor.desktop fi \ No newline at end of file