From 2c05c17bce25de3421ca5c1eea7858539f4265f0 Mon Sep 17 00:00:00 2001 From: Ryan Kuba Date: Wed, 10 Jan 2024 01:11:53 +0000 Subject: [PATCH] Resolve KASM-5403 "Feature/ kasm 5399 alpine 319 fedora 39" --- .gitlab-ci.yml | 2 +- ci-scripts/template-vars.yaml | 20 +++- ci-scripts/test.sh | 4 +- docs/core-alpine-319/README.md | 7 ++ docs/core-alpine-319/demo.txt | 9 ++ docs/core-alpine-319/description.txt | 1 + docs/core-fedora-39/README.md | 7 ++ docs/core-fedora-39/demo.txt | 9 ++ docs/core-fedora-39/description.txt | 1 + .../xfce-perchannel-xml/xfce4-desktop.xml | 108 ++++++++++++++++++ .../xfce-perchannel-xml/xfce4-panel.xml | 37 ++++++ .../xfconf/xfce-perchannel-xml/xfwm4.xml | 91 +++++++++++++++ .../xfconf/xfce-perchannel-xml/xsettings.xml | 10 ++ src/ubuntu/install/audio/install_audio.sh | 23 +++- src/ubuntu/install/cleanup/cleanup.sh | 2 +- .../install/fonts/install_custom_fonts.sh | 2 +- .../install/kasm_vnc/install_kasm_vnc.sh | 16 ++- .../install/package_rules/package_rules.sh | 6 +- src/ubuntu/install/printer/install_printer.sh | 2 +- .../profile_sync/install_profile_sync.sh | 7 +- .../install/squid/install/install_squid.sh | 16 ++- src/ubuntu/install/sysbox/install_systemd.sh | 2 +- src/ubuntu/install/tools/install_tools.sh | 2 +- src/ubuntu/install/xfce/install_xfce_ui.sh | 6 +- 24 files changed, 360 insertions(+), 30 deletions(-) create mode 100644 docs/core-alpine-319/README.md create mode 100644 docs/core-alpine-319/demo.txt create mode 100644 docs/core-alpine-319/description.txt create mode 100644 docs/core-fedora-39/README.md create mode 100644 docs/core-fedora-39/demo.txt create mode 100644 docs/core-fedora-39/description.txt create mode 100644 src/fedora39/xfce/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-desktop.xml create mode 100644 src/fedora39/xfce/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-panel.xml create mode 100644 src/fedora39/xfce/.config/xfce4/xfconf/xfce-perchannel-xml/xfwm4.xml create mode 100644 src/fedora39/xfce/.config/xfce4/xfconf/xfce-perchannel-xml/xsettings.xml diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index cd59db8..6dbec11 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -14,7 +14,7 @@ stages: - test variables: KASM_RELEASE: "1.14.0" - TEST_INSTALLER: "https://kasm-static-content.s3.amazonaws.com/kasm_release_1.14.0.7f3582.tar.gz" + TEST_INSTALLER: "https://kasmweb-build-artifacts.s3.amazonaws.com/kasm_backend/1e99090dadb026f1e37e34e53334da20061bc21c/kasm_workspaces_feature_tester-1.15-pre-release_1.15.0.1e9909.tar.gz" SCAN_CONTAINERS: "true" before_script: - export SANITIZED_BRANCH="$(echo $CI_COMMIT_REF_NAME | sed -r 's#^release/##' | sed 's/\//_/g')" diff --git a/ci-scripts/template-vars.yaml b/ci-scripts/template-vars.yaml index 9a48943..0bd35b3 100644 --- a/ci-scripts/template-vars.yaml +++ b/ci-scripts/template-vars.yaml @@ -184,7 +184,16 @@ multiImages: dockerfile: dockerfile-kasm-core-fedora changeFiles: - dockerfile-kasm-core-fedora - - src/fedora37/** + - src/fedora38/** + - name1: fedora + name2: 39 + base: fedora:39 + bg: bg_fedora.png + distro: fedora39 + dockerfile: dockerfile-kasm-core-fedora + changeFiles: + - dockerfile-kasm-core-fedora + - src/fedora39/** - name1: parrotos name2: 5 base: parrotsec/core:latest @@ -215,6 +224,15 @@ multiImages: changeFiles: - dockerfile-kasm-core-alpine - src/alpine/** + - name1: alpine + name2: 319 + base: alpine:3.19 + bg: bg_alpine.png + distro: alpine + dockerfile: dockerfile-kasm-core-alpine + changeFiles: + - dockerfile-kasm-core-alpine + - src/alpine/** singleImages: - name1: cuda name2: focal diff --git a/ci-scripts/test.sh b/ci-scripts/test.sh index 7a05f5c..1be0b5e 100755 --- a/ci-scripts/test.sh +++ b/ci-scripts/test.sh @@ -191,7 +191,7 @@ ssh \ ready_check # Pull tester image -docker pull ${ORG_NAME}/kasm-tester:1.14.2 +docker pull ${ORG_NAME}/kasm-tester:1.15.0 # Run test cp /root/.ssh/id_rsa $(dirname ${CI_PROJECT_DIR})/sshkey @@ -213,7 +213,7 @@ docker run --rm \ -e REPO=workspaces-core-images \ -e AUTOMATED=true \ -v $(dirname ${CI_PROJECT_DIR})/sshkey:/sshkey:ro ${SLIM_FLAG} \ - kasmweb/kasm-tester:1.14.2 + kasmweb/kasm-tester:1.15.0 # Shutdown Instances turnoff diff --git a/docs/core-alpine-319/README.md b/docs/core-alpine-319/README.md new file mode 100644 index 0000000..05609a3 --- /dev/null +++ b/docs/core-alpine-319/README.md @@ -0,0 +1,7 @@ +# About This Image + +This image contains a browser-accessible version of Alpine 3.19. + +![Screenshot][Image_Screenshot] + +[Image_Screenshot]: https://5856039.fs1.hubspotusercontent-na1.net/hubfs/5856039/dockerhub/image-screenshots/alpine-317-core.png "Image Screenshot" diff --git a/docs/core-alpine-319/demo.txt b/docs/core-alpine-319/demo.txt new file mode 100644 index 0000000..bbd1f8e --- /dev/null +++ b/docs/core-alpine-319/demo.txt @@ -0,0 +1,9 @@ +# Live Demo + +**Launch a real-time demo in a new browser window:** Live Demo. + + + +∗*This demo links to a Jammy Desktop image to show the basic functionality of Kasm Workspaces.* + +∗*Note: Demo is limited to 3 minutes and has upload/downloads restricted for security purposes.* diff --git a/docs/core-alpine-319/description.txt b/docs/core-alpine-319/description.txt new file mode 100644 index 0000000..c15ac3e --- /dev/null +++ b/docs/core-alpine-319/description.txt @@ -0,0 +1 @@ +Alpine 3.19 base image for Kasm Workspaces diff --git a/docs/core-fedora-39/README.md b/docs/core-fedora-39/README.md new file mode 100644 index 0000000..3310920 --- /dev/null +++ b/docs/core-fedora-39/README.md @@ -0,0 +1,7 @@ +# About This Image + +This image contains a browser-accessible version of Fedora 39. + +![Screenshot][Image_Screenshot] + +[Image_Screenshot]: https://info.kasmweb.com/hubfs/dockerhub/fedora-37-core.png "Image Screenshot" diff --git a/docs/core-fedora-39/demo.txt b/docs/core-fedora-39/demo.txt new file mode 100644 index 0000000..bbd1f8e --- /dev/null +++ b/docs/core-fedora-39/demo.txt @@ -0,0 +1,9 @@ +# Live Demo + +**Launch a real-time demo in a new browser window:** Live Demo. + + + +∗*This demo links to a Jammy Desktop image to show the basic functionality of Kasm Workspaces.* + +∗*Note: Demo is limited to 3 minutes and has upload/downloads restricted for security purposes.* diff --git a/docs/core-fedora-39/description.txt b/docs/core-fedora-39/description.txt new file mode 100644 index 0000000..8e591e4 --- /dev/null +++ b/docs/core-fedora-39/description.txt @@ -0,0 +1 @@ +Fedora 39 base image for Kasm Workspaces diff --git a/src/fedora39/xfce/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-desktop.xml b/src/fedora39/xfce/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-desktop.xml new file mode 100644 index 0000000..a34dc3c --- /dev/null +++ b/src/fedora39/xfce/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-desktop.xml @@ -0,0 +1,108 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/fedora39/xfce/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-panel.xml b/src/fedora39/xfce/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-panel.xml new file mode 100644 index 0000000..690238f --- /dev/null +++ b/src/fedora39/xfce/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-panel.xml @@ -0,0 +1,37 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/fedora39/xfce/.config/xfce4/xfconf/xfce-perchannel-xml/xfwm4.xml b/src/fedora39/xfce/.config/xfce4/xfconf/xfce-perchannel-xml/xfwm4.xml new file mode 100644 index 0000000..ba3c831 --- /dev/null +++ b/src/fedora39/xfce/.config/xfce4/xfconf/xfce-perchannel-xml/xfwm4.xml @@ -0,0 +1,91 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/fedora39/xfce/.config/xfce4/xfconf/xfce-perchannel-xml/xsettings.xml b/src/fedora39/xfce/.config/xfce4/xfconf/xfce-perchannel-xml/xsettings.xml new file mode 100644 index 0000000..d60e3c4 --- /dev/null +++ b/src/fedora39/xfce/.config/xfce4/xfconf/xfce-perchannel-xml/xsettings.xml @@ -0,0 +1,10 @@ + + + + + + + + + + diff --git a/src/ubuntu/install/audio/install_audio.sh b/src/ubuntu/install/audio/install_audio.sh index d52dcd4..8b8a4a0 100644 --- a/src/ubuntu/install/audio/install_audio.sh +++ b/src/ubuntu/install/audio/install_audio.sh @@ -34,15 +34,28 @@ elif [ "${DISTRO}" == "fedora38" ]; then dnf install -y curl git dnf localinstall -y --nogpgcheck https://mirrors.rpmfusion.org/free/fedora/rpmfusion-free-release-38.noarch.rpm dnf install -y --allowerasing ffmpeg pulseaudio pulseaudio-utils +elif [ "${DISTRO}" == "fedora39" ]; then + dnf install -y curl git + dnf localinstall -y --nogpgcheck https://mirrors.rpmfusion.org/free/fedora/rpmfusion-free-release-39.noarch.rpm + dnf install -y --allowerasing ffmpeg pulseaudio pulseaudio-utils elif [ "${DISTRO}" == "opensuse" ]; then zypper install -ny curl git zypper install -yn ffmpeg pulseaudio-utils elif [ "${DISTRO}" == "alpine" ]; then - apk add --no-cache \ - ffmpeg \ - git \ - pulseaudio \ - pulseaudio-utils + if grep -q v3.19 /etc/os-release; then + apk add --no-cache \ + ffmpeg \ + ffplay \ + git \ + pulseaudio \ + pulseaudio-utils + else + apk add --no-cache \ + ffmpeg \ + git \ + pulseaudio \ + pulseaudio-utils + fi else apt-get update apt-get install -y curl git ffmpeg diff --git a/src/ubuntu/install/cleanup/cleanup.sh b/src/ubuntu/install/cleanup/cleanup.sh index 6ae1af8..3a263d1 100644 --- a/src/ubuntu/install/cleanup/cleanup.sh +++ b/src/ubuntu/install/cleanup/cleanup.sh @@ -4,7 +4,7 @@ set -ex # Distro package cleanup if [[ "${DISTRO}" == @(centos|oracle7) ]] ; then yum clean all -elif [[ "${DISTRO}" == @(almalinux8|almalinux9|fedora37|fedora38|oracle8|oracle9|rockylinux8|rockylinux9) ]]; then +elif [[ "${DISTRO}" == @(almalinux8|almalinux9|fedora37|fedora38|fedora39|oracle8|oracle9|rockylinux8|rockylinux9) ]]; then dnf clean all elif [ "${DISTRO}" == "opensuse" ]; then zypper clean --all diff --git a/src/ubuntu/install/fonts/install_custom_fonts.sh b/src/ubuntu/install/fonts/install_custom_fonts.sh index 4693e08..8832be6 100644 --- a/src/ubuntu/install/fonts/install_custom_fonts.sh +++ b/src/ubuntu/install/fonts/install_custom_fonts.sh @@ -20,7 +20,7 @@ elif [[ "${DISTRO}" == "centos" ]]; then google-noto-emoji-fonts \ google-noto-sans-cjk-fonts \ google-noto-sans-fonts -elif [[ "${DISTRO}" == @(fedora37|fedora38) ]]; then +elif [[ "${DISTRO}" == @(fedora37|fedora38|fedora39) ]]; then dnf install -y \ glibc-locale-source \ google-noto-cjk-fonts \ diff --git a/src/ubuntu/install/kasm_vnc/install_kasm_vnc.sh b/src/ubuntu/install/kasm_vnc/install_kasm_vnc.sh index 997f330..fe0c812 100644 --- a/src/ubuntu/install/kasm_vnc/install_kasm_vnc.sh +++ b/src/ubuntu/install/kasm_vnc/install_kasm_vnc.sh @@ -69,6 +69,12 @@ elif [[ "${DISTRO}" == "fedora38" ]] ; then else BUILD_URL="https://kasmweb-build-artifacts.s3.amazonaws.com/kasmvnc/${COMMIT_ID}/kasmvncserver_fedora_thirtyeight_${KASM_VER_NAME_PART}_aarch64.rpm" fi +elif [[ "${DISTRO}" == "fedora39" ]] ; then + if [[ "$(arch)" =~ ^x86_64$ ]] ; then + BUILD_URL="https://kasmweb-build-artifacts.s3.amazonaws.com/kasmvnc/${COMMIT_ID}/kasmvncserver_fedora_thirtynine_${KASM_VER_NAME_PART}_x86_64.rpm" + else + BUILD_URL="https://kasmweb-build-artifacts.s3.amazonaws.com/kasmvnc/${COMMIT_ID}/kasmvncserver_fedora_thirtynine_${KASM_VER_NAME_PART}_aarch64.rpm" + fi elif [[ "${DISTRO}" = @(debian|parrotos5) ]] ; then if grep -q bookworm /etc/os-release; then if [[ "$(arch)" =~ ^x86_64$ ]] ; then @@ -84,7 +90,13 @@ elif [[ "${DISTRO}" = @(debian|parrotos5) ]] ; then fi fi elif [[ "${DISTRO}" == "alpine" ]] ; then - if grep -q v3.18 /etc/os-release; then + if grep -q v3.19 /etc/os-release; then + if [[ "$(arch)" =~ ^x86_64$ ]] ; then + BUILD_URL="https://kasmweb-build-artifacts.s3.amazonaws.com/kasmvnc/${COMMIT_ID}/output/alpine_319/kasmvnc.alpine_319_x86_64.tgz" + else + BUILD_URL="https://kasmweb-build-artifacts.s3.amazonaws.com/kasmvnc/${COMMIT_ID}/output/alpine_319/kasmvnc.alpine_319_aarch64.tgz" + fi + elif grep -q v3.18 /etc/os-release; then if [[ "$(arch)" =~ ^x86_64$ ]] ; then BUILD_URL="https://kasmweb-build-artifacts.s3.amazonaws.com/kasmvnc/${COMMIT_ID}/output/alpine_318/kasmvnc.alpine_318_x86_64.tgz" else @@ -117,7 +129,7 @@ elif [[ "${DISTRO}" == @(oracle8|oracle9|rockylinux9|rockylinux8|almalinux8|alma dnf localinstall -y kasmvncserver.rpm dnf install -y mesa-dri-drivers rm kasmvncserver.rpm -elif [[ "${DISTRO}" == @(fedora37|fedora38) ]] ; then +elif [[ "${DISTRO}" == @(fedora37|fedora38|fedora39) ]] ; then dnf install -y xorg-x11-drv-amdgpu xorg-x11-drv-ati if [ "${BUILD_ARCH}" == "x86_64" ]; then dnf install -y xorg-x11-drv-intel diff --git a/src/ubuntu/install/package_rules/package_rules.sh b/src/ubuntu/install/package_rules/package_rules.sh index d24f31b..b985616 100644 --- a/src/ubuntu/install/package_rules/package_rules.sh +++ b/src/ubuntu/install/package_rules/package_rules.sh @@ -9,7 +9,7 @@ elif [[ "${DISTRO}" == "debian" ]] ; then sed -i \ '/locale/d' \ /etc/dpkg/dpkg.cfg.d/docker -elif [[ "${DISTRO}" == @(almalinux8|almalinux9|fedora37|fedora38|oracle8|oracle9|rockylinux8|rockylinux9) ]]; then +elif [[ "${DISTRO}" == @(almalinux8|almalinux9|fedora37|fedora38|fedora39|oracle8|oracle9|rockylinux8|rockylinux9) ]]; then rm -f /etc/rpm/macros.image-language-conf elif [[ "${DISTRO}" == @(centos|oracle7) ]]; then sed -i \ @@ -22,7 +22,7 @@ fi echo "Upgrading packages from upstream base image" if [[ "${DISTRO}" == @(centos|oracle7) ]] ; then yum update -y -elif [[ "${DISTRO}" == @(fedora37|fedora38|oracle8|oracle9|rockylinux9|rockylinux8|almalinux8|almalinux9) ]]; then +elif [[ "${DISTRO}" == @(fedora37|fedora38|fedora39|oracle8|oracle9|rockylinux9|rockylinux8|almalinux8|almalinux9) ]]; then dnf upgrade -y --refresh elif [ "${DISTRO}" == "opensuse" ]; then zypper --non-interactive patch --auto-agree-with-licenses @@ -33,4 +33,4 @@ elif [ "${DISTRO}" == "alpine" ]; then else apt-get update DEBIAN_FRONTEND=noninteractive apt-get upgrade -y -fi \ No newline at end of file +fi diff --git a/src/ubuntu/install/printer/install_printer.sh b/src/ubuntu/install/printer/install_printer.sh index 9130a64..14e520b 100755 --- a/src/ubuntu/install/printer/install_printer.sh +++ b/src/ubuntu/install/printer/install_printer.sh @@ -6,7 +6,7 @@ echo $DISTRO if [ "${DISTRO}" == "oracle7" ] || [ "${DISTRO}" == "centos" ]; then yum install -y cups cups-client cups-pdf -elif [[ "${DISTRO}" == @(almalinux8|almalinux9|oracle8|oracle9|rockylinux8|rockylinux9|fedora37|fedora38) ]]; then +elif [[ "${DISTRO}" == @(almalinux8|almalinux9|oracle8|oracle9|rockylinux8|rockylinux9|fedora37|fedora38|fedora39) ]]; then dnf install -y cups cups-client cups-pdf elif [ "${DISTRO}" == "opensuse" ]; then zypper install -y cups cups-client cups-pdf diff --git a/src/ubuntu/install/profile_sync/install_profile_sync.sh b/src/ubuntu/install/profile_sync/install_profile_sync.sh index 6ce4ee4..65735fd 100755 --- a/src/ubuntu/install/profile_sync/install_profile_sync.sh +++ b/src/ubuntu/install/profile_sync/install_profile_sync.sh @@ -45,6 +45,9 @@ handle_other_distros_conversion() { if grep -q 'v3.18' /etc/os-release; then profile_distro="alpine_318" fi + if grep -q 'v3.19' /etc/os-release; then + profile_distro="alpine_319" + fi ;; rockylinux*) profile_distro=$(echo "$profile_distro" | sed -e 's/linux//') @@ -76,8 +79,8 @@ download_and_symlink() { } ARCH=$(arch) -BRANCH="release_1.0.1" -COMMIT_ID="a2ed6b21848b835c5b33524b90894b8b4d6fed52" +BRANCH="release_1.0.2" +COMMIT_ID="8b90fa40285d80de72284d09bf6651642e5c07d2" convert_local_distro_to_profile_sync_distro check_distro_is_supported diff --git a/src/ubuntu/install/squid/install/install_squid.sh b/src/ubuntu/install/squid/install/install_squid.sh index 7901d7d..49959db 100644 --- a/src/ubuntu/install/squid/install/install_squid.sh +++ b/src/ubuntu/install/squid/install/install_squid.sh @@ -15,12 +15,12 @@ if $(grep -q Jammy /etc/os-release) || $(grep -q Kali /etc/os-release) ; then wget ${LIBSSLURL} -O libssl1.1.${ARCH}.deb dpkg -i libssl1.1.${ARCH}.deb rm -f libssl1.1.${ARCH}.deb -elif [[ "${DISTRO}" != @(centos|oracle7|oracle8|oracle9|opensuse|fedora37|fedora38|rockylinux9|rockylinux8|almalinux9|almalinux8|alpine) ]] ; then +elif [[ "${DISTRO}" != @(centos|oracle7|oracle8|oracle9|opensuse|fedora37|fedora38|fedora39|rockylinux9|rockylinux8|almalinux9|almalinux8|alpine) ]] ; then wget -qO- https://kasmweb-build-artifacts.s3.amazonaws.com/kasm-squid-builder/${SQUID_COMMIT}/output/kasm-squid-builder_${ARCH}.tar.gz | tar -xzf - -C / fi # update squid conf with user info -if [[ "${DISTRO}" == @(centos|oracle7|oracle8|oracle9|fedora37|fedora38|almalinux8|almalinux9|rockylinux8|rockylinux9|alpine) ]]; then +if [[ "${DISTRO}" == @(centos|oracle7|oracle8|oracle9|fedora37|fedora38|fedora39|almalinux8|almalinux9|rockylinux8|rockylinux9|alpine) ]]; then useradd --system --shell /usr/sbin/nologin --home-dir /bin proxy elif [ "${DISTRO}" == "opensuse" ]; then useradd --system --shell /usr/sbin/nologin --home-dir /bin proxy @@ -33,7 +33,7 @@ chown proxy:proxy /usr/local/squid/etc/ssl_cert -R chmod 700 /usr/local/squid/etc/ssl_cert -R cd /usr/local/squid/etc/ssl_cert -if [[ "${DISTRO}" == @(fedora37|fedora38) ]]; then +if [[ "${DISTRO}" == @(fedora37|fedora38|fedora39) ]]; then dnf install -y openssl1.1 xkbcomp rm -f /etc/X11/xinit/xinitrc elif [[ "${DISTRO}" == @(rockylinux9|oracle9|almalinux9) ]]; then @@ -42,7 +42,11 @@ elif [[ "${DISTRO}" == @(rockylinux9|oracle9|almalinux9) ]]; then elif [[ "${DISTRO}" == @(centos|oracle7) ]]; then yum install -y openssl11-libs elif [[ "${DISTRO}" == "alpine" ]]; then - apk add --no-cache openssl1.1-compat + if grep -q v3.19 /etc/os-release; then + apk add --no-cache --repository=https://dl-cdn.alpinelinux.org/alpine/edge/testing openssl1.1-compat + else + apk add --no-cache openssl1.1-compat + fi elif grep -q bookworm /etc/os-release; then wget ${LIBSSLURL} -O libssl1.1.${ARCH}.deb dpkg -i libssl1.1.${ARCH}.deb @@ -65,7 +69,7 @@ chown -R proxy:proxy /etc/squid/blocked.acl if [[ "${DISTRO}" == @(centos|oracle7) ]]; then yum install -y memcached cyrus-sasl iproute -elif [[ "${DISTRO}" == @(oracle8|fedora37|fedora38|oracle9|rockylinux9|rockylinux8|almalinux9|almalinux8) ]]; then +elif [[ "${DISTRO}" == @(oracle8|fedora37|fedora38|fedora39|oracle9|rockylinux9|rockylinux8|almalinux9|almalinux8) ]]; then dnf install -y memcached cyrus-sasl iproute elif [ "${DISTRO}" == "opensuse" ]; then zypper install -yn memcached cyrus-sasl iproute2 libatomic1 @@ -96,7 +100,7 @@ chmod +x /etc/squid/kasm_squid_adapter # Install Cert utilities if [[ "${DISTRO}" == @(centos|oracle7) ]]; then yum install -y nss-tools -elif [[ "${DISTRO}" == @(oracle8|fedora37|fedora38|oracle9|rockylinux9|rockylinux8|almalinux9|almalinux8) ]]; then +elif [[ "${DISTRO}" == @(oracle8|fedora37|fedora38|fedora39|oracle9|rockylinux9|rockylinux8|almalinux9|almalinux8) ]]; then dnf install -y nss-tools elif [ "${DISTRO}" == "opensuse" ]; then zypper install -yn mozilla-nss-tools diff --git a/src/ubuntu/install/sysbox/install_systemd.sh b/src/ubuntu/install/sysbox/install_systemd.sh index 25fbf35..b0b8849 100644 --- a/src/ubuntu/install/sysbox/install_systemd.sh +++ b/src/ubuntu/install/sysbox/install_systemd.sh @@ -15,7 +15,7 @@ if [[ "${DISTRO}" == @(ubuntu|debian|parrotos5|kali) ]] ; then systemd \ systemd-sysv \ udev -elif [[ "${DISTRO}" == @(oracle8|oracle9|rockylinux9|rockylinux8|almalinux9|almalinux8|fedora37|fedora38) ]]; then +elif [[ "${DISTRO}" == @(oracle8|oracle9|rockylinux9|rockylinux8|almalinux9|almalinux8|fedora37|fedora38|fedora39) ]]; then # Install deps dnf install -y \ dbus \ diff --git a/src/ubuntu/install/tools/install_tools.sh b/src/ubuntu/install/tools/install_tools.sh index f5c21e4..9dea154 100644 --- a/src/ubuntu/install/tools/install_tools.sh +++ b/src/ubuntu/install/tools/install_tools.sh @@ -4,7 +4,7 @@ set -e echo "Install some common tools for further installation" if [[ "${DISTRO}" == @(centos|oracle7) ]] ; then yum install -y vim wget net-tools bzip2 ca-certificates bc -elif [[ "${DISTRO}" == @(fedora37|fedora38|oracle8|oracle9|rockylinux9|rockylinux8|almalinux8|almalinux9) ]]; then +elif [[ "${DISTRO}" == @(fedora37|fedora38|fedora39|oracle8|oracle9|rockylinux9|rockylinux8|almalinux8|almalinux9) ]]; then dnf install -y wget net-tools bzip2 tar vim hostname procps-ng bc elif [ "${DISTRO}" == "opensuse" ]; then sed -i 's/download.opensuse.org/mirrorcache-us.opensuse.org/g' /etc/zypp/repos.d/*.repo diff --git a/src/ubuntu/install/xfce/install_xfce_ui.sh b/src/ubuntu/install/xfce/install_xfce_ui.sh index de70c3c..eea77cc 100644 --- a/src/ubuntu/install/xfce/install_xfce_ui.sh +++ b/src/ubuntu/install/xfce/install_xfce_ui.sh @@ -30,7 +30,7 @@ EOL } echo "Install Xfce4 UI components" -if [[ "${DISTRO}" != @(centos|oracle7|oracle8|opensuse|fedora37|fedora38|oracle9|rockylinux9|rockylinux8|almalinux8|almalinux9|alpine) ]]; then +if [[ "${DISTRO}" != @(centos|oracle7|oracle8|opensuse|fedora37|fedora38|fedora39|oracle9|rockylinux9|rockylinux8|almalinux8|almalinux9|alpine) ]]; then apt-get update fi @@ -152,7 +152,7 @@ elif [ "$DISTRO" = "opensuse" ]; then xfce4-notifyd \ xfce4-terminal \ xset -elif [[ "$DISTRO" = @(fedora37|fedora38) ]]; then +elif [[ "$DISTRO" = @(fedora37|fedora38|fedora39) ]]; then dnf group install xfce -y dnf install -y \ gvfs \ @@ -177,7 +177,7 @@ elif [ "$DISTRO" = "alpine" ]; then rm -f /usr/share/xfce4/panel/plugins/power-manager-plugin.desktop fi -if [[ "${DISTRO}" != @(centos|oracle7|oracle8|fedora37|fedora38|oracle9|rockylinux9|rockylinux8|almalinux8|almalinux9|alpine) ]]; then +if [[ "${DISTRO}" != @(centos|oracle7|oracle8|fedora37|fedora38|fedora39|oracle9|rockylinux9|rockylinux8|almalinux8|almalinux9|alpine) ]]; then replace_default_xinit if [ "${START_XFCE4}" == "1" ] ; then replace_default_99x11_common_start