From 18e1149cadf6441d57fa3f4012621e9e9acfbe89 Mon Sep 17 00:00:00 2001 From: "CanbiZ (MickLesk)" <47820557+MickLesk@users.noreply.github.com> Date: Mon, 12 Jan 2026 13:22:34 +0100 Subject: [PATCH] Apache Cassandra: bump to debian 13 and add update support (#10720) * Apache Cassandra: bump to debian 13 and add update support Bump default Cassandra version from 12 to 13 in scripts and metadata. Refactor install script to use helper functions for Java and repository setup. Implement update functionality in the control script and mark Cassandra as updateable in the JSON metadata. * Add success message for Cassandra update Add success message after updating Apache Cassandra. --- ct/apache-cassandra.sh | 22 +++++++++++++--------- frontend/public/json/apache-cassandra.json | 4 ++-- install/apache-cassandra-install.sh | 22 ++++++++-------------- 3 files changed, 23 insertions(+), 25 deletions(-) diff --git a/ct/apache-cassandra.sh b/ct/apache-cassandra.sh index 8f6f0dbac..40d948d7a 100644 --- a/ct/apache-cassandra.sh +++ b/ct/apache-cassandra.sh @@ -11,7 +11,7 @@ var_cpu="${var_cpu:-1}" var_ram="${var_ram:-2048}" var_disk="${var_disk:-4}" var_os="${var_os:-debian}" -var_version="${var_version:-12}" +var_version="${var_version:-13}" var_unprivileged="${var_unprivileged:-1}" header_info "$APP" @@ -20,15 +20,19 @@ color catch_errors function update_script() { - header_info - check_container_storage - check_container_resources - if [[ ! -f /etc/systemd/system/cassandra.service ]]; then - msg_error "No ${APP} Installation Found!" - exit - fi - msg_error "Currently we don't provide an update function for this ${APP}." + header_info + check_container_storage + check_container_resources + if [[ ! -f /etc/init.d/cassandra ]]; then + msg_error "No ${APP} Installation Found!" exit + fi + msg_info "Updating Apache Cassandra" + $STD apt update + $STD apt install -y --only-upgrade cassandra cassandra-tools + msg_ok "Updated Apache Cassandra" + msg_ok "Updated successfully!" + exit } start diff --git a/frontend/public/json/apache-cassandra.json b/frontend/public/json/apache-cassandra.json index f594c3bc3..c5b9806eb 100644 --- a/frontend/public/json/apache-cassandra.json +++ b/frontend/public/json/apache-cassandra.json @@ -6,7 +6,7 @@ ], "date_created": "2024-05-02", "type": "ct", - "updateable": false, + "updateable": true, "privileged": false, "interface_port": null, "documentation": "https://cassandra.apache.org/doc/latest/", @@ -23,7 +23,7 @@ "ram": 2048, "hdd": 4, "os": "debian", - "version": "12" + "version": "13" } } ], diff --git a/install/apache-cassandra-install.sh b/install/apache-cassandra-install.sh index 50dda7b56..b1eca2994 100644 --- a/install/apache-cassandra-install.sh +++ b/install/apache-cassandra-install.sh @@ -13,22 +13,16 @@ setting_up_container network_check update_os -msg_info "Installing Dependencies" -$STD apt-get install -y apt-transport-https -msg_ok "Installed Dependencies" - -msg_info "Installing Eclipse Temurin (Patience)" -curl -fsSL "https://packages.adoptium.net/artifactory/api/gpg/key/public" | gpg --dearmor >/etc/apt/trusted.gpg.d/adoptium.gpg -echo 'deb [arch=amd64 signed-by=/etc/apt/trusted.gpg.d/adoptium.gpg] https://packages.adoptium.net/artifactory/deb bookworm main' >/etc/apt/sources.list.d/adoptium.list -$STD apt-get update -$STD apt-get install -y temurin-11-jdk -msg_ok "Installed Eclipse Temurin" +JAVA_VERSION="11" setup_java msg_info "Installing Apache Cassandra" -curl -fsSL "https://downloads.apache.org/cassandra/KEYS" | gpg --dearmor >/etc/apt/trusted.gpg.d/cassandra.gpg -echo "deb https://debian.cassandra.apache.org 41x main" >/etc/apt/sources.list.d/cassandra.sources.list -$STD apt-get update -$STD apt-get install -y cassandra cassandra-tools +setup_deb822_repo \ + "cassandra" \ + "https://downloads.apache.org/cassandra/KEYS" \ + "https://debian.cassandra.apache.org" \ + "41x" \ + "main" +$STD apt install -y cassandra cassandra-tools sed -i -e 's/^rpc_address: localhost/#rpc_address: localhost/g' -e 's/^# rpc_interface: eth1/rpc_interface: eth0/g' /etc/cassandra/cassandra.yaml msg_ok "Installed Apache Cassandra"