From 23f4cbdf7ad2037d1eef1ed62aa20d3c765d2feb Mon Sep 17 00:00:00 2001 From: Huan Truong Date: Mon, 20 Apr 2026 13:03:32 -0500 Subject: [PATCH] KASM-8341 add and remove workspaces images --- ci-scripts/build.sh | 2 +- ci-scripts/template-vars.yaml | 88 ++++++++----------- ...ktop => dockerfile-kasm-alpine-322-desktop | 4 +- ...ktop => dockerfile-kasm-alpine-323-desktop | 4 +- dockerfile-kasm-fedora-39-desktop | 54 ------------ ...sktop => dockerfile-kasm-fedora-42-desktop | 4 +- ...sktop => dockerfile-kasm-fedora-43-desktop | 4 +- ...top => dockerfile-kasm-opensuse-16-desktop | 2 +- ...ktop => dockerfile-kasm-parrotos-7-desktop | 2 +- docs/alpine-319-desktop/description.txt | 1 - docs/alpine-320-desktop/description.txt | 1 - .../README.md | 2 +- .../demo.txt | 0 docs/alpine-322-desktop/description.txt | 1 + .../README.md | 2 +- .../demo.txt | 0 docs/alpine-323-desktop/description.txt | 1 + docs/fedora-39-desktop/description.txt | 1 - docs/fedora-40-desktop/README.md | 7 -- docs/fedora-40-desktop/description.txt | 1 - docs/fedora-41-desktop/description.txt | 1 - .../README.md | 2 +- .../demo.txt | 0 docs/fedora-42-desktop/description.txt | 1 + .../README.md | 2 +- .../demo.txt | 0 docs/fedora-43-desktop/description.txt | 1 + docs/opensuse-15-desktop/description.txt | 1 - .../README.md | 2 +- .../demo.txt | 0 docs/opensuse-16-desktop/description.txt | 1 + docs/parrotos-6-desktop/demo.txt | 9 -- docs/parrotos-6-desktop/description.txt | 1 - .../README.md | 2 +- .../demo.txt | 0 docs/parrotos-7-desktop/description.txt | 1 + src/alpine/install/blender/install_blender.sh | 2 +- .../install/terraform/install_terraform.sh | 5 +- .../install/vs_code/install_vs_code.sh | 2 - src/oracle/install/ansible/install_ansible.sh | 2 +- src/oracle/install/gimp/install_gimp.sh | 2 +- .../libre_office/install_libre_office.sh | 2 +- .../only_office/install_only_office.sh | 4 +- src/oracle/install/slack/install_slack.sh | 2 +- .../sublime_text/install_sublime_text.sh | 4 +- .../install/terraform/install_terraform.sh | 7 +- src/oracle/install/vs_code/install_vs_code.sh | 6 +- src/oracle/install/zoom/install_zoom.sh | 4 +- .../install/chromium/install_chromium.sh | 4 +- src/ubuntu/install/cleanup/cleanup.sh | 4 +- src/ubuntu/install/firefox/install_firefox.sh | 22 ++--- src/ubuntu/install/remmina/install_remmina.sh | 4 +- src/ubuntu/install/slack/install_slack.sh | 6 +- .../thunderbird/install_thunderbird.sh | 7 +- src/ubuntu/install/vpn/install_vpn.sh | 6 +- 55 files changed, 102 insertions(+), 198 deletions(-) rename dockerfile-kasm-alpine-319-desktop => dockerfile-kasm-alpine-322-desktop (97%) rename dockerfile-kasm-alpine-320-desktop => dockerfile-kasm-alpine-323-desktop (97%) delete mode 100644 dockerfile-kasm-fedora-39-desktop rename dockerfile-kasm-fedora-41-desktop => dockerfile-kasm-fedora-42-desktop (97%) rename dockerfile-kasm-fedora-40-desktop => dockerfile-kasm-fedora-43-desktop (97%) rename dockerfile-kasm-opensuse-15-desktop => dockerfile-kasm-opensuse-16-desktop (98%) rename dockerfile-kasm-parrotos-6-desktop => dockerfile-kasm-parrotos-7-desktop (97%) delete mode 100644 docs/alpine-319-desktop/description.txt delete mode 100644 docs/alpine-320-desktop/description.txt rename docs/{alpine-319-desktop => alpine-322-desktop}/README.md (78%) rename docs/{alpine-319-desktop => alpine-322-desktop}/demo.txt (100%) create mode 100644 docs/alpine-322-desktop/description.txt rename docs/{alpine-320-desktop => alpine-323-desktop}/README.md (78%) rename docs/{alpine-320-desktop => alpine-323-desktop}/demo.txt (100%) create mode 100644 docs/alpine-323-desktop/description.txt delete mode 100644 docs/fedora-39-desktop/description.txt delete mode 100644 docs/fedora-40-desktop/README.md delete mode 100644 docs/fedora-40-desktop/description.txt delete mode 100644 docs/fedora-41-desktop/description.txt rename docs/{fedora-41-desktop => fedora-42-desktop}/README.md (78%) rename docs/{fedora-39-desktop => fedora-42-desktop}/demo.txt (100%) create mode 100644 docs/fedora-42-desktop/description.txt rename docs/{fedora-39-desktop => fedora-43-desktop}/README.md (78%) rename docs/{fedora-40-desktop => fedora-43-desktop}/demo.txt (100%) create mode 100644 docs/fedora-43-desktop/description.txt delete mode 100644 docs/opensuse-15-desktop/description.txt rename docs/{opensuse-15-desktop => opensuse-16-desktop}/README.md (79%) rename docs/{opensuse-15-desktop => opensuse-16-desktop}/demo.txt (100%) create mode 100644 docs/opensuse-16-desktop/description.txt delete mode 100644 docs/parrotos-6-desktop/demo.txt delete mode 100644 docs/parrotos-6-desktop/description.txt rename docs/{parrotos-6-desktop => parrotos-7-desktop}/README.md (78%) rename docs/{fedora-41-desktop => parrotos-7-desktop}/demo.txt (100%) create mode 100644 docs/parrotos-7-desktop/description.txt diff --git a/ci-scripts/build.sh b/ci-scripts/build.sh index 73224ca..0d4c15d 100755 --- a/ci-scripts/build.sh +++ b/ci-scripts/build.sh @@ -6,7 +6,7 @@ BASE=$2 DOCKERFILE=$3 # Determine if we are using private images -if [ ${USE_PRIVATE_IMAGES} -eq 1 ]; then +if [[ ${USE_PRIVATE_IMAGES} -eq 1 ]]; then BASE=${BASE}-private fi diff --git a/ci-scripts/template-vars.yaml b/ci-scripts/template-vars.yaml index f840c6b..67932e5 100644 --- a/ci-scripts/template-vars.yaml +++ b/ci-scripts/template-vars.yaml @@ -144,13 +144,13 @@ multiImages: - dockerfile-kasm-obsidian - src/ubuntu/install/obsidian/** - src/ubuntu/install/chrome/** - - name: opensuse-15-desktop + - name: opensuse-16-desktop runset: set-a singleapp: false - base: core-opensuse-15 - dockerfile: dockerfile-kasm-opensuse-15-desktop + base: core-opensuse-16 + dockerfile: dockerfile-kasm-opensuse-16-desktop changeFiles: - - dockerfile-kasm-opensuse-15-desktop + - dockerfile-kasm-opensuse-16-desktop - src/ubuntu/install/thunderbird/** - src/ubuntu/install/remmina/** - src/ubuntu/install/nextcloud/** @@ -402,26 +402,6 @@ multiImages: - src/ubuntu/install/cleanup/** - src/ubuntu/install/chromium/** - src/ubuntu/install/slack/** - - name: alpine-319-desktop - runset: set-b - singleapp: false - base: core-alpine-319 - dockerfile: dockerfile-kasm-alpine-319-desktop - changeFiles: - - dockerfile-kasm-alpine-319-desktop - - src/ubuntu/install/langpacks/** - - src/ubuntu/install/cleanup/** - - src/alpine/install/** - - name: alpine-320-desktop - runset: set-a - singleapp: false - base: core-alpine-320 - dockerfile: dockerfile-kasm-alpine-320-desktop - changeFiles: - - dockerfile-kasm-alpine-320-desktop - - src/ubuntu/install/langpacks/** - - src/ubuntu/install/cleanup/** - - src/alpine/install/** - name: alpine-321-desktop runset: set-b singleapp: false @@ -432,6 +412,26 @@ multiImages: - src/ubuntu/install/langpacks/** - src/ubuntu/install/cleanup/** - src/alpine/install/** + - name: alpine-322-desktop + runset: set-a + singleapp: false + base: core-alpine-322 + dockerfile: dockerfile-kasm-alpine-322-desktop + changeFiles: + - dockerfile-kasm-alpine-322-desktop + - src/ubuntu/install/langpacks/** + - src/ubuntu/install/cleanup/** + - src/alpine/install/** + - name: alpine-323-desktop + runset: set-b + singleapp: false + base: core-alpine-323 + dockerfile: dockerfile-kasm-alpine-323-desktop + changeFiles: + - dockerfile-kasm-alpine-323-desktop + - src/ubuntu/install/langpacks/** + - src/ubuntu/install/cleanup/** + - src/alpine/install/** - name: brave runset: set-a singleapp: true @@ -519,13 +519,13 @@ multiImages: - src/ubuntu/install/ansible/** - src/ubuntu/install/chrome/** - src/ubuntu/install/slack/** - - name: fedora-39-desktop - runset: set-b + - name: fedora-42-desktop + runset: set-a singleapp: false - base: core-fedora-39 - dockerfile: dockerfile-kasm-fedora-39-desktop + base: core-fedora-42 + dockerfile: dockerfile-kasm-fedora-42-desktop changeFiles: - - dockerfile-kasm-fedora-39-desktop + - dockerfile-kasm-fedora-42-desktop - src/oracle/install/** - src/ubuntu/install/thunderbird/** - src/ubuntu/install/remmina/** @@ -533,27 +533,13 @@ multiImages: - src/ubuntu/install/cleanup/** - src/ubuntu/install/chromium/** - src/ubuntu/install/slack/** - - name: fedora-40-desktop + - name: fedora-43-desktop runset: set-a singleapp: false - base: core-fedora-40 - dockerfile: dockerfile-kasm-fedora-40-desktop + base: core-fedora-43 + dockerfile: dockerfile-kasm-fedora-43-desktop changeFiles: - - dockerfile-kasm-fedora-40-desktop - - src/oracle/install/** - - src/ubuntu/install/thunderbird/** - - src/ubuntu/install/remmina/** - - src/ubuntu/install/firefox/** - - src/ubuntu/install/cleanup/** - - src/ubuntu/install/chromium/** - - src/ubuntu/install/slack/** - - name: fedora-41-desktop - runset: set-a - singleapp: false - base: core-fedora-41 - dockerfile: dockerfile-kasm-fedora-41-desktop - changeFiles: - - dockerfile-kasm-fedora-41-desktop + - dockerfile-kasm-fedora-43-desktop - src/oracle/install/** - src/ubuntu/install/thunderbird/** - src/ubuntu/install/remmina/** @@ -616,13 +602,13 @@ multiImages: - src/ubuntu/install/cleanup/** - src/ubuntu/install/chromium/** - src/ubuntu/install/slack/** - - name: parrotos-6-desktop + - name: parrotos-7-desktop runset: set-a singleapp: false - base: core-parrotos-6 - dockerfile: dockerfile-kasm-parrotos-6-desktop + base: core-parrotos-7 + dockerfile: dockerfile-kasm-parrotos-7-desktop changeFiles: - - dockerfile-kasm-parrotos-6-desktop + - dockerfile-kasm-parrotos-7-desktop - src/ubuntu/install/parrot/** - src/ubuntu/install/firefox/** - src/ubuntu/install/cleanup/** diff --git a/dockerfile-kasm-alpine-319-desktop b/dockerfile-kasm-alpine-322-desktop similarity index 97% rename from dockerfile-kasm-alpine-319-desktop rename to dockerfile-kasm-alpine-322-desktop index 491a73b..587225f 100644 --- a/dockerfile-kasm-alpine-319-desktop +++ b/dockerfile-kasm-alpine-322-desktop @@ -1,10 +1,10 @@ ARG BASE_TAG="develop" -ARG BASE_IMAGE="core-alpine-319" +ARG BASE_IMAGE="core-alpine-322" FROM kasmweb/$BASE_IMAGE:$BASE_TAG USER root -ENV DISTRO=alpine319 +ENV DISTRO=alpine322 ENV HOME /home/kasm-default-profile ENV STARTUPDIR /dockerstartup WORKDIR $HOME diff --git a/dockerfile-kasm-alpine-320-desktop b/dockerfile-kasm-alpine-323-desktop similarity index 97% rename from dockerfile-kasm-alpine-320-desktop rename to dockerfile-kasm-alpine-323-desktop index 2a61d9e..4f6210e 100644 --- a/dockerfile-kasm-alpine-320-desktop +++ b/dockerfile-kasm-alpine-323-desktop @@ -1,10 +1,10 @@ ARG BASE_TAG="develop" -ARG BASE_IMAGE="core-alpine-320" +ARG BASE_IMAGE="core-alpine-323" FROM kasmweb/$BASE_IMAGE:$BASE_TAG USER root -ENV DISTRO=alpine320 +ENV DISTRO=alpine323 ENV HOME /home/kasm-default-profile ENV STARTUPDIR /dockerstartup WORKDIR $HOME diff --git a/dockerfile-kasm-fedora-39-desktop b/dockerfile-kasm-fedora-39-desktop deleted file mode 100644 index c0c0efa..0000000 --- a/dockerfile-kasm-fedora-39-desktop +++ /dev/null @@ -1,54 +0,0 @@ -ARG BASE_TAG="develop" -ARG BASE_IMAGE="core-fedora-39" -FROM kasmweb/$BASE_IMAGE:$BASE_TAG - -USER root - -ENV DISTRO=fedora39 -ENV HOME /home/kasm-default-profile -ENV STARTUPDIR /dockerstartup -WORKDIR $HOME - -### Envrionment config -ENV SKIP_CLEAN=true \ - KASM_RX_HOME=$STARTUPDIR/kasmrx \ - DONT_PROMPT_WSL_INSTALL="No_Prompt_please" \ - INST_DIR=$STARTUPDIR/install \ - INST_SCRIPTS="/oracle/install/tools/install_tools_deluxe.sh \ - /oracle/install/misc/install_tools.sh \ - /ubuntu/install/chromium/install_chromium.sh \ - /ubuntu/install/firefox/install_firefox.sh \ - /oracle/install/sublime_text/install_sublime_text.sh \ - /oracle/install/vs_code/install_vs_code.sh \ - /ubuntu/install/remmina/install_remmina.sh \ - /oracle/install/only_office/install_only_office.sh \ - /oracle/install/gimp/install_gimp.sh \ - /oracle/install/zoom/install_zoom.sh \ - /oracle/install/ansible/install_ansible.sh \ - /oracle/install/telegram/install_telegram.sh \ - /oracle/install/terraform/install_terraform.sh \ - /ubuntu/install/thunderbird/install_thunderbird.sh \ - /ubuntu/install/slack/install_slack.sh \ - /ubuntu/install/cleanup/cleanup.sh" - -# Copy install scripts -COPY ./src/ $INST_DIR - -# Run installations -RUN \ - for SCRIPT in $INST_SCRIPTS; do \ - bash ${INST_DIR}${SCRIPT} || exit 1; \ - done && \ - $STARTUPDIR/set_user_permission.sh $HOME && \ - rm -f /etc/X11/xinit/Xclients && \ - chown 1000:0 $HOME && \ - mkdir -p /home/kasm-user && \ - chown -R 1000:0 /home/kasm-user && \ - rm -Rf ${INST_DIR} - -# Userspace Runtime -ENV HOME /home/kasm-user -WORKDIR $HOME -USER 1000 - -CMD ["--tail-log"] diff --git a/dockerfile-kasm-fedora-41-desktop b/dockerfile-kasm-fedora-42-desktop similarity index 97% rename from dockerfile-kasm-fedora-41-desktop rename to dockerfile-kasm-fedora-42-desktop index 7f97ee1..0837d65 100644 --- a/dockerfile-kasm-fedora-41-desktop +++ b/dockerfile-kasm-fedora-42-desktop @@ -1,10 +1,10 @@ ARG BASE_TAG="develop" -ARG BASE_IMAGE="core-fedora-41" +ARG BASE_IMAGE="core-fedora-42" FROM kasmweb/$BASE_IMAGE:$BASE_TAG USER root -ENV DISTRO=fedora41 +ENV DISTRO=fedora42 ENV HOME /home/kasm-default-profile ENV STARTUPDIR /dockerstartup WORKDIR $HOME diff --git a/dockerfile-kasm-fedora-40-desktop b/dockerfile-kasm-fedora-43-desktop similarity index 97% rename from dockerfile-kasm-fedora-40-desktop rename to dockerfile-kasm-fedora-43-desktop index bcbbcaa..3e3a67e 100644 --- a/dockerfile-kasm-fedora-40-desktop +++ b/dockerfile-kasm-fedora-43-desktop @@ -1,10 +1,10 @@ ARG BASE_TAG="develop" -ARG BASE_IMAGE="core-fedora-40" +ARG BASE_IMAGE="core-fedora-43" FROM kasmweb/$BASE_IMAGE:$BASE_TAG USER root -ENV DISTRO=fedora40 +ENV DISTRO=fedora43 ENV HOME /home/kasm-default-profile ENV STARTUPDIR /dockerstartup WORKDIR $HOME diff --git a/dockerfile-kasm-opensuse-15-desktop b/dockerfile-kasm-opensuse-16-desktop similarity index 98% rename from dockerfile-kasm-opensuse-15-desktop rename to dockerfile-kasm-opensuse-16-desktop index cedbe50..42dbdd7 100644 --- a/dockerfile-kasm-opensuse-15-desktop +++ b/dockerfile-kasm-opensuse-16-desktop @@ -1,5 +1,5 @@ ARG BASE_TAG="develop" -ARG BASE_IMAGE="core-opensuse-15" +ARG BASE_IMAGE="core-opensuse-16" FROM kasmweb/$BASE_IMAGE:$BASE_TAG USER root diff --git a/dockerfile-kasm-parrotos-6-desktop b/dockerfile-kasm-parrotos-7-desktop similarity index 97% rename from dockerfile-kasm-parrotos-6-desktop rename to dockerfile-kasm-parrotos-7-desktop index 729ca05..747d2b6 100644 --- a/dockerfile-kasm-parrotos-6-desktop +++ b/dockerfile-kasm-parrotos-7-desktop @@ -1,5 +1,5 @@ ARG BASE_TAG="develop" -ARG BASE_IMAGE="core-parrotos-6" +ARG BASE_IMAGE="core-parrotos-7" FROM kasmweb/$BASE_IMAGE:$BASE_TAG USER root diff --git a/docs/alpine-319-desktop/description.txt b/docs/alpine-319-desktop/description.txt deleted file mode 100644 index ea19919..0000000 --- a/docs/alpine-319-desktop/description.txt +++ /dev/null @@ -1 +0,0 @@ -Alpine 3.19 desktop for Kasm Workspaces diff --git a/docs/alpine-320-desktop/description.txt b/docs/alpine-320-desktop/description.txt deleted file mode 100644 index 428fba0..0000000 --- a/docs/alpine-320-desktop/description.txt +++ /dev/null @@ -1 +0,0 @@ -Alpine 3.20 desktop for Kasm Workspaces diff --git a/docs/alpine-319-desktop/README.md b/docs/alpine-322-desktop/README.md similarity index 78% rename from docs/alpine-319-desktop/README.md rename to docs/alpine-322-desktop/README.md index aa37479..849027e 100644 --- a/docs/alpine-319-desktop/README.md +++ b/docs/alpine-322-desktop/README.md @@ -1,6 +1,6 @@ # About This Image -This Image contains a browser-accessible Alpine 3.19 Desktop with various productivity and development apps installed. +This Image contains a browser-accessible Alpine 3.22 Desktop with various productivity and development apps installed. ![Screenshot][Image_Screenshot] diff --git a/docs/alpine-319-desktop/demo.txt b/docs/alpine-322-desktop/demo.txt similarity index 100% rename from docs/alpine-319-desktop/demo.txt rename to docs/alpine-322-desktop/demo.txt diff --git a/docs/alpine-322-desktop/description.txt b/docs/alpine-322-desktop/description.txt new file mode 100644 index 0000000..362a4c1 --- /dev/null +++ b/docs/alpine-322-desktop/description.txt @@ -0,0 +1 @@ +Alpine 3.22 desktop for Kasm Workspaces diff --git a/docs/alpine-320-desktop/README.md b/docs/alpine-323-desktop/README.md similarity index 78% rename from docs/alpine-320-desktop/README.md rename to docs/alpine-323-desktop/README.md index 18cf9d6..d4ea940 100644 --- a/docs/alpine-320-desktop/README.md +++ b/docs/alpine-323-desktop/README.md @@ -1,6 +1,6 @@ # About This Image -This Image contains a browser-accessible Alpine 3.20 Desktop with various productivity and development apps installed. +This Image contains a browser-accessible Alpine 3.23 Desktop with various productivity and development apps installed. ![Screenshot][Image_Screenshot] diff --git a/docs/alpine-320-desktop/demo.txt b/docs/alpine-323-desktop/demo.txt similarity index 100% rename from docs/alpine-320-desktop/demo.txt rename to docs/alpine-323-desktop/demo.txt diff --git a/docs/alpine-323-desktop/description.txt b/docs/alpine-323-desktop/description.txt new file mode 100644 index 0000000..b9d7c59 --- /dev/null +++ b/docs/alpine-323-desktop/description.txt @@ -0,0 +1 @@ +Alpine 3.23 desktop for Kasm Workspaces diff --git a/docs/fedora-39-desktop/description.txt b/docs/fedora-39-desktop/description.txt deleted file mode 100644 index a649ce6..0000000 --- a/docs/fedora-39-desktop/description.txt +++ /dev/null @@ -1 +0,0 @@ -Fedora 39 desktop for Kasm Workspaces diff --git a/docs/fedora-40-desktop/README.md b/docs/fedora-40-desktop/README.md deleted file mode 100644 index 2ea974b..0000000 --- a/docs/fedora-40-desktop/README.md +++ /dev/null @@ -1,7 +0,0 @@ -# About This Image - -This Image contains a browser-accessible Fedora 40 Desktop with various productivity and development apps installed. - -![Screenshot][Image_Screenshot] - -[Image_Screenshot]: https://info.kasmweb.com/hubfs/dockerhub/image-screenshots/fedora-37-desktop.png "Image Screenshot" diff --git a/docs/fedora-40-desktop/description.txt b/docs/fedora-40-desktop/description.txt deleted file mode 100644 index b88a8b7..0000000 --- a/docs/fedora-40-desktop/description.txt +++ /dev/null @@ -1 +0,0 @@ -Fedora 40 desktop for Kasm Workspaces diff --git a/docs/fedora-41-desktop/description.txt b/docs/fedora-41-desktop/description.txt deleted file mode 100644 index 4c9e41e..0000000 --- a/docs/fedora-41-desktop/description.txt +++ /dev/null @@ -1 +0,0 @@ -Fedora 41 desktop for Kasm Workspaces diff --git a/docs/fedora-41-desktop/README.md b/docs/fedora-42-desktop/README.md similarity index 78% rename from docs/fedora-41-desktop/README.md rename to docs/fedora-42-desktop/README.md index 7a57722..236620d 100644 --- a/docs/fedora-41-desktop/README.md +++ b/docs/fedora-42-desktop/README.md @@ -1,6 +1,6 @@ # About This Image -This Image contains a browser-accessible Fedora 41 Desktop with various productivity and development apps installed. +This Image contains a browser-accessible Fedora 42 Desktop with various productivity and development apps installed. ![Screenshot][Image_Screenshot] diff --git a/docs/fedora-39-desktop/demo.txt b/docs/fedora-42-desktop/demo.txt similarity index 100% rename from docs/fedora-39-desktop/demo.txt rename to docs/fedora-42-desktop/demo.txt diff --git a/docs/fedora-42-desktop/description.txt b/docs/fedora-42-desktop/description.txt new file mode 100644 index 0000000..641c128 --- /dev/null +++ b/docs/fedora-42-desktop/description.txt @@ -0,0 +1 @@ +Fedora 42 desktop for Kasm Workspaces diff --git a/docs/fedora-39-desktop/README.md b/docs/fedora-43-desktop/README.md similarity index 78% rename from docs/fedora-39-desktop/README.md rename to docs/fedora-43-desktop/README.md index 5f371a0..f67ccc2 100644 --- a/docs/fedora-39-desktop/README.md +++ b/docs/fedora-43-desktop/README.md @@ -1,6 +1,6 @@ # About This Image -This Image contains a browser-accessible Fedora 39 Desktop with various productivity and development apps installed. +This Image contains a browser-accessible Fedora 43 Desktop with various productivity and development apps installed. ![Screenshot][Image_Screenshot] diff --git a/docs/fedora-40-desktop/demo.txt b/docs/fedora-43-desktop/demo.txt similarity index 100% rename from docs/fedora-40-desktop/demo.txt rename to docs/fedora-43-desktop/demo.txt diff --git a/docs/fedora-43-desktop/description.txt b/docs/fedora-43-desktop/description.txt new file mode 100644 index 0000000..3a70f43 --- /dev/null +++ b/docs/fedora-43-desktop/description.txt @@ -0,0 +1 @@ +Fedora 43 desktop for Kasm Workspaces diff --git a/docs/opensuse-15-desktop/description.txt b/docs/opensuse-15-desktop/description.txt deleted file mode 100644 index 73464da..0000000 --- a/docs/opensuse-15-desktop/description.txt +++ /dev/null @@ -1 +0,0 @@ -openSUSE Leap 15 desktop for Kasm Workspaces diff --git a/docs/opensuse-15-desktop/README.md b/docs/opensuse-16-desktop/README.md similarity index 79% rename from docs/opensuse-15-desktop/README.md rename to docs/opensuse-16-desktop/README.md index c137987..747f7eb 100644 --- a/docs/opensuse-15-desktop/README.md +++ b/docs/opensuse-16-desktop/README.md @@ -1,6 +1,6 @@ # About This Image -This Image contains a browser-accessible openSUSE Leap 15 Desktop with various productivity and development apps installed. +This Image contains a browser-accessible openSUSE Leap 16 Desktop with various productivity and development apps installed. ![Screenshot][Image_Screenshot] diff --git a/docs/opensuse-15-desktop/demo.txt b/docs/opensuse-16-desktop/demo.txt similarity index 100% rename from docs/opensuse-15-desktop/demo.txt rename to docs/opensuse-16-desktop/demo.txt diff --git a/docs/opensuse-16-desktop/description.txt b/docs/opensuse-16-desktop/description.txt new file mode 100644 index 0000000..3472ba0 --- /dev/null +++ b/docs/opensuse-16-desktop/description.txt @@ -0,0 +1 @@ +openSUSE Leap 16 desktop for Kasm Workspaces diff --git a/docs/parrotos-6-desktop/demo.txt b/docs/parrotos-6-desktop/demo.txt deleted file mode 100644 index 0b606c7..0000000 --- a/docs/parrotos-6-desktop/demo.txt +++ /dev/null @@ -1,9 +0,0 @@ -# Live Demo - - - -**Launch a real-time demo in a new browser window:** Live Demo. - - - -∗*Note: Demo is limited to 3 minutes and has upload/downloads restricted for security purposes.* diff --git a/docs/parrotos-6-desktop/description.txt b/docs/parrotos-6-desktop/description.txt deleted file mode 100644 index 0779e1e..0000000 --- a/docs/parrotos-6-desktop/description.txt +++ /dev/null @@ -1 +0,0 @@ -Parrot OS 6 desktop for Kasm Workspaces diff --git a/docs/parrotos-6-desktop/README.md b/docs/parrotos-7-desktop/README.md similarity index 78% rename from docs/parrotos-6-desktop/README.md rename to docs/parrotos-7-desktop/README.md index 1fd23ff..0b8b4a3 100644 --- a/docs/parrotos-6-desktop/README.md +++ b/docs/parrotos-7-desktop/README.md @@ -1,6 +1,6 @@ # About This Image -This Image contains a browser-accessible Parrot OS 6 Desktop with various productivity and development apps installed. +This Image contains a browser-accessible Parrot OS 7 Desktop with various productivity and development apps installed. ![Screenshot][Image_Screenshot] diff --git a/docs/fedora-41-desktop/demo.txt b/docs/parrotos-7-desktop/demo.txt similarity index 100% rename from docs/fedora-41-desktop/demo.txt rename to docs/parrotos-7-desktop/demo.txt diff --git a/docs/parrotos-7-desktop/description.txt b/docs/parrotos-7-desktop/description.txt new file mode 100644 index 0000000..e89564b --- /dev/null +++ b/docs/parrotos-7-desktop/description.txt @@ -0,0 +1 @@ +Parrot OS 7 desktop for Kasm Workspaces diff --git a/src/alpine/install/blender/install_blender.sh b/src/alpine/install/blender/install_blender.sh index b7823f3..44028f0 100644 --- a/src/alpine/install/blender/install_blender.sh +++ b/src/alpine/install/blender/install_blender.sh @@ -1,7 +1,7 @@ #!/usr/bin/env bash set -ex -apk add --no-cach \ +apk add --no-cache \ blender # Desktop icon diff --git a/src/alpine/install/terraform/install_terraform.sh b/src/alpine/install/terraform/install_terraform.sh index 81bb08c..d87de94 100644 --- a/src/alpine/install/terraform/install_terraform.sh +++ b/src/alpine/install/terraform/install_terraform.sh @@ -1,10 +1,7 @@ #!/usr/bin/env bash set -ex -if grep -q v3.19 /etc/os-release || grep -q v3.20 /etc/os-release || grep -q v3.21 /etc/os-release; then +if grep -q v3.23 /etc/os-release || grep -q v3.22 /etc/os-release || grep -q v3.21 /etc/os-release; then apk add --no-cache --repository=http://dl-cdn.alpinelinux.org/alpine/edge/testing/ \ opentofu -else - apk add --no-cache \ - terraform fi diff --git a/src/opensuse/install/vs_code/install_vs_code.sh b/src/opensuse/install/vs_code/install_vs_code.sh index 6f4ad97..ddf3dfe 100644 --- a/src/opensuse/install/vs_code/install_vs_code.sh +++ b/src/opensuse/install/vs_code/install_vs_code.sh @@ -13,8 +13,6 @@ cp /usr/share/applications/code.desktop $HOME/Desktop chmod +x $HOME/Desktop/code.desktop chown 1000:1000 $HOME/Desktop/code.desktop -# Conveniences for python development -zypper install -yn python3-setuptools python3-virtualenv if [ -z ${SKIP_CLEAN+x} ]; then zypper clean --all fi diff --git a/src/oracle/install/ansible/install_ansible.sh b/src/oracle/install/ansible/install_ansible.sh index 7ac0586..52b6a84 100644 --- a/src/oracle/install/ansible/install_ansible.sh +++ b/src/oracle/install/ansible/install_ansible.sh @@ -1,7 +1,7 @@ #!/usr/bin/env bash set -ex -if [[ "${DISTRO}" == @(oracle8|rockylinux9|rockylinux8|oracle9|rhel9|almalinux9|almalinux8|fedora39|fedora40|fedora41) ]]; then +if [[ "${DISTRO}" == @(oracle8|rockylinux9|rockylinux8|oracle9|rhel9|almalinux9|almalinux8|fedora42|fedora43) ]]; then dnf install -y ansible if [ -z ${SKIP_CLEAN+x} ]; then dnf clean all diff --git a/src/oracle/install/gimp/install_gimp.sh b/src/oracle/install/gimp/install_gimp.sh index d5fde85..52376fc 100644 --- a/src/oracle/install/gimp/install_gimp.sh +++ b/src/oracle/install/gimp/install_gimp.sh @@ -1,6 +1,6 @@ #!/usr/bin/env bash set -ex -if [[ "${DISTRO}" == @(oracle8|rockylinux9|rockylinux8|oracle9|rhel9|almalinux9|almalinux8|fedora39|fedora40|fedora41) ]]; then +if [[ "${DISTRO}" == @(oracle8|rockylinux9|rockylinux8|oracle9|rhel9|almalinux9|almalinux8|fedora42|fedora43) ]]; then dnf install -y gimp if [ -z ${SKIP_CLEAN+x} ]; then dnf clean all diff --git a/src/oracle/install/libre_office/install_libre_office.sh b/src/oracle/install/libre_office/install_libre_office.sh index e7177f4..64662d1 100644 --- a/src/oracle/install/libre_office/install_libre_office.sh +++ b/src/oracle/install/libre_office/install_libre_office.sh @@ -7,7 +7,7 @@ if [ "$ARCH" == "amd64" ] ; then exit 0 fi -if [[ "${DISTRO}" == @(oracle8|rockylinux9|rockylinux8|oracle9|rhel9|almalinux9|almalinux8|fedora39|fedora40|fedora41) ]]; then +if [[ "${DISTRO}" == @(oracle8|rockylinux9|rockylinux8|oracle9|rhel9|almalinux9|almalinux8|fedora42|fedora43) ]]; then dnf install -y \ libreoffice-core \ libreoffice-writer \ diff --git a/src/oracle/install/only_office/install_only_office.sh b/src/oracle/install/only_office/install_only_office.sh index 0e67303..954982c 100644 --- a/src/oracle/install/only_office/install_only_office.sh +++ b/src/oracle/install/only_office/install_only_office.sh @@ -7,12 +7,12 @@ if [ "$ARCH" == "arm64" ] ; then exit 0 fi curl -L -o only_office.rpm "https://github.com/ONLYOFFICE/DesktopEditors/releases/latest/download/onlyoffice-desktopeditors.$(arch).rpm" -if [[ "${DISTRO}" == @(oracle8|rockylinux9|rockylinux8|oracle9|rhel9|almalinux9|almalinux8|fedora39|fedora40) ]]; then +if [[ "${DISTRO}" == @(oracle8|rockylinux9|rockylinux8|oracle9|rhel9|almalinux9|almalinux8) ]]; then dnf localinstall -y only_office.rpm if [ -z ${SKIP_CLEAN+x} ]; then dnf clean all fi -elif [[ "${DISTRO}" == "fedora41" ]]; then +elif [[ "${DISTRO}" == @(fedora42|fedora43) ]]; then dnf install -y only_office.rpm if [ -z ${SKIP_CLEAN+x} ]; then dnf clean all diff --git a/src/oracle/install/slack/install_slack.sh b/src/oracle/install/slack/install_slack.sh index e2a20ce..9dced5d 100644 --- a/src/oracle/install/slack/install_slack.sh +++ b/src/oracle/install/slack/install_slack.sh @@ -21,7 +21,7 @@ version=4.12.2 # This path may not be accurate once arm64 support arrives. Specifically I don't know if it will still be under x64 wget -q https://downloads.slack-edge.com/releases/linux/${version}/prod/x64/slack-${version}-0.1.fc21.x86_64.rpm -O slack.rpm -if [[ "${DISTRO}" == @(oracle8|rockylinux9|rockylinux8|oracle9|rhel9|almalinux9|almalinux8|fedora39|fedora40|fedora41) ]]; then +if [[ "${DISTRO}" == @(oracle8|rockylinux9|rockylinux8|oracle9|rhel9|almalinux9|almalinux8|fedora42|fedora43) ]]; then dnf localinstall -y slack.rpm if [ -z ${SKIP_CLEAN+x} ]; then dnf clean all diff --git a/src/oracle/install/sublime_text/install_sublime_text.sh b/src/oracle/install/sublime_text/install_sublime_text.sh index f22821e..7ee2d5c 100644 --- a/src/oracle/install/sublime_text/install_sublime_text.sh +++ b/src/oracle/install/sublime_text/install_sublime_text.sh @@ -30,8 +30,8 @@ fi rpm -v --import https://download.sublimetext.com/sublimehq-rpm-pub.gpg -if [[ "${DISTRO}" == @(oracle8|rockylinux9|rockylinux8|oracle9|rhel9|almalinux9|almalinux8|fedora39|fedora40|fedora41) ]]; then - if [[ "${DISTRO}" == "fedora41" ]]; then +if [[ "${DISTRO}" == @(oracle8|rockylinux9|rockylinux8|oracle9|rhel9|almalinux9|almalinux8|fedora42|fedora43) ]]; then + if [[ "${DISTRO}" == @(fedora42|fedora43) ]]; then dnf config-manager addrepo --from-repofile=https://download.sublimetext.com/rpm/stable/$(arch)/sublime-text.repo else dnf config-manager --add-repo https://download.sublimetext.com/rpm/stable/$(arch)/sublime-text.repo diff --git a/src/oracle/install/terraform/install_terraform.sh b/src/oracle/install/terraform/install_terraform.sh index 754f66f..c7eb4f3 100644 --- a/src/oracle/install/terraform/install_terraform.sh +++ b/src/oracle/install/terraform/install_terraform.sh @@ -14,17 +14,14 @@ if [[ "${DISTRO}" == @(oracle8|rockylinux9|rockylinux8|oracle9|rhel9|almalinux9| if [ -z ${SKIP_CLEAN+x} ]; then dnf clean all fi -elif [[ "${DISTRO}" == @(fedora40|fedora41) ]]; then +elif [[ "${DISTRO}" == @(fedora42|fedora43) ]]; then dnf config-manager --add-repo https://rpm.releases.hashicorp.com/fedora/hashicorp.repo # use fedora40 hashicorp packages for terraform - sed -i 's/$releasever/40/g' /etc/yum.repos.d/hashicorp.repo + # sed -i 's/$releasever/40/g' /etc/yum.repos.d/hashicorp.repo dnf install -y terraform if [ -z ${SKIP_CLEAN+x} ]; then dnf clean all fi -elif [[ "${DISTRO}" == @(fedora38|fedora39) ]]; then - # skip installation for fedora38 and fedora39 - echo "Skipping terraform install for ${DISTRO}, as it is not officially supported by HashiCorp." else yum-config-manager --add-repo https://rpm.releases.hashicorp.com/RHEL/hashicorp.repo yum install -y terraform diff --git a/src/oracle/install/vs_code/install_vs_code.sh b/src/oracle/install/vs_code/install_vs_code.sh index f637ac5..ac23c41 100644 --- a/src/oracle/install/vs_code/install_vs_code.sh +++ b/src/oracle/install/vs_code/install_vs_code.sh @@ -9,9 +9,9 @@ if [[ "${ARCH}" == "arm64" && "${DISTRO}" == @(oracle8|rockylinux8|almalinux8) ] fi wget -q https://update.code.visualstudio.com/latest/linux-rpm-${ARCH}/stable -O vs_code.rpm -if [[ "${DISTRO}" == @(oracle8|rockylinux9|rockylinux8|oracle9|rhel9|almalinux9|almalinux8|fedora39|fedora40|fedora41) ]]; then +if [[ "${DISTRO}" == @(oracle8|rockylinux9|rockylinux8|oracle9|rhel9|almalinux9|almalinux8|fedora42|fedora43) ]]; then wget -q https://update.code.visualstudio.com/latest/linux-rpm-${ARCH}/stable -O vs_code.rpm - if [[ "${DISTRO}" == "fedora41" ]]; then + if [[ "${DISTRO}" == @(fedora42|fedora43) ]]; then dnf install -y vs_code.rpm else dnf localinstall -y vs_code.rpm @@ -30,7 +30,7 @@ chown 1000:1000 $HOME/Desktop/code.desktop rm vs_code.rpm # Conveniences for python development -if [[ "${DISTRO}" == @(oracle8|rockylinux9|rockylinux8|oracle9|rhel9|almalinux9|almalinux8|fedora39|fedora40|fedora41) ]]; then +if [[ "${DISTRO}" == @(oracle8|rockylinux9|rockylinux8|oracle9|rhel9|almalinux9|almalinux8|fedora42|fedora43) ]]; then dnf install -y python3-setuptools python3-virtualenv if [ -z ${SKIP_CLEAN+x} ]; then dnf clean all diff --git a/src/oracle/install/zoom/install_zoom.sh b/src/oracle/install/zoom/install_zoom.sh index 786ad26..5e96655 100644 --- a/src/oracle/install/zoom/install_zoom.sh +++ b/src/oracle/install/zoom/install_zoom.sh @@ -8,12 +8,12 @@ fi wget -q https://zoom.us/client/latest/zoom_$(arch).rpm -if [[ "${DISTRO}" == @(oracle8|rockylinux9|rockylinux8|oracle9|rhel9|almalinux9|almalinux8|fedora39|fedora40) ]]; then +if [[ "${DISTRO}" == @(oracle8|rockylinux9|rockylinux8|oracle9|rhel9|almalinux9|almalinux8) ]]; then dnf localinstall -y zoom_$(arch).rpm if [ -z ${SKIP_CLEAN+x} ]; then dnf clean all fi -elif [[ "${DISTRO}" == "fedora41" ]]; then +elif [[ "${DISTRO}" == @(fedora42|fedora43) ]]; then dnf install -y zoom_$(arch).rpm if [ -z ${SKIP_CLEAN+x} ]; then dnf clean all diff --git a/src/ubuntu/install/chromium/install_chromium.sh b/src/ubuntu/install/chromium/install_chromium.sh index c12474e..64df25f 100644 --- a/src/ubuntu/install/chromium/install_chromium.sh +++ b/src/ubuntu/install/chromium/install_chromium.sh @@ -9,7 +9,7 @@ if [[ "${DISTRO}" == @(debian|opensuse|ubuntu) ]] && [ ${ARCH} = 'amd64' ] && [ exit 0 fi -if [[ "${DISTRO}" == @(oracle8|rockylinux9|rockylinux8|oracle9|rhel9|almalinux9|almalinux8|fedora39|fedora40|fedora41) ]]; then +if [[ "${DISTRO}" == @(oracle8|rockylinux9|rockylinux8|oracle9|rhel9|almalinux9|almalinux8|fedora42|fedora43) ]]; then dnf install -y chromium if [ -z ${SKIP_CLEAN+x} ]; then dnf clean all @@ -110,7 +110,7 @@ if [ "${DISTRO}" != "opensuse" ] && ! grep -q "ID=debian" /etc/os-release && ! g cp /usr/bin/chromium-browser /usr/bin/chromium fi -if [[ "${DISTRO}" == @(oracle8|rockylinux9|rockylinux8|oracle9|rhel9|almalinux9|almalinux8|opensuse|fedora39|fedora40|fedora41) ]]; then +if [[ "${DISTRO}" == @(oracle8|rockylinux9|rockylinux8|oracle9|rhel9|almalinux9|almalinux8|opensuse|fedora42|fedora43) ]]; then cat >> $HOME/.config/mimeapps.list <"$preferences_file" <>$FIREFOX_PROFILES_INI <>$FIREFOX_PROFILES_INI <