[arm64] remove logic for custom debian arm64 template

Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>

CHANGELOG.md

@@ -486,6 +486,7 @@ Exercise vigilance regarding copycat or coat-tailing sites that seek to exploit
 
   - #### 🐞 Bug Fixes
 
+    - Jotty: Fix wrong path test in config restore [@vhsdream](https://github.com/vhsdream) ([#15038](https://github.com/community-scripts/ProxmoxVE/pull/15038))
     - Fix for cross-seed after node upgrade [@TorinFrancis](https://github.com/TorinFrancis) ([#15025](https://github.com/community-scripts/ProxmoxVE/pull/15025))
 
 ### 💾 Core

ct/forgejo-runner.sh

@@ -1,85 +0,0 @@
-#!/usr/bin/env bash
-source <(curl -fsSL https://raw.githubusercontent.com/community-scripts/ProxmoxVE/main/misc/build.func)
-
-# Copyright (c) 2021-2026 community-scripts ORG
-# Author: Simon Friedrich (lengschder97)
-# License: MIT | https://github.com/community-scripts/ProxmoxVE/raw/main/LICENSE
-# Source: https://forgejo.org/
-
-APP="Forgejo-Runner"
-var_tags="${var_tags:-ci}"
-var_cpu="${var_cpu:-2}"
-var_ram="${var_ram:-2048}"
-var_disk="${var_disk:-8}"
-var_os="${var_os:-debian}"
-var_version="${var_version:-13}"
-var_arm64="${var_arm64:-no}"
-
-var_unprivileged="${var_unprivileged:-1}"
-var_nesting="${var_nesting:-1}"
-var_keyctl="${var_keyctl:-1}"
-
-# App-specific variables (not in build.func whitelist)
-# Export so they survive lxc-attach into the container
-export var_forgejo_instance="${var_forgejo_instance:-}"
-export var_forgejo_runner_token="${var_forgejo_runner_token:-}"
-export var_runner_labels="${var_runner_labels:-}"
-
-header_info "$APP"
-variables
-color
-catch_errors
-
-function update_script() {
-  header_info
-  check_container_storage
-  check_container_resources
-
-  if [[ ! -f /usr/local/bin/forgejo-runner ]]; then
-    msg_error "No ${APP} installation found!"
-    exit 1
-  fi
-
-  RELEASE=$(curl -fsSL https://data.forgejo.org/api/v1/repos/forgejo/runner/releases/latest | grep -oP '"tag_name":\s*"\K[^"]+' | sed 's/^v//')
-  if [[ "${RELEASE}" == "$(cat ~/.forgejo-runner 2>/dev/null)" ]]; then
-    msg_ok "No update required. ${APP} is already at v${RELEASE}"
-    exit
-  fi
-
-  msg_info "Stopping Services"
-  systemctl stop forgejo-runner
-  msg_ok "Stopped Services"
-
-  msg_info "Updating Forgejo Runner to v${RELEASE}"
-  curl -fsSL "https://code.forgejo.org/forgejo/runner/releases/download/v${RELEASE}/forgejo-runner-${RELEASE}-linux-amd64" -o /usr/local/bin/forgejo-runner
-  chmod +x /usr/local/bin/forgejo-runner
-  echo "${RELEASE}" >~/.forgejo-runner
-  msg_ok "Updated Forgejo Runner"
-
-  msg_info "Starting Services"
-  systemctl start forgejo-runner
-  msg_ok "Started Services"
-  msg_ok "Updated successfully!"
-  exit
-}
-
-# Fail early if running unattended without required values
-# mode is only set when the user explicitly passes it (automating);
-# bare "bash -c $(curl ...)" leaves mode empty and shows the whiptail menu
-if [[ -n "${mode:-}" ]]; then
-  if [[ -z "${var_forgejo_instance:-}" ]]; then
-    msg_error "var_forgejo_instance is required for unattended installs."
-    exit 1
-  fi
-  if [[ -z "${var_forgejo_runner_token:-}" ]]; then
-    msg_error "var_forgejo_runner_token is required for unattended installs."
-    exit 1
-  fi
-fi
-
-start
-build_container
-description
-
-msg_ok "Completed successfully!\n"
-echo -e "${CREATING}${GN}${APP} setup has been successfully initialized!${CL}"

ct/headers/forgejo-runner

@@ -1,6 +0,0 @@
-    ______                        _             ____                             
-   / ____/___  _________ ____    (_)___        / __ \__  ______  ____  ___  _____
-  / /_  / __ \/ ___/ __ `/ _ \  / / __ \______/ /_/ / / / / __ \/ __ \/ _ \/ ___/
- / __/ / /_/ / /  / /_/ /  __/ / / /_/ /_____/ _, _/ /_/ / / / / / / /  __/ /    
-/_/    \____/_/   \__, /\___/_/ /\____/     /_/ |_|\__,_/_/ /_/_/ /_/\___/_/     
-                 /____/    /___/                                                 

ct/jotty.sh

@@ -47,7 +47,7 @@ function update_script() {
     msg_info "Restoring configuration & data"
     mv /opt/app.env /opt/jotty/.env
     [[ -d /opt/data ]] && mv /opt/data /opt/jotty/data
-    [[ -d /opt/jotty/config ]] && cp -a /opt/config/* /opt/jotty/config && rm -rf /opt/config
+    [[ -d /opt/config ]] && cp -a /opt/config/* /opt/jotty/config && rm -rf /opt/config
     msg_ok "Restored configuration & data"
 
     msg_info "Starting Service"

install/forgejo-runner-install.sh

@@ -1,115 +0,0 @@
-#!/usr/bin/env bash
-# Copyright (c) 2021-2026 community-scripts ORG
-# Author: Simon Friedrich (lengschder97)
-# License: MIT | https://github.com/community-scripts/ProxmoxVE/raw/main/LICENSE
-# Source: https://forgejo.org/
-
-source /dev/stdin <<<"$FUNCTIONS_FILE_PATH"
-color
-verb_ip6
-catch_errors
-setting_up_container
-network_check
-update_os
-setup_yq
-
-# Get required configuration — skip prompts if already set (generated/unattended mode)
-if [[ -z "${var_forgejo_instance:-}" ]]; then
-  read -r -p "${TAB3}Forgejo Instance URL (e.g. https://codeberg.org): " var_forgejo_instance
-  var_forgejo_instance="${var_forgejo_instance:-https://codeberg.org}"
-fi
-
-if [[ -z "${var_forgejo_runner_uuid:-}" ]]; then
-  read -r -p "${TAB3}Forgejo Runner UUID: " var_forgejo_runner_uuid
-fi
-
-if [[ -z "${var_forgejo_runner_uuid:-}" ]]; then
-  msg_error "No runner UUID provided. Cannot continue."
-  exit 1
-fi
-
-if [[ -z "${var_forgejo_runner_token:-}" ]]; then
-  read -r -p "${TAB3}Forgejo Runner Token: " var_forgejo_runner_token
-fi
-
-if [[ -z "${var_forgejo_runner_token:-}" ]]; then
-  msg_error "No runner registration token provided. Cannot continue."
-  exit 1
-fi
-
-# Runner labels — default is always included; additional labels are appended
-DEFAULT_RUNNER_LABELS="linux-amd64:docker://node:22-bookworm"
-if [[ -z "${var_runner_labels:-}" ]]; then
-  read -r -p "${TAB3}Additional runner labels (comma-separated, or leave blank for default only): " var_runner_labels
-fi
-if [[ -n "${var_runner_labels:-}" ]]; then
-  RUNNER_LABELS="${DEFAULT_RUNNER_LABELS},${var_runner_labels}"
-else
-  RUNNER_LABELS="${DEFAULT_RUNNER_LABELS}"
-fi
-
-export FORGEJO_INSTANCE="$var_forgejo_instance"
-export FORGEJO_RUNNER_TOKEN="$var_forgejo_runner_token"
-export FORGEJO_RUNNER_UUID="$var_forgejo_runner_uuid"
-export RUNNER_LABELS
-
-msg_info "Installing dependencies"
-$STD apt install -y \
-  git \
-  podman podman-docker
-msg_ok "Installed dependencies"
-
-msg_info "Enabling Podman socket"
-systemctl enable --now podman.socket
-msg_ok "Enabled Podman socket"
-
-msg_info "Installing Forgejo Runner"
-RUNNER_VERSION=$(curl -fsSL https://data.forgejo.org/api/v1/repos/forgejo/runner/releases/latest | jq -r .name | sed 's/^v//')
-curl -fsSL "https://code.forgejo.org/forgejo/runner/releases/download/v${RUNNER_VERSION}/forgejo-runner-${RUNNER_VERSION}-linux-amd64" -o /usr/local/bin/forgejo-runner
-chmod +x /usr/local/bin/forgejo-runner
-echo "${RUNNER_VERSION}" >~/.forgejo-runner
-msg_ok "Installed Forgejo Runner"
-
-msg_info "Registering Forgejo Runner"
-export DOCKER_HOST="unix:///run/podman/podman.sock"
-
-msg_info "Generating Forgejo Runner Configuration"
-mkdir -p /etc/forgejo-runner
-CONFIG_FILE="/etc/forgejo-runner/config.yaml"
-forgejo-runner generate-config > $CONFIG_FILE
-yq -i '
-  .container.docker_host = strenv(DOCKER_HOST) |
-  .server.connections.forgejo.url = strenv(FORGEJO_INSTANCE) |
-  .server.connections.forgejo.uuid = strenv(FORGEJO_RUNNER_UUID) |
-  .server.connections.forgejo.token = strenv(FORGEJO_RUNNER_TOKEN) |
-  .server.connections.forgejo.labels = (strenv(RUNNER_LABELS) | split(",") | map(select(length > 0)))
-  ' $CONFIG_FILE
-msg_ok "Generated Forgejo Runner Configuration"
-
-
-msg_info "Creating Services"
-cat <<EOF >/etc/systemd/system/forgejo-runner.service
-[Unit]
-Description=Forgejo Runner
-Documentation=https://forgejo.org/docs/latest/admin/actions/
-After=podman.socket
-Requires=podman.socket
-
-[Service]
-User=root
-WorkingDirectory=/root
-Environment=DOCKER_HOST=unix:///run/podman/podman.sock
-ExecStart=/usr/local/bin/forgejo-runner daemon -c $CONFIG_FILE
-Restart=on-failure
-RestartSec=10
-TimeoutSec=0
-
-[Install]
-WantedBy=multi-user.target
-EOF
-systemctl enable -q --now forgejo-runner
-msg_ok "Created Services"
-
-motd_ssh
-customize
-cleanup_lxc

misc/build.func

@@ -5707,9 +5707,7 @@ create_lxc_container() {
     esac
   }
 
-  # Downloads an ARM64 LXC rootfs template to $1.
-  # Debian: fetches latest release from community-scripts/debian-arm64-lxc on GitHub.
-  # Others: fetches from jenkins.linuxcontainers.org.
+  # Downloads an ARM64 LXC rootfs template from jenkins.linuxcontainers.org.
   download_arm64_template() {
     local dest="$1" url
 
@@ -5718,21 +5716,7 @@ create_lxc_container() {
       exit 207
     }
 
-    if [[ "$PCT_OSTYPE" == "debian" ]]; then
-      url=$(
-        curl -fsSL "https://api.github.com/repos/community-scripts/debian-arm64-lxc/releases/latest" |
-          jq -r --arg v "$CUSTOM_TEMPLATE_VARIANT" \
-            '.assets[].browser_download_url | select(test("debian-" + $v + "-arm64-rootfs\\.tar\\.xz$"))' |
-          head -n1
-      )
-
-      [[ -n "$url" ]] || {
-        msg_error "Could not find Debian ${CUSTOM_TEMPLATE_VARIANT} ARM64 template URL."
-        exit 207
-      }
-    else
-      url="https://jenkins.linuxcontainers.org/job/image-${PCT_OSTYPE}/architecture=arm64,release=${CUSTOM_TEMPLATE_VARIANT},variant=default/lastStableBuild/artifact/rootfs.tar.xz"
-    fi
+    url="https://jenkins.linuxcontainers.org/job/image-${PCT_OSTYPE}/architecture=arm64,release=${CUSTOM_TEMPLATE_VARIANT},variant=default/lastStableBuild/artifact/rootfs.tar.xz"
 
     msg_info "Downloading ${PCT_OSTYPE^} ${CUSTOM_TEMPLATE_VARIANT} ARM64 template"
     if ! curl -fsSL -o "$dest" "$url"; then