From 76f989f0203e31f2c71b644a44d35ff84ca3c4f5 Mon Sep 17 00:00:00 2001 From: Richard Koliser Date: Wed, 28 Aug 2024 12:09:55 -0400 Subject: [PATCH 1/4] KASM-6388 Remove EOL images --- ci-scripts/template-vars.yaml | 48 ----------------- dockerfile-kasm-centos-7-desktop | 42 --------------- dockerfile-kasm-fedora-37-desktop | 53 ------------------ dockerfile-kasm-fedora-38-desktop | 54 ------------------- dockerfile-kasm-oracle-7-desktop | 52 ------------------ docs/centos-7-desktop/README.md | 7 --- docs/centos-7-desktop/demo.txt | 9 ---- docs/centos-7-desktop/description.txt | 1 - docs/desktop-deluxe/README.md | 2 +- docs/desktop/README.md | 2 +- docs/fedora-37-desktop/README.md | 7 --- docs/fedora-37-desktop/demo.txt | 9 ---- docs/fedora-37-desktop/description.txt | 1 - docs/fedora-38-desktop/README.md | 7 --- docs/fedora-38-desktop/demo.txt | 9 ---- docs/fedora-38-desktop/description.txt | 1 - docs/java-dev/README.md | 2 +- docs/oracle-7-desktop/README.md | 7 --- docs/oracle-7-desktop/demo.txt | 11 ---- docs/oracle-7-desktop/description.txt | 1 - 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 | 2 +- src/oracle/install/slack/install_slack.sh | 2 +- .../sublime_text/install_sublime_text.sh | 2 +- .../install/terraform/install_terraform.sh | 2 +- src/oracle/install/vs_code/install_vs_code.sh | 4 +- src/oracle/install/zoom/install_zoom.sh | 2 +- .../install/chromium/install_chromium.sh | 17 ++---- src/ubuntu/install/cleanup/cleanup.sh | 4 +- src/ubuntu/install/firefox/install_firefox.sh | 36 +++++-------- src/ubuntu/install/remmina/install_remmina.sh | 9 +--- src/ubuntu/install/slack/install_slack.sh | 9 +--- .../thunderbird/install_thunderbird.sh | 17 ++---- src/ubuntu/install/vpn/install_vpn.sh | 36 ++++--------- 36 files changed, 50 insertions(+), 423 deletions(-) delete mode 100644 dockerfile-kasm-centos-7-desktop delete mode 100644 dockerfile-kasm-fedora-37-desktop delete mode 100644 dockerfile-kasm-fedora-38-desktop delete mode 100644 dockerfile-kasm-oracle-7-desktop delete mode 100644 docs/centos-7-desktop/README.md delete mode 100644 docs/centos-7-desktop/demo.txt delete mode 100644 docs/centos-7-desktop/description.txt delete mode 100644 docs/fedora-37-desktop/README.md delete mode 100644 docs/fedora-37-desktop/demo.txt delete mode 100644 docs/fedora-37-desktop/description.txt delete mode 100644 docs/fedora-38-desktop/README.md delete mode 100644 docs/fedora-38-desktop/demo.txt delete mode 100644 docs/fedora-38-desktop/description.txt delete mode 100644 docs/oracle-7-desktop/README.md delete mode 100644 docs/oracle-7-desktop/demo.txt delete mode 100644 docs/oracle-7-desktop/description.txt diff --git a/ci-scripts/template-vars.yaml b/ci-scripts/template-vars.yaml index 3a23280..f4c6aa1 100644 --- a/ci-scripts/template-vars.yaml +++ b/ci-scripts/template-vars.yaml @@ -454,32 +454,6 @@ multiImages: - src/ubuntu/install/ansible/** - src/ubuntu/install/chrome/** - src/ubuntu/install/slack/** - - name: fedora-37-desktop - singleapp: false - base: core-fedora-37 - dockerfile: dockerfile-kasm-fedora-37-desktop - changeFiles: - - dockerfile-kasm-fedora-37-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-38-desktop - singleapp: false - base: core-fedora-38 - dockerfile: dockerfile-kasm-fedora-38-desktop - changeFiles: - - dockerfile-kasm-fedora-38-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-39-desktop singleapp: false base: core-fedora-39 @@ -697,16 +671,6 @@ singleImages: changeFiles: - dockerfile-kasm-blender - src/ubuntu/install/blender/** - - name: centos-7-desktop - singleapp: false - base: core-centos-7 - dockerfile: dockerfile-kasm-centos-7-desktop - changeFiles: - - dockerfile-kasm-centos-7-desktop - - src/ubuntu/install/thunderbird/** - - src/ubuntu/install/firefox/** - - src/ubuntu/install/cleanup/** - - src/ubuntu/install/chrome/** - name: chrome singleapp: true base: core-ubuntu-focal @@ -784,18 +748,6 @@ singleImages: dockerfile: dockerfile-kasm-only-office changeFiles: - dockerfile-kasm-only-office - - name: oracle-7-desktop - singleapp: false - base: core-oracle-7 - dockerfile: dockerfile-kasm-oracle-7-desktop - changeFiles: - - dockerfile-kasm-oracle-7-desktop - - src/oracle/install/** - - src/ubuntu/install/thunderbird/** - - src/ubuntu/install/remmina/** - - src/ubuntu/install/firefox/** - - src/ubuntu/install/cleanup/** - - src/ubuntu/install/chrome/** - name: kasmos-desktop singleapp: false base: core-kasmos diff --git a/dockerfile-kasm-centos-7-desktop b/dockerfile-kasm-centos-7-desktop deleted file mode 100644 index 3265ef5..0000000 --- a/dockerfile-kasm-centos-7-desktop +++ /dev/null @@ -1,42 +0,0 @@ -ARG BASE_TAG="develop" -ARG BASE_IMAGE="core-centos-7" -FROM kasmweb/$BASE_IMAGE:$BASE_TAG -USER root - -ENV DISTRO=centos -ENV HOME /home/kasm-default-profile -ENV STARTUPDIR /dockerstartup -ENV INST_SCRIPTS $STARTUPDIR/install -WORKDIR $HOME - -### Envrionment config -ENV SKIP_CLEAN=true \ - KASM_RX_HOME=$STARTUPDIR/kasmrx \ - INST_DIR=$STARTUPDIR/install \ - INST_SCRIPTS="/ubuntu/install/misc/install_tools.sh \ - /ubuntu/install/chrome/install_chrome.sh \ - /ubuntu/install/firefox/install_firefox.sh \ - /ubuntu/install/thunderbird/install_thunderbird.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-37-desktop b/dockerfile-kasm-fedora-37-desktop deleted file mode 100644 index 4ea8511..0000000 --- a/dockerfile-kasm-fedora-37-desktop +++ /dev/null @@ -1,53 +0,0 @@ -ARG BASE_TAG="develop" -ARG BASE_IMAGE="core-fedora-37" -FROM kasmweb/$BASE_IMAGE:$BASE_TAG - -USER root - -ENV DISTRO=fedora37 -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 \ - /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-38-desktop b/dockerfile-kasm-fedora-38-desktop deleted file mode 100644 index 577bdde..0000000 --- a/dockerfile-kasm-fedora-38-desktop +++ /dev/null @@ -1,54 +0,0 @@ -ARG BASE_TAG="develop" -ARG BASE_IMAGE="core-fedora-38" -FROM kasmweb/$BASE_IMAGE:$BASE_TAG - -USER root - -ENV DISTRO=fedora38 -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/terraform/install_terraform.sh \ - /oracle/install/telegram/install_telegram.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-oracle-7-desktop b/dockerfile-kasm-oracle-7-desktop deleted file mode 100644 index 2e2b513..0000000 --- a/dockerfile-kasm-oracle-7-desktop +++ /dev/null @@ -1,52 +0,0 @@ -ARG BASE_TAG="develop" -ARG BASE_IMAGE="core-oracle-7" -FROM kasmweb/$BASE_IMAGE:$BASE_TAG - -USER root - -ENV DISTRO=centos -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/chrome/install_chrome.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 \ - /ubuntu/install/thunderbird/install_thunderbird.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/docs/centos-7-desktop/README.md b/docs/centos-7-desktop/README.md deleted file mode 100644 index 9778b1a..0000000 --- a/docs/centos-7-desktop/README.md +++ /dev/null @@ -1,7 +0,0 @@ -# About This Image - -This Image contains a browser-accessible CentOS 7 XFCE Desktop with Chrome and Firefox installed.. - -![Screenshot][Image_Screenshot] - -[Image_Screenshot]: https://f.hubspotusercontent30.net/hubfs/5856039/dockerhub/image-screenshots/centos-7-desktop.png "Image Screenshot" \ No newline at end of file diff --git a/docs/centos-7-desktop/demo.txt b/docs/centos-7-desktop/demo.txt deleted file mode 100644 index 5f13f4d..0000000 --- a/docs/centos-7-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/centos-7-desktop/description.txt b/docs/centos-7-desktop/description.txt deleted file mode 100644 index 5bf64d8..0000000 --- a/docs/centos-7-desktop/description.txt +++ /dev/null @@ -1 +0,0 @@ -CentOS 7 desktop for Kasm Workspaces \ No newline at end of file diff --git a/docs/desktop-deluxe/README.md b/docs/desktop-deluxe/README.md index e152668..5d46f44 100644 --- a/docs/desktop-deluxe/README.md +++ b/docs/desktop-deluxe/README.md @@ -1,6 +1,6 @@ # About This Image -This Image contains a browser-accessible Ubuntu Bionic Desktop with various productivity and development apps installed. +This Image contains a browser-accessible Ubuntu Focal Desktop with various productivity and development apps installed. ![Screenshot][Image_Screenshot] diff --git a/docs/desktop/README.md b/docs/desktop/README.md index 181ca8f..a9a9ff2 100644 --- a/docs/desktop/README.md +++ b/docs/desktop/README.md @@ -1,6 +1,6 @@ # About This Image -This Image contains a browser-accessible Ubuntu Bionic Desktop with Chrome and Firefox installed. +This Image contains a browser-accessible Ubuntu Focal Desktop with Chrome and Firefox installed. ![Screenshot][Image_Screenshot] diff --git a/docs/fedora-37-desktop/README.md b/docs/fedora-37-desktop/README.md deleted file mode 100644 index b71943a..0000000 --- a/docs/fedora-37-desktop/README.md +++ /dev/null @@ -1,7 +0,0 @@ -# About This Image - -This Image contains a browser-accessible Fedora 37 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-37-desktop/demo.txt b/docs/fedora-37-desktop/demo.txt deleted file mode 100644 index 0b606c7..0000000 --- a/docs/fedora-37-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/fedora-37-desktop/description.txt b/docs/fedora-37-desktop/description.txt deleted file mode 100644 index 1b29538..0000000 --- a/docs/fedora-37-desktop/description.txt +++ /dev/null @@ -1 +0,0 @@ -Fedora 37 desktop for Kasm Workspaces diff --git a/docs/fedora-38-desktop/README.md b/docs/fedora-38-desktop/README.md deleted file mode 100644 index 927ef38..0000000 --- a/docs/fedora-38-desktop/README.md +++ /dev/null @@ -1,7 +0,0 @@ -# About This Image - -This Image contains a browser-accessible Fedora 38 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-38-desktop/demo.txt b/docs/fedora-38-desktop/demo.txt deleted file mode 100644 index 0b606c7..0000000 --- a/docs/fedora-38-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/fedora-38-desktop/description.txt b/docs/fedora-38-desktop/description.txt deleted file mode 100644 index e73fd2d..0000000 --- a/docs/fedora-38-desktop/description.txt +++ /dev/null @@ -1 +0,0 @@ -Fedora 38 desktop for Kasm Workspaces diff --git a/docs/java-dev/README.md b/docs/java-dev/README.md index be61ba0..e281aaf 100644 --- a/docs/java-dev/README.md +++ b/docs/java-dev/README.md @@ -1,6 +1,6 @@ # About This Image -This Image contains a browser-accessible Ubuntu Bionic Desktop with a Java development environment. +This Image contains a browser-accessible Ubuntu Focal Desktop with a Java development environment. ![Screenshot][Image_Screenshot] diff --git a/docs/oracle-7-desktop/README.md b/docs/oracle-7-desktop/README.md deleted file mode 100644 index a5c2684..0000000 --- a/docs/oracle-7-desktop/README.md +++ /dev/null @@ -1,7 +0,0 @@ -# About This Image - -This Image contains a browser-accessible Oracle Linux 7 Desktop with various productivity and development apps installed. - -![Screenshot][Image_Screenshot] - -[Image_Screenshot]: https://5856039.fs1.hubspotusercontent-na1.net/hubfs/5856039/dockerhub/oracle-7-desktop.png "Image Screenshot" diff --git a/docs/oracle-7-desktop/demo.txt b/docs/oracle-7-desktop/demo.txt deleted file mode 100644 index 4320df5..0000000 --- a/docs/oracle-7-desktop/demo.txt +++ /dev/null @@ -1,11 +0,0 @@ -# Live Demo - - - -**Launch a real-time demo in a new browser window:** Live Demo. - - - -∗*This demo is linked to Oracle Linux 8* - -∗*Note: Demo is limited to 3 minutes and has upload/downloads restricted for security purposes.* diff --git a/docs/oracle-7-desktop/description.txt b/docs/oracle-7-desktop/description.txt deleted file mode 100644 index 11d4ea6..0000000 --- a/docs/oracle-7-desktop/description.txt +++ /dev/null @@ -1 +0,0 @@ -Oracle Linux 7 desktop for Kasm Workspaces diff --git a/src/oracle/install/ansible/install_ansible.sh b/src/oracle/install/ansible/install_ansible.sh index e76efcf..fee18d1 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|almalinux9|almalinux8|fedora37|fedora38|fedora39|fedora40) ]]; then +if [[ "${DISTRO}" == @(oracle8|rockylinux9|rockylinux8|oracle9|almalinux9|almalinux8|fedora39|fedora40) ]]; 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 c72b185..d638116 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|almalinux9|almalinux8|fedora37|fedora38|fedora39|fedora40) ]]; then +if [[ "${DISTRO}" == @(oracle8|rockylinux9|rockylinux8|oracle9|almalinux9|almalinux8|fedora39|fedora40) ]]; 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 5f9ce68..437b401 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|almalinux9|almalinux8|fedora37|fedora38|fedora39|fedora40) ]]; then +if [[ "${DISTRO}" == @(oracle8|rockylinux9|rockylinux8|oracle9|almalinux9|almalinux8|fedora39|fedora40) ]]; 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 26cac31..030e9e9 100644 --- a/src/oracle/install/only_office/install_only_office.sh +++ b/src/oracle/install/only_office/install_only_office.sh @@ -8,7 +8,7 @@ if [ "$ARCH" == "arm64" ] ; then fi curl -L -o only_office.rpm "https://download.onlyoffice.com/install/desktop/editors/linux/onlyoffice-desktopeditors.$(arch).rpm" -if [[ "${DISTRO}" == @(oracle8|rockylinux9|rockylinux8|oracle9|almalinux9|almalinux8|fedora37|fedora38|fedora39|fedora40) ]]; then +if [[ "${DISTRO}" == @(oracle8|rockylinux9|rockylinux8|oracle9|almalinux9|almalinux8|fedora39|fedora40) ]]; then dnf localinstall -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 28e9b7c..88a2a7a 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|almalinux9|almalinux8|fedora37|fedora38|fedora39|fedora40) ]]; then +if [[ "${DISTRO}" == @(oracle8|rockylinux9|rockylinux8|oracle9|almalinux9|almalinux8|fedora39|fedora40) ]]; 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 f09887b..e3c7a1a 100644 --- a/src/oracle/install/sublime_text/install_sublime_text.sh +++ b/src/oracle/install/sublime_text/install_sublime_text.sh @@ -8,7 +8,7 @@ fi rpm -v --import https://download.sublimetext.com/sublimehq-rpm-pub.gpg -if [[ "${DISTRO}" == @(oracle8|rockylinux9|rockylinux8|oracle9|almalinux9|almalinux8|fedora37|fedora38|fedora39|fedora40) ]]; then +if [[ "${DISTRO}" == @(oracle8|rockylinux9|rockylinux8|oracle9|almalinux9|almalinux8|fedora39|fedora40) ]]; then dnf config-manager --add-repo https://download.sublimetext.com/rpm/stable/$(arch)/sublime-text.repo dnf install -y sublime-text if [ -z ${SKIP_CLEAN+x} ]; then diff --git a/src/oracle/install/terraform/install_terraform.sh b/src/oracle/install/terraform/install_terraform.sh index aecc842..ef06bdc 100644 --- a/src/oracle/install/terraform/install_terraform.sh +++ b/src/oracle/install/terraform/install_terraform.sh @@ -14,7 +14,7 @@ if [[ "${DISTRO}" == @(oracle8|rockylinux9|rockylinux8|oracle9|almalinux9|almali if [ -z ${SKIP_CLEAN+x} ]; then dnf clean all fi -elif [[ "${DISTRO}" == @(fedora37|fedora38|fedora39|fedora40) ]]; then +elif [[ "${DISTRO}" == @(fedora39|fedora40) ]]; then dnf config-manager --add-repo https://rpm.releases.hashicorp.com/fedora/hashicorp.repo dnf install -y terraform if [ -z ${SKIP_CLEAN+x} ]; then diff --git a/src/oracle/install/vs_code/install_vs_code.sh b/src/oracle/install/vs_code/install_vs_code.sh index def2b44..05c8858 100644 --- a/src/oracle/install/vs_code/install_vs_code.sh +++ b/src/oracle/install/vs_code/install_vs_code.sh @@ -3,7 +3,7 @@ set -ex ARCH=$(arch | sed 's/aarch64/arm64/g' | sed 's/x86_64/x64/g') wget -q https://update.code.visualstudio.com/latest/linux-rpm-${ARCH}/stable -O vs_code.rpm -if [[ "${DISTRO}" == @(oracle8|rockylinux9|rockylinux8|oracle9|almalinux9|almalinux8|fedora37|fedora38|fedora39|fedora40) ]]; then +if [[ "${DISTRO}" == @(oracle8|rockylinux9|rockylinux8|oracle9|almalinux9|almalinux8|fedora39|fedora40) ]]; then wget -q https://update.code.visualstudio.com/latest/linux-rpm-${ARCH}/stable -O vs_code.rpm dnf localinstall -y vs_code.rpm else @@ -20,7 +20,7 @@ chown 1000:1000 $HOME/Desktop/code.desktop rm vs_code.rpm # Conveniences for python development -if [[ "${DISTRO}" == @(oracle8|rockylinux9|rockylinux8|oracle9|almalinux9|almalinux8|fedora37|fedora38|fedora39|fedora40) ]]; then +if [[ "${DISTRO}" == @(oracle8|rockylinux9|rockylinux8|oracle9|almalinux9|almalinux8|fedora39|fedora40) ]]; 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 4bcc98b..15642db 100644 --- a/src/oracle/install/zoom/install_zoom.sh +++ b/src/oracle/install/zoom/install_zoom.sh @@ -8,7 +8,7 @@ fi wget -q https://zoom.us/client/latest/zoom_$(arch).rpm -if [[ "${DISTRO}" == @(oracle8|rockylinux9|rockylinux8|oracle9|almalinux9|almalinux8|fedora37|fedora38|fedora39|fedora40) ]]; then +if [[ "${DISTRO}" == @(oracle8|rockylinux9|rockylinux8|oracle9|almalinux9|almalinux8|fedora39|fedora40) ]]; then dnf localinstall -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 30b786d..b9c9a87 100644 --- a/src/ubuntu/install/chromium/install_chromium.sh +++ b/src/ubuntu/install/chromium/install_chromium.sh @@ -9,17 +9,10 @@ if [[ "${DISTRO}" == @(debian|opensuse|ubuntu) ]] && [ ${ARCH} = 'amd64' ] && [ exit 0 fi -if [[ "${DISTRO}" == @(centos|oracle8|rockylinux9|rockylinux8|oracle9|almalinux9|almalinux8|fedora37|fedora38|fedora39|fedora40) ]]; then - if [[ "${DISTRO}" == @(oracle8|rockylinux9|rockylinux8|oracle9|almalinux9|almalinux8|fedora37|fedora38|fedora39|fedora40) ]]; then - dnf install -y chromium - if [ -z ${SKIP_CLEAN+x} ]; then - dnf clean all - fi - else - yum install -y chromium - if [ -z ${SKIP_CLEAN+x} ]; then - yum clean all - fi +if [[ "${DISTRO}" == @(oracle8|rockylinux9|rockylinux8|oracle9|almalinux9|almalinux8|fedora39|fedora40) ]]; then + dnf install -y chromium + if [ -z ${SKIP_CLEAN+x} ]; then + dnf clean all fi elif [ "${DISTRO}" == "opensuse" ]; then zypper install -yn chromium @@ -124,7 +117,7 @@ if [ "${DISTRO}" != "opensuse" ] && ! grep -q "ID=debian" /etc/os-release && ! g cp /usr/bin/chromium-browser /usr/bin/chromium fi -if [[ "${DISTRO}" == @(centos|oracle8|rockylinux9|rockylinux8|oracle9|almalinux9|almalinux8|opensuse|fedora37|fedora38|fedora39|fedora40) ]]; then +if [[ "${DISTRO}" == @(oracle8|rockylinux9|rockylinux8|oracle9|almalinux9|almalinux8|opensuse|fedora39|fedora40) ]]; then cat >> $HOME/.config/mimeapps.list <"$preferences_file" <>$HOME/.mozilla/firefox/profiles.ini <>$HOME/.mozilla/firefox/profiles.ini </dev/null - curl -fsSL https://pkgs.tailscale.com/stable/${ID}/${FLAVOR}.tailscale-keyring.list | tee /etc/apt/sources.list.d/tailscale.list - apt-get update - apt-get install -y --no-install-recommends tailscale - fi + FLAVOR=$(echo ${FLAVOR} | sed -e 's/ara/sid/g' -e 's/kali-rolling/sid/g') + ID=$(echo ${ID} | sed -e 's/kali/debian/g' -e 's/parrot/debian/g') + mkdir -p --mode=0755 /usr/share/keyrings + curl -fsSL https://pkgs.tailscale.com/stable/${ID}/${FLAVOR}.noarmor.gpg | tee /usr/share/keyrings/tailscale-archive-keyring.gpg >/dev/null + curl -fsSL https://pkgs.tailscale.com/stable/${ID}/${FLAVOR}.tailscale-keyring.list | tee /etc/apt/sources.list.d/tailscale.list + apt-get update + apt-get install -y --no-install-recommends tailscale else - if [[ "${VERSION}" == "7" ]] || [[ "${VERSION}" = "7*" ]]; then - yum install -y yum-utils - yum-config-manager --add-repo https://pkgs.tailscale.com/stable/centos/7/tailscale.repo - yum install -y tailscale - elif [[ "${VERSION}" == "8" ]] || [[ "${VERSION}" = "8*" ]]; then + if [[ "${VERSION}" == "8" ]] || [[ "${VERSION}" = "8*" ]]; then dnf install -y 'dnf-command(config-manager)' dnf config-manager --add-repo https://pkgs.tailscale.com/stable/centos/8/tailscale.repo dnf install -y tailscale From 7a301305d02659598de473ac7a9c9c2f5d130e39 Mon Sep 17 00:00:00 2001 From: "ryan.kuba" Date: Fri, 13 Sep 2024 11:19:39 -0400 Subject: [PATCH 2/4] install firefox on bookworm from official repos --- src/ubuntu/install/firefox/install_firefox.sh | 22 +++++++++---------- 1 file changed, 10 insertions(+), 12 deletions(-) diff --git a/src/ubuntu/install/firefox/install_firefox.sh b/src/ubuntu/install/firefox/install_firefox.sh index 782b016..7283944 100644 --- a/src/ubuntu/install/firefox/install_firefox.sh +++ b/src/ubuntu/install/firefox/install_firefox.sh @@ -41,20 +41,16 @@ elif grep -q "ID=debian" /etc/os-release || grep -q "ID=kali" /etc/os-release || $HOME/Desktop/ chmod +x $HOME/Desktop/firefox-esr.desktop else - echo \ - "deb http://deb.debian.org/debian/ unstable main contrib non-free" >> \ - /etc/apt/sources.list -cat > /etc/apt/preferences.d/99pin-unstable < /etc/apt/keyrings/packages.mozilla.org.asc + echo "deb [signed-by=/etc/apt/keyrings/packages.mozilla.org.asc] https://packages.mozilla.org/apt mozilla main" > /etc/apt/sources.list.d/mozilla.list +echo ' Package: * -Pin: release a=stable -Pin-Priority: 900 - -Package: * -Pin: release a=unstable -Pin-Priority: 10 -EOF +Pin: origin packages.mozilla.org +Pin-Priority: 1000 +' > /etc/apt/preferences.d/mozilla apt-get update - apt-get install -o Dpkg::Options::="--force-confnew" -y -t unstable firefox p11-kit-modules + apt-get install -y firefox p11-kit-modules fi else apt-mark unhold firefox || : @@ -133,6 +129,8 @@ elif [ "${DISTRO}" == "opensuse" ]; then preferences_file=/usr/lib64/firefox/browser/defaults/preferences/firefox.js elif grep -q "bullseye" /etc/os-release; then preferences_file=/usr/lib/firefox-esr/browser/defaults/preferences/firefox.js +elif grep -q "bookworm" /etc/os-release; then + preferences_file=/usr/lib/firefox/defaults/pref/firefox.js else preferences_file=/usr/lib/firefox/browser/defaults/preferences/firefox.js fi From c648b61bba39e8cf6c77a7a179ab70ce63db3c41 Mon Sep 17 00:00:00 2001 From: thelamer Date: Fri, 13 Sep 2024 14:42:07 -0400 Subject: [PATCH 3/4] install firefox-esr on debian for arm64 --- src/ubuntu/install/firefox/install_firefox.sh | 28 ++++++++++--------- 1 file changed, 15 insertions(+), 13 deletions(-) diff --git a/src/ubuntu/install/firefox/install_firefox.sh b/src/ubuntu/install/firefox/install_firefox.sh index 7283944..ee60219 100644 --- a/src/ubuntu/install/firefox/install_firefox.sh +++ b/src/ubuntu/install/firefox/install_firefox.sh @@ -32,15 +32,7 @@ Pin-Priority: 1001 fi apt-get install -y firefox p11-kit-modules elif grep -q "ID=debian" /etc/os-release || grep -q "ID=kali" /etc/os-release || grep -q "ID=parrot" /etc/os-release; then - if grep -q "bullseye" /etc/os-release; then - apt-get update - apt-get install -y firefox-esr p11-kit-modules - rm -f $HOME/Desktop/firefox.desktop - cp \ - /usr/share/applications/firefox-esr.desktop \ - $HOME/Desktop/ - chmod +x $HOME/Desktop/firefox-esr.desktop - else + if [ "${ARCH}" == "amd64" ]; then install -d -m 0755 /etc/apt/keyrings wget -q https://packages.mozilla.org/apt/repo-signing-key.gpg -O- > /etc/apt/keyrings/packages.mozilla.org.asc echo "deb [signed-by=/etc/apt/keyrings/packages.mozilla.org.asc] https://packages.mozilla.org/apt mozilla main" > /etc/apt/sources.list.d/mozilla.list @@ -51,6 +43,14 @@ Pin-Priority: 1000 ' > /etc/apt/preferences.d/mozilla apt-get update apt-get install -y firefox p11-kit-modules + else + apt-get update + apt-get install -y firefox-esr p11-kit-modules + rm -f $HOME/Desktop/firefox.desktop + cp \ + /usr/share/applications/firefox-esr.desktop \ + $HOME/Desktop/ + chmod +x $HOME/Desktop/firefox-esr.desktop fi else apt-mark unhold firefox || : @@ -127,10 +127,12 @@ if [[ "${DISTRO}" == @(centos|oracle8|rockylinux9|rockylinux8|oracle9|almalinux9 sed -i -e '/homepage/d' "$preferences_file" elif [ "${DISTRO}" == "opensuse" ]; then preferences_file=/usr/lib64/firefox/browser/defaults/preferences/firefox.js -elif grep -q "bullseye" /etc/os-release; then - preferences_file=/usr/lib/firefox-esr/browser/defaults/preferences/firefox.js -elif grep -q "bookworm" /etc/os-release; then - preferences_file=/usr/lib/firefox/defaults/pref/firefox.js +elif grep -q "ID=debian" /etc/os-release || grep -q "ID=kali" /etc/os-release || grep -q "ID=parrot" /etc/os-release; then + if [ "${ARCH}" == "amd64" ]; then + preferences_file=/usr/lib/firefox/defaults/pref/firefox.js + else + preferences_file=/usr/lib/firefox-esr/browser/defaults/preferences/firefox.js + fi else preferences_file=/usr/lib/firefox/browser/defaults/preferences/firefox.js fi From 0d09e2870fb06b740aee5cf2aebdd410c901de7c Mon Sep 17 00:00:00 2001 From: thelamer Date: Fri, 13 Sep 2024 16:15:37 -0400 Subject: [PATCH 4/4] install firefox-esr on debian for arm64 --- src/ubuntu/install/firefox/install_firefox.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/ubuntu/install/firefox/install_firefox.sh b/src/ubuntu/install/firefox/install_firefox.sh index ee60219..a69e59a 100644 --- a/src/ubuntu/install/firefox/install_firefox.sh +++ b/src/ubuntu/install/firefox/install_firefox.sh @@ -109,7 +109,7 @@ fi if [[ "${DISTRO}" != @(centos|oracle8|rockylinux9|rockylinux8|oracle9|almalinux9|almalinux8|opensuse|fedora37|fedora38|fedora39|fedora40) ]]; then # Update firefox to utilize the system certificate store instead of the one that ships with firefox - if grep -q "bullseye" /etc/os-release; then + if grep -q "ID=debian" /etc/os-release || grep -q "ID=kali" /etc/os-release || grep -q "ID=parrot" /etc/os-release && [ "${ARCH}" == "arm64" ]; then rm -f /usr/lib/firefox-esr/libnssckbi.so ln /usr/lib/$(arch)-linux-gnu/pkcs11/p11-kit-trust.so /usr/lib/firefox-esr/libnssckbi.so else