From 97dcb0ded02bb55b23a29c106bc90369e6f8602a Mon Sep 17 00:00:00 2001 From: Ryan Kuba Date: Fri, 25 Oct 2024 18:55:31 +0000 Subject: [PATCH] KASM-4027 detect changes to rhel script, update repo names splashed on... --- ci-scripts/template-vars.yaml | 17 ++ dockerfile-kasm-core-oracle | 8 +- docs/core-rhel-9/README.md | 7 + docs/core-rhel-9/demo.txt | 7 + docs/core-rhel-9/description.txt | 1 + src/common/resources/images/bg_rhel.png | Bin 0 -> 13831 bytes src/rhel9/xfce/.config/.blank | 0 .../xfce/.config/xfce4/fedora-logo-icon.png | Bin 0 -> 6960 bytes .../xfce-perchannel-xml/xfce4-desktop.xml | 108 +++++++++++++ .../xfce-perchannel-xml/xfce4-panel.xml | 58 +++++++ .../xfconf/xfce-perchannel-xml/xfwm4.xml | 91 +++++++++++ .../xfconf/xfce-perchannel-xml/xsettings.xml | 10 ++ src/ubuntu/install/audio/install_audio.sh | 4 +- src/ubuntu/install/cleanup/cleanup.sh | 2 +- .../install/fonts/install_custom_fonts.sh | 2 +- .../install/kasm_vnc/install_kasm_vnc.sh | 6 +- src/ubuntu/install/kde/install_kde.sh | 6 +- src/ubuntu/install/openbox/install_openbox.sh | 6 +- .../install/package_rules/package_rules.sh | 4 +- src/ubuntu/install/printer/install_printer.sh | 2 +- .../profile_sync/install_profile_sync.sh | 3 + src/ubuntu/install/rhel/install_rhel.sh | 147 ++++++++++++++++++ .../install/squid/install/install_squid.sh | 10 +- .../install/squid/resources/start_squid.sh | 6 +- src/ubuntu/install/sysbox/install_systemd.sh | 2 +- src/ubuntu/install/tools/install_tools.sh | 2 +- src/ubuntu/install/xfce/install_xfce_ui.sh | 8 +- 27 files changed, 485 insertions(+), 32 deletions(-) create mode 100644 docs/core-rhel-9/README.md create mode 100644 docs/core-rhel-9/demo.txt create mode 100644 docs/core-rhel-9/description.txt create mode 100644 src/common/resources/images/bg_rhel.png create mode 100644 src/rhel9/xfce/.config/.blank create mode 100644 src/rhel9/xfce/.config/xfce4/fedora-logo-icon.png create mode 100644 src/rhel9/xfce/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-desktop.xml create mode 100644 src/rhel9/xfce/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-panel.xml create mode 100644 src/rhel9/xfce/.config/xfce4/xfconf/xfce-perchannel-xml/xfwm4.xml create mode 100644 src/rhel9/xfce/.config/xfce4/xfconf/xfce-perchannel-xml/xsettings.xml create mode 100644 src/ubuntu/install/rhel/install_rhel.sh diff --git a/ci-scripts/template-vars.yaml b/ci-scripts/template-vars.yaml index 36c1ba2..6edcdaf 100644 --- a/ci-scripts/template-vars.yaml +++ b/ci-scripts/template-vars.yaml @@ -176,6 +176,23 @@ multiImages: - src/oracle9/xfce/.config/xfce4/xfconf/xfce-perchannel-xml/** - src/oracle9/xfce/.config/xfce4/xfconf/single-application-xfce-perchannel-xml/** - src/ubuntu/sysbox/** + - name1: rhel + name2: 9 + base: registry.access.redhat.com/ubi9/ubi + bg: bg_rhel.png + distro: rhel9 + dockerfile: dockerfile-kasm-core-oracle + changeFiles: + - dockerfile-kasm-core-oracle + - src/rhel9/** + - src/rhel9/xfce/** + - src/rhel9/xfce/.config/** + - src/rhel9/xfce/.config/xfce4/** + - src/rhel9/xfce/.config/xfce4/xfconf/** + - src/rhel9/xfce/.config/xfce4/xfconf/xfce-perchannel-xml/** + - src/rhel9/xfce/.config/xfce4/xfconf/single-application-xfce-perchannel-xml/** + - src/ubuntu/install/rhel/** + - src/ubuntu/sysbox/** - name1: rockylinux name2: 8 base: rockylinux:8 diff --git a/dockerfile-kasm-core-oracle b/dockerfile-kasm-core-oracle index 42f1a8e..34f5b05 100644 --- a/dockerfile-kasm-core-oracle +++ b/dockerfile-kasm-core-oracle @@ -16,7 +16,7 @@ FROM install_tools AS squid_builder ARG DISTRO=oracle8 -RUN if [ "${DISTRO}" == "oracle8" ] || [ "${DISTRO}" == "oracle9" ] || [ "${DISTRO}" == "rockylinux9" ] || [ "${DISTRO}" == "rockylinux8" ] || [ "${DISTRO}" == "almalinux8" ] || [ "${DISTRO}" == "almalinux9" ]; then \ +RUN if [ "${DISTRO}" == "oracle8" ] || [ "${DISTRO}" == "oracle9" ] || [ "${DISTRO}" == "rockylinux9" ] || [ "${DISTRO}" == "rockylinux8" ] || [ "${DISTRO}" == "almalinux8" ] || [ "${DISTRO}" == "almalinux9" ] || [ "${DISTRO}" == "rhel9" ]; then \ ARCH=$(arch | sed 's/aarch64/arm64/g' | sed 's/x86_64/amd64/g') && \ wget --progress=dot:giga "https://kasmweb-build-artifacts.s3.amazonaws.com/kasm-squid-builder/1149fc830c7edcb383eec390cce2beba16befde5/output/kasm-squid-builder_${ARCH}.tar.gz"; \ else \ @@ -59,7 +59,7 @@ RUN mkdir -p $HOME/Desktop ### (should be nss_wrapper), and yum would just ignore it. Thus, a necessary ### package would be missing. With skip_missing_names_on_install, yum will exit ### with 1 exit code and that will stop image building. -RUN if [ "${DISTRO}" == "oracle8" ] || [ "${DISTRO}" == "oracle9" ] || [ "${DISTRO}" == "rockylinux9" ] || [ "${DISTRO}" == "rockylinux8" ] || [ "${DISTRO}" == "almalinux8" ] || [ "${DISTRO}" == "almalinux9" ]; then \ +RUN if [ "${DISTRO}" == "oracle8" ] || [ "${DISTRO}" == "oracle9" ] || [ "${DISTRO}" == "rockylinux9" ] || [ "${DISTRO}" == "rockylinux8" ] || [ "${DISTRO}" == "almalinux8" ] || [ "${DISTRO}" == "almalinux9" ] || [ "${DISTRO}" == "rhel9" ]; then \ dnf install -y 'dnf-command(config-manager)' && \ dnf config-manager --setopt=skip_missing_names_on_install=False --save && \ dnf clean all; \ @@ -67,6 +67,10 @@ else \ yum-config-manager --setopt=skip_missing_names_on_install=False --save; \ fi +### RHEL Tweaks +COPY ./src/ubuntu/install/rhel $INST_SCRIPTS/rhel/ +RUN bash $INST_SCRIPTS/rhel/install_rhel.sh && rm -rf $INST_SCRIPTS/rhel/ + ### Copy over the maximization script to our startup dir for use by app images. COPY ./src/ubuntu/install/maximize_script $STARTUPDIR/ diff --git a/docs/core-rhel-9/README.md b/docs/core-rhel-9/README.md new file mode 100644 index 0000000..9d27c7b --- /dev/null +++ b/docs/core-rhel-9/README.md @@ -0,0 +1,7 @@ +# About This Image + +This Image contains a browser-accessible Red Hat Linux 9 with XFCE desktop environment. + +![Screenshot][Image_Screenshot] + +[Image_Screenshot]: https://5856039.fs1.hubspotusercontent-na1.net/hubfs/5856039/dockerhub/image-screenshots/core-rhel-9.png "Image Screenshot" diff --git a/docs/core-rhel-9/demo.txt b/docs/core-rhel-9/demo.txt new file mode 100644 index 0000000..bf7fabc --- /dev/null +++ b/docs/core-rhel-9/demo.txt @@ -0,0 +1,7 @@ +# 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/core-rhel-9/description.txt b/docs/core-rhel-9/description.txt new file mode 100644 index 0000000..423e4fc --- /dev/null +++ b/docs/core-rhel-9/description.txt @@ -0,0 +1 @@ +Red Hat Linux 9 base image for Kasm Workspaces diff --git a/src/common/resources/images/bg_rhel.png b/src/common/resources/images/bg_rhel.png new file mode 100644 index 0000000000000000000000000000000000000000..bb6b37474f9c2a7aaff2c0ffd742f373d3eead67 GIT binary patch literal 13831 zcmeHtc{G)6_y2V}hGZ(0@fb=-;uwz1B!rBa$8>PaoMWCjG$@KfL}sBfh0N2bluF4^ zWIP9j%=38gJ9?h?dEa;azH9x~yVm#n`{(x3+`AYZ<`Q?Zt7mM3+r z(=92fdwNHYI&7k@bgLl(QJg}6s&(n71@>}<;^J*_pD)^rQ_8pFfR$Rig|o=gT1=Ui zroZ4vit$GFYSPI&j|{uMGJG*M9$u9gSie!!A9Um4wBZ&0#v@Nnz+gc-cG&1ZQ_n6SL7N+gf;ZlK!6(8xzxaRK> z@6JYCar3)-uj82q0MHE=RaFBmRn>n)PL4M{?17@@n+x!_wnq7e!i<*;yxtpR%;uho zt2(Uy^oZ+CQ?5@ME!kSC31eetYFXeU^J2MLnVD(g*+Wr0yd8{sF`|ZJ`w16g*_h&X zmgYys=eh7wXJZ`w-a@)HpM51xI`|Y_oH~J`k7^SO=6@?Op(aj6Sn`VpRtt9L+V_XD z^7KDj9X@j8_IM0xpp~;#@^SU6z^q4RmlH0B>M5YQsqXNkiiVKh)lNyYNd!qIW(rQ+ zxoJn!&Q+YGb1yJW=DDlfPalhTlXq5kt1j!h3@0{;CG?pkr|S6}*E(lMdy4Y?)1149 z-CLc%X_enE*u4=S(YhA{-_T{xhJGpo&o?2*VImPSZpm@qmN>@x5 ztBQ7Z(G2!R8wKkb+XuVZ%Q~D=RywQ@C`ShHK>MP213lb5edGcaPyNP~BVQj3BTn)D z7V&jcJY}wHz^jV!M)M*?k)mQE>VYo)5~q|7^D1~dILaBSUHTJ(e5ZKI+1D2w@v*J-|fS zVf=g*Pn{yq^Zvs>53H{4U+|tjf3iU4gS?8c2ysy{gog*>Up0Ju)&0pJe>(JEYWNtF z7c{~U?St|2wnwY`qdk53{uRQ({x5y3pSSz(a2)IrXm_*+S=5JYRs7#fYG~;i{H1X~ zfs=~|_O}+9?0=K=b#eSBS^wtS!OZV){?!q(`d_&JCjF1te+!ePbamy_F!p{2?rEth zo;t8E=YX+yagh6c=_oEHZ7+d3FCr$6LW>|BrH~?aVkid@X>p{agYd$hFJzd&hu z`uL(e?a>ENWN=XzGLD24`aBYCZ!aQlhdwWYw3oFPv9q^FiICGQX)opAU@wDq_!kI$ zZx?b^qTK)0s{<$pG89tU(Lq*B;=G8g1PUpF6ql40k(D9eqEWJFl(?iMO3G34HL=u z2inLNb-<>$w1lh_QUWO{hLo0+I4|{2Ayc%s54jQ#FvZ10C6T{p4$>k=4u(uD>Yz@^ z0Kdn{vB;@Ce@*L>my-j^7o~>sMUz3rB#?6AVsaAV#^UGY zB&6lUWJSb~a$^4?k8yBu4EldbA1oeTg+EfR>Ec7SAM|_Zj}>Kv_WI-Qk6U+_-%E*? z_xGZZL)rfkf)C37&t#FY{+P0NMtM4+$-Bp&<@%3tm;b61WF3%Vj?ywBc9PQKB1p8f zln6>fOiDyt1|?}HAuVo)l#=<)!e8h<7)Rd#ls8(%iOeIJD{^`M=8E^s??egxyL5mv z`XCEr!bHTyME)X-eEkPuh(7~H9PAnYh*$yfe{rJlTi{Z=E{Y}?@#K3}KZ zC?w2p!>A7J?eFhUP*5IXprE8C_Y}4PBzh&BO;}aZGM18tjs!tFB+?;9mSZQ8LYf!} zix^%RQ$bZ1eia8nb+@D32wqtWakEl z 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 i2l@YuBEQ0R(kPT)c*lkR~k70 literal 0 HcmV?d00001 diff --git a/src/rhel9/xfce/.config/.blank b/src/rhel9/xfce/.config/.blank new file mode 100644 index 0000000..e69de29 diff --git a/src/rhel9/xfce/.config/xfce4/fedora-logo-icon.png b/src/rhel9/xfce/.config/xfce4/fedora-logo-icon.png new file mode 100644 index 0000000000000000000000000000000000000000..ae8fe7b43c985bcc0fe609c1cc7252cab04d2599 GIT binary patch literal 6960 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 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/rhel9/xfce/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-panel.xml b/src/rhel9/xfce/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-panel.xml new file mode 100644 index 0000000..3638ad1 --- /dev/null +++ b/src/rhel9/xfce/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-panel.xml @@ -0,0 +1,58 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/rhel9/xfce/.config/xfce4/xfconf/xfce-perchannel-xml/xfwm4.xml b/src/rhel9/xfce/.config/xfce4/xfconf/xfce-perchannel-xml/xfwm4.xml new file mode 100644 index 0000000..ba3c831 --- /dev/null +++ b/src/rhel9/xfce/.config/xfce4/xfconf/xfce-perchannel-xml/xfwm4.xml @@ -0,0 +1,91 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/rhel9/xfce/.config/xfce4/xfconf/xfce-perchannel-xml/xsettings.xml b/src/rhel9/xfce/.config/xfce4/xfconf/xfce-perchannel-xml/xsettings.xml new file mode 100644 index 0000000..d60e3c4 --- /dev/null +++ b/src/rhel9/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 3cd80fc..a13203e 100644 --- a/src/ubuntu/install/audio/install_audio.sh +++ b/src/ubuntu/install/audio/install_audio.sh @@ -15,8 +15,8 @@ elif [ "${DISTRO}" == "oracle8" ]; then dnf config-manager --set-enabled ol8_codeready_builder dnf localinstall -y --nogpgcheck https://download1.rpmfusion.org/free/el/rpmfusion-free-release-8.noarch.rpm dnf install -y ffmpeg pulseaudio-utils -elif [ "${DISTRO}" == "oracle9" ]; then - dnf install -y curl git +elif [[ "${DISTRO}" == @(oracle9|rhel9) ]]; then + dnf install -y --allowerasing curl git dnf config-manager --set-enabled ol9_codeready_builder dnf localinstall -y --nogpgcheck https://download1.rpmfusion.org/free/el/rpmfusion-free-release-9.noarch.rpm dnf install -y --allowerasing ffmpeg pulseaudio-utils pulseaudio diff --git a/src/ubuntu/install/cleanup/cleanup.sh b/src/ubuntu/install/cleanup/cleanup.sh index 77aca86..87b84ef 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|fedora39|fedora40|oracle8|oracle9|rockylinux8|rockylinux9) ]]; then +elif [[ "${DISTRO}" == @(almalinux8|almalinux9|fedora37|fedora38|fedora39|fedora40|oracle8|oracle9|rhel9|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 a3fa448..da8d9d2 100644 --- a/src/ubuntu/install/fonts/install_custom_fonts.sh +++ b/src/ubuntu/install/fonts/install_custom_fonts.sh @@ -31,7 +31,7 @@ elif [[ "${DISTRO}" == @(fedora37|fedora38|fedora39|fedora40) ]]; then echo "Generating Locale for ${LOCALE}" localedef -i ${LOCALE} -f UTF-8 ${LOCALE}.UTF-8 done -elif [[ "${DISTRO}" == @(oracle8|oracle9|rockylinux9|rockylinux8|almalinux9|almalinux8) ]]; then +elif [[ "${DISTRO}" == @(oracle8|oracle9|rhel9|rockylinux9|rockylinux8|almalinux9|almalinux8) ]]; then dnf install -y \ glibc-locale-source \ google-noto-emoji-fonts \ diff --git a/src/ubuntu/install/kasm_vnc/install_kasm_vnc.sh b/src/ubuntu/install/kasm_vnc/install_kasm_vnc.sh index a7a4c66..70f3431 100644 --- a/src/ubuntu/install/kasm_vnc/install_kasm_vnc.sh +++ b/src/ubuntu/install/kasm_vnc/install_kasm_vnc.sh @@ -7,7 +7,7 @@ prepare_rpm_repo_dependencies() { elif [[ "$DISTRO" = "oracle8" ]]; then dnf config-manager --set-enabled ol8_codeready_builder dnf install -y oracle-epel-release-el8 - elif [[ "$DISTRO" = "oracle9" ]]; then + elif [[ "${DISTRO}" == @(oracle9|rhel9) ]]; then dnf config-manager --set-enabled ol9_codeready_builder dnf install -y oracle-epel-release-el9 fi @@ -45,7 +45,7 @@ elif [[ "${DISTRO}" == @(rockylinux8|oracle8|almalinux8) ]] ; then else BUILD_URL="https://kasmweb-build-artifacts.s3.amazonaws.com/kasmvnc/${COMMIT_ID}/kasmvncserver_oracle_8_${KASM_VER_NAME_PART}_aarch64.rpm" fi -elif [[ "${DISTRO}" == @(rockylinux9|oracle9|almalinux9) ]] ; then +elif [[ "${DISTRO}" == @(rockylinux9|oracle9|rhel9|almalinux9) ]] ; then if [[ "$(arch)" =~ ^x86_64$ ]] ; then BUILD_URL="https://kasmweb-build-artifacts.s3.amazonaws.com/kasmvnc/${COMMIT_ID}/kasmvncserver_oracle_9_${KASM_VER_NAME_PART}_x86_64.rpm" else @@ -136,7 +136,7 @@ if [[ "${DISTRO}" == @(centos|oracle7) ]] ; then wget "${BUILD_URL}" -O kasmvncserver.rpm yum localinstall -y kasmvncserver.rpm rm kasmvncserver.rpm -elif [[ "${DISTRO}" == @(oracle8|oracle9|rockylinux9|rockylinux8|almalinux8|almalinux9) ]] ; then +elif [[ "${DISTRO}" == @(oracle8|oracle9|rhel9|rockylinux9|rockylinux8|almalinux8|almalinux9) ]] ; then wget "${BUILD_URL}" -O kasmvncserver.rpm dnf localinstall -y kasmvncserver.rpm dnf install -y mesa-dri-drivers diff --git a/src/ubuntu/install/kde/install_kde.sh b/src/ubuntu/install/kde/install_kde.sh index 5e29bb5..5864d8d 100644 --- a/src/ubuntu/install/kde/install_kde.sh +++ b/src/ubuntu/install/kde/install_kde.sh @@ -30,7 +30,7 @@ EOL } echo "Install KDE 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|oracle9|rhel9|rockylinux9|rockylinux8|almalinux8|almalinux9|alpine) ]]; then apt-get update fi @@ -81,7 +81,7 @@ elif [ "$DISTRO" = "oracle8" ]; then wmctrl \ xclip \ xset -elif [ "$DISTRO" = "oracle9" ]; then +elif [[ "${DISTRO}" == @(oracle9|rhel9) ]]; then dnf config-manager --set-enabled ol9_codeready_builder dnf config-manager --set-enabled ol9_distro_builder dnf install -y https://dl.fedoraproject.org/pub/epel/epel-release-latest-9.noarch.rpm @@ -134,7 +134,7 @@ elif [ "$DISTRO" = "alpine" ]; then mesa-gl fi -if [[ "${DISTRO}" != @(centos|oracle7|oracle8|fedora37|fedora38|oracle9|rockylinux9|rockylinux8|almalinux8|almalinux9|alpine) ]]; then +if [[ "${DISTRO}" != @(centos|oracle7|oracle8|fedora37|fedora38|oracle9|rhel9|rockylinux9|rockylinux8|almalinux8|almalinux9|alpine) ]]; then replace_default_xinit if [ "${START_XFCE4}" == "1" ] ; then replace_default_99x11_common_start diff --git a/src/ubuntu/install/openbox/install_openbox.sh b/src/ubuntu/install/openbox/install_openbox.sh index 780f335..f5aa040 100644 --- a/src/ubuntu/install/openbox/install_openbox.sh +++ b/src/ubuntu/install/openbox/install_openbox.sh @@ -30,7 +30,7 @@ EOL } echo "Install Openbox 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|oracle9|rhel9|rockylinux9|rockylinux8|almalinux8|almalinux9|alpine) ]]; then apt-get update fi @@ -68,7 +68,7 @@ elif [ "$DISTRO" = "oracle8" ]; then xclip \ xset \ xterm -elif [ "$DISTRO" = "oracle9" ]; then +elif [[ "${DISTRO}" == @(oracle9|rhel9) ]]; then dnf config-manager --set-enabled ol9_codeready_builder dnf config-manager --set-enabled ol9_distro_builder dnf install -y https://dl.fedoraproject.org/pub/epel/epel-release-latest-9.noarch.rpm @@ -133,7 +133,7 @@ elif [ "$DISTRO" = "alpine" ]; then xterm fi -if [[ "${DISTRO}" != @(centos|oracle7|oracle8|fedora37|fedora38|oracle9|rockylinux9|rockylinux8|almalinux8|almalinux9|alpine) ]]; then +if [[ "${DISTRO}" != @(centos|oracle7|oracle8|fedora37|fedora38|oracle9|rhel9|rockylinux9|rockylinux8|almalinux8|almalinux9|alpine) ]]; then replace_default_xinit if [ "${START_XFCE4}" == "1" ] ; then replace_default_99x11_common_start diff --git a/src/ubuntu/install/package_rules/package_rules.sh b/src/ubuntu/install/package_rules/package_rules.sh index 6795321..b72c63b 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|fedora39|fedora40|oracle8|oracle9|rockylinux8|rockylinux9) ]]; then +elif [[ "${DISTRO}" == @(almalinux8|almalinux9|fedora37|fedora38|fedora39|fedora40|oracle8|oracle9|rhel9|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|fedora39|fedora40|oracle8|oracle9|rockylinux9|rockylinux8|almalinux8|almalinux9) ]]; then +elif [[ "${DISTRO}" == @(fedora37|fedora38|fedora39|fedora40|oracle8|oracle9|rhel9|rockylinux9|rockylinux8|almalinux8|almalinux9) ]]; then dnf upgrade -y --refresh elif [ "${DISTRO}" == "opensuse" ]; then zypper --non-interactive patch --auto-agree-with-licenses diff --git a/src/ubuntu/install/printer/install_printer.sh b/src/ubuntu/install/printer/install_printer.sh index 86db7ee..7820e86 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|fedora39|fedora40) ]]; then +elif [[ "${DISTRO}" == @(almalinux8|almalinux9|oracle8|oracle9|rhel9|rockylinux8|rockylinux9|fedora37|fedora38|fedora39|fedora40) ]]; 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 0c58bfc..f3271ca 100755 --- a/src/ubuntu/install/profile_sync/install_profile_sync.sh +++ b/src/ubuntu/install/profile_sync/install_profile_sync.sh @@ -58,6 +58,9 @@ handle_other_distros_conversion() { almalinux*) profile_distro=$(echo "$profile_distro" | sed -e 's/linux//') ;; + rhel*) + profile_distro=$(echo "$profile_distro" | sed -e 's/rhel/oracle/') + ;; esac } diff --git a/src/ubuntu/install/rhel/install_rhel.sh b/src/ubuntu/install/rhel/install_rhel.sh new file mode 100644 index 0000000..2866337 --- /dev/null +++ b/src/ubuntu/install/rhel/install_rhel.sh @@ -0,0 +1,147 @@ +#! /bin/bash + +set -e + +# Bail if this is not really RHEL +if ! grep -q 'REDHAT_SUPPORT_PRODUCT="Red Hat Enterprise Linux"' /etc/os-release; then + exit 0 +fi + +# Add OL9 repos to RHEL +cat >>/etc/yum.repos.d/oracle-linux-ol9.repo <>/etc/pki/rpm-gpg/RPM-GPG-KEY-oracle <