From 95ddaf0f225c608800901c7a24fd1feac33ddf4d Mon Sep 17 00:00:00 2001 From: Sam Heinz Date: Sat, 20 Jun 2026 08:34:00 +1000 Subject: [PATCH] [arm64] Port scripts between garage-hortusfox to support arm64 (#15207) * add helper function for get_arch_value * [arm64] Port scripts between garage-hortusfox to support arm64 Adds check for docker tag & arm64 in build.func and if present adds apparmor unconfined to get docker to work on non pve kernel * revert added tags, remove apparmor unconfined, move to setup_docker --- ct/garage.sh | 2 +- ct/geopulse.sh | 2 +- ct/gitea.sh | 2 +- ct/github-runner.sh | 2 +- ct/glance.sh | 2 +- ct/gluetun.sh | 2 +- ct/go2rtc.sh | 2 +- ct/gogs.sh | 2 +- ct/gokapi.sh | 2 +- ct/gotify.sh | 2 +- ct/gramps-web.sh | 2 +- ct/healthchecks.sh | 2 +- ct/hermesagent.sh | 2 +- ct/hev-socks5-server.sh | 2 +- ct/homarr.sh | 2 +- ct/homeassistant.sh | 4 ++-- ct/homebox.sh | 2 +- ct/homelable.sh | 2 +- ct/hoodik.sh | 2 +- install/docker-install.sh | 22 ++-------------------- install/garage-install.sh | 2 +- install/gitea-install.sh | 2 +- install/github-runner-install.sh | 2 +- install/glance-install.sh | 2 +- install/go2rtc-install.sh | 4 ++-- install/gogs-install.sh | 2 +- install/gokapi-install.sh | 2 +- install/gotify-install.sh | 6 +++--- install/hev-socks5-server-install.sh | 2 +- install/homarr-install.sh | 2 +- install/homeassistant-install.sh | 25 +------------------------ install/homebox-install.sh | 2 +- install/hoodik-install.sh | 2 +- install/kasm-install.sh | 4 +--- install/pelican-wings-install.sh | 8 +------- install/pterodactyl-wings-install.sh | 8 +------- 36 files changed, 41 insertions(+), 96 deletions(-) diff --git a/ct/garage.sh b/ct/garage.sh index fefc96926..b65bccc9a 100644 --- a/ct/garage.sh +++ b/ct/garage.sh @@ -12,7 +12,7 @@ var_ram="${var_ram:-1024}" var_disk="${var_disk:-5}" var_os="${var_os:-debian}" var_version="${var_version:-13}" -var_arm64="${var_arm64:-no}" +var_arm64="${var_arm64:-yes}" var_unprivileged="${var_unprivileged:-1}" header_info "$APP" diff --git a/ct/geopulse.sh b/ct/geopulse.sh index 12189eb7f..8c2079a60 100644 --- a/ct/geopulse.sh +++ b/ct/geopulse.sh @@ -12,7 +12,7 @@ var_ram="${var_ram:-1024}" var_disk="${var_disk:-8}" var_os="${var_os:-debian}" var_version="${var_version:-13}" -var_arm64="${var_arm64:-no}" +var_arm64="${var_arm64:-yes}" var_unprivileged="${var_unprivileged:-1}" header_info "$APP" diff --git a/ct/gitea.sh b/ct/gitea.sh index 9c0e75a07..5bc3d35e2 100644 --- a/ct/gitea.sh +++ b/ct/gitea.sh @@ -12,7 +12,7 @@ var_ram="${var_ram:-1024}" var_disk="${var_disk:-8}" var_os="${var_os:-debian}" var_version="${var_version:-13}" -var_arm64="${var_arm64:-no}" +var_arm64="${var_arm64:-yes}" var_unprivileged="${var_unprivileged:-1}" header_info "$APP" diff --git a/ct/github-runner.sh b/ct/github-runner.sh index 245270c20..f2734fb4e 100644 --- a/ct/github-runner.sh +++ b/ct/github-runner.sh @@ -13,7 +13,7 @@ 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_arm64="${var_arm64:-yes}" var_unprivileged="${var_unprivileged:-1}" var_nesting="${var_nesting:-1}" var_keyctl="${var_keyctl:-1}" diff --git a/ct/glance.sh b/ct/glance.sh index d377c6fb5..e33a264b0 100644 --- a/ct/glance.sh +++ b/ct/glance.sh @@ -12,7 +12,7 @@ var_ram="${var_ram:-512}" var_disk="${var_disk:-2}" var_os="${var_os:-debian}" var_version="${var_version:-13}" -var_arm64="${var_arm64:-no}" +var_arm64="${var_arm64:-yes}" var_unprivileged="${var_unprivileged:-1}" header_info "$APP" diff --git a/ct/gluetun.sh b/ct/gluetun.sh index f86032460..c6cd1331a 100644 --- a/ct/gluetun.sh +++ b/ct/gluetun.sh @@ -12,7 +12,7 @@ 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_arm64="${var_arm64:-yes}" var_unprivileged="${var_unprivileged:-1}" var_tun="${var_tun:-yes}" diff --git a/ct/go2rtc.sh b/ct/go2rtc.sh index 36c27bc17..55635befd 100644 --- a/ct/go2rtc.sh +++ b/ct/go2rtc.sh @@ -12,7 +12,7 @@ var_ram="${var_ram:-2048}" var_disk="${var_disk:-4}" var_os="${var_os:-debian}" var_version="${var_version:-13}" -var_arm64="${var_arm64:-no}" +var_arm64="${var_arm64:-yes}" var_unprivileged="${var_unprivileged:-1}" var_gpu="${var_gpu:-yes}" diff --git a/ct/gogs.sh b/ct/gogs.sh index 6342738b2..f714e6d1d 100644 --- a/ct/gogs.sh +++ b/ct/gogs.sh @@ -12,7 +12,7 @@ var_ram="${var_ram:-1024}" var_disk="${var_disk:-8}" var_os="${var_os:-debian}" var_version="${var_version:-13}" -var_arm64="${var_arm64:-no}" +var_arm64="${var_arm64:-yes}" var_unprivileged="${var_unprivileged:-1}" header_info "$APP" diff --git a/ct/gokapi.sh b/ct/gokapi.sh index 7164015c6..ee06611fe 100644 --- a/ct/gokapi.sh +++ b/ct/gokapi.sh @@ -12,7 +12,7 @@ var_ram="${var_ram:-512}" var_disk="${var_disk:-4}" var_os="${var_os:-debian}" var_version="${var_version:-13}" -var_arm64="${var_arm64:-no}" +var_arm64="${var_arm64:-yes}" var_unprivileged="${var_unprivileged:-1}" header_info "$APP" diff --git a/ct/gotify.sh b/ct/gotify.sh index 7b5ffbb38..c1c963bf9 100644 --- a/ct/gotify.sh +++ b/ct/gotify.sh @@ -12,7 +12,7 @@ var_ram="${var_ram:-512}" var_disk="${var_disk:-2}" var_os="${var_os:-debian}" var_version="${var_version:-13}" -var_arm64="${var_arm64:-no}" +var_arm64="${var_arm64:-yes}" var_unprivileged="${var_unprivileged:-1}" header_info "$APP" diff --git a/ct/gramps-web.sh b/ct/gramps-web.sh index 19f5190e4..287145ec7 100644 --- a/ct/gramps-web.sh +++ b/ct/gramps-web.sh @@ -12,7 +12,7 @@ var_ram="${var_ram:-4096}" var_disk="${var_disk:-20}" var_os="${var_os:-debian}" var_version="${var_version:-13}" -var_arm64="${var_arm64:-no}" +var_arm64="${var_arm64:-yes}" var_unprivileged="${var_unprivileged:-1}" header_info "$APP" diff --git a/ct/healthchecks.sh b/ct/healthchecks.sh index b3704ca60..2bfb8b014 100644 --- a/ct/healthchecks.sh +++ b/ct/healthchecks.sh @@ -12,7 +12,7 @@ var_ram="${var_ram:-2048}" var_disk="${var_disk:-5}" var_os="${var_os:-debian}" var_version="${var_version:-13}" -var_arm64="${var_arm64:-no}" +var_arm64="${var_arm64:-yes}" var_unprivileged="${var_unprivileged:-1}" header_info "$APP" diff --git a/ct/hermesagent.sh b/ct/hermesagent.sh index 78a2d2476..daf62e436 100644 --- a/ct/hermesagent.sh +++ b/ct/hermesagent.sh @@ -12,7 +12,7 @@ var_ram="${var_ram:-4096}" var_disk="${var_disk:-20}" var_os="${var_os:-debian}" var_version="${var_version:-13}" -var_arm64="${var_arm64:-no}" +var_arm64="${var_arm64:-yes}" var_unprivileged="${var_unprivileged:-1}" header_info "$APP" diff --git a/ct/hev-socks5-server.sh b/ct/hev-socks5-server.sh index 9141aa4a1..734b118ab 100644 --- a/ct/hev-socks5-server.sh +++ b/ct/hev-socks5-server.sh @@ -12,7 +12,7 @@ var_ram="${var_ram:-512}" var_disk="${var_disk:-2}" var_os="${var_os:-debian}" var_version="${var_version:-13}" -var_arm64="${var_arm64:-no}" +var_arm64="${var_arm64:-yes}" var_unprivileged="${var_unprivileged:-1}" header_info "$APP" diff --git a/ct/homarr.sh b/ct/homarr.sh index 87d7ff2bb..df0eb342f 100644 --- a/ct/homarr.sh +++ b/ct/homarr.sh @@ -12,7 +12,7 @@ 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_arm64="${var_arm64:-yes}" var_unprivileged="${var_unprivileged:-1}" header_info "$APP" diff --git a/ct/homeassistant.sh b/ct/homeassistant.sh index 67b42aa28..fd725f821 100644 --- a/ct/homeassistant.sh +++ b/ct/homeassistant.sh @@ -6,13 +6,13 @@ source <(curl -fsSL https://raw.githubusercontent.com/community-scripts/ProxmoxV # Source: https://www.home-assistant.io/ APP="Home Assistant" -var_tags="${var_tags:-automation;smarthome}" +var_tags="${var_tags:-automation;smarthome;docker}" var_cpu="${var_cpu:-2}" var_ram="${var_ram:-2048}" var_disk="${var_disk:-16}" var_os="${var_os:-debian}" var_version="${var_version:-13}" -var_arm64="${var_arm64:-no}" +var_arm64="${var_arm64:-yes}" var_unprivileged="${var_unprivileged:-1}" header_info "$APP" diff --git a/ct/homebox.sh b/ct/homebox.sh index bc36c2547..3ebb6ea64 100644 --- a/ct/homebox.sh +++ b/ct/homebox.sh @@ -12,7 +12,7 @@ var_ram="${var_ram:-1024}" var_disk="${var_disk:-4}" var_os="${var_os:-debian}" var_version="${var_version:-13}" -var_arm64="${var_arm64:-no}" +var_arm64="${var_arm64:-yes}" var_unprivileged="${var_unprivileged:-1}" header_info "$APP" diff --git a/ct/homelable.sh b/ct/homelable.sh index 8348cd529..61104b54c 100644 --- a/ct/homelable.sh +++ b/ct/homelable.sh @@ -12,7 +12,7 @@ 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_arm64="${var_arm64:-yes}" var_unprivileged="${var_unprivileged:-1}" header_info "$APP" diff --git a/ct/hoodik.sh b/ct/hoodik.sh index 7acd7a3d6..65f50fbbc 100644 --- a/ct/hoodik.sh +++ b/ct/hoodik.sh @@ -13,7 +13,7 @@ var_ram="${var_ram:-1024}" var_disk="${var_disk:-5}" var_os="${var_os:-debian}" var_version="${var_version:-13}" -var_arm64="${var_arm64:-no}" +var_arm64="${var_arm64:-yes}" var_unprivileged="${var_unprivileged:-1}" header_info "$APP" diff --git a/install/docker-install.sh b/install/docker-install.sh index 217ee6bdb..d80909e6c 100644 --- a/install/docker-install.sh +++ b/install/docker-install.sh @@ -13,31 +13,13 @@ setting_up_container network_check update_os -DOCKER_LATEST_VERSION=$(get_latest_github_release "moby/moby") -PORTAINER_LATEST_VERSION=$(get_latest_github_release "portainer/portainer") PORTAINER_AGENT_LATEST_VERSION=$(get_latest_github_release "portainer/agent") -msg_info "Installing Docker $DOCKER_LATEST_VERSION (with Compose, Buildx)" -DOCKER_CONFIG_PATH='/etc/docker/daemon.json' -mkdir -p $(dirname $DOCKER_CONFIG_PATH) -echo -e '{\n "log-driver": "journald"\n}' >/etc/docker/daemon.json -$STD sh <(curl -fsSL https://get.docker.com) -msg_ok "Installed Docker $DOCKER_LATEST_VERSION" - read -r -p "${TAB3}Would you like to add Portainer (UI)? " prompt if [[ ${prompt,,} =~ ^(y|yes)$ ]]; then - msg_info "Installing Portainer $PORTAINER_LATEST_VERSION" - docker volume create portainer_data >/dev/null - $STD docker run -d \ - -p 8000:8000 \ - -p 9443:9443 \ - --name=portainer \ - --restart=always \ - -v /var/run/docker.sock:/var/run/docker.sock \ - -v portainer_data:/data \ - portainer/portainer-ce:latest - msg_ok "Installed Portainer $PORTAINER_LATEST_VERSION" + DOCKER_PORTAINER="true" setup_docker else + setup_docker read -r -p "${TAB3}Would you like to install the Portainer Agent (for remote management)? " prompt_agent if [[ ${prompt_agent,,} =~ ^(y|yes)$ ]]; then msg_info "Installing Portainer Agent $PORTAINER_AGENT_LATEST_VERSION" diff --git a/install/garage-install.sh b/install/garage-install.sh index 5ba1d24ea..92b66f7fe 100644 --- a/install/garage-install.sh +++ b/install/garage-install.sh @@ -15,7 +15,7 @@ update_os msg_info "Setup Garage" GITEA_RELEASE=$(curl -s https://api.github.com/repos/deuxfleurs-org/garage/tags | jq -r '.[0].name') -curl -fsSL "https://garagehq.deuxfleurs.fr/_releases/${GITEA_RELEASE}/x86_64-unknown-linux-musl/garage" -o /usr/local/bin/garage +curl -fsSL "https://garagehq.deuxfleurs.fr/_releases/${GITEA_RELEASE}/$(arch_resolve "x86_64" "aarch64")-unknown-linux-musl/garage" -o /usr/local/bin/garage chmod +x /usr/local/bin/garage mkdir -p /var/lib/garage/{data,meta,snapshots} mkdir -p /etc/garage diff --git a/install/gitea-install.sh b/install/gitea-install.sh index fc68c7da6..83da30c41 100644 --- a/install/gitea-install.sh +++ b/install/gitea-install.sh @@ -20,7 +20,7 @@ $STD apt install -y \ sqlite3 msg_ok "Installed Dependencies" -fetch_and_deploy_gh_release "gitea" "go-gitea/gitea" "singlefile" "latest" "/usr/local/bin" "gitea-*-linux-amd64" +fetch_and_deploy_gh_release "gitea" "go-gitea/gitea" "singlefile" "latest" "/usr/local/bin" "gitea-*-linux-$(arch_resolve)" msg_info "Configuring Gitea" chmod +x /usr/local/bin/gitea diff --git a/install/github-runner-install.sh b/install/github-runner-install.sh index 80a9d24cf..f6ac73236 100644 --- a/install/github-runner-install.sh +++ b/install/github-runner-install.sh @@ -25,7 +25,7 @@ msg_info "Creating runner user (no sudo)" useradd -m -s /bin/bash runner msg_ok "Runner user ready" -fetch_and_deploy_gh_release "actions-runner" "actions/runner" "prebuild" "latest" "/opt/actions-runner" "actions-runner-linux-x64-*.tar.gz" +fetch_and_deploy_gh_release "actions-runner" "actions/runner" "prebuild" "latest" "/opt/actions-runner" "actions-runner-linux-$(arch_resolve "x64" "arm64")-*.tar.gz" msg_info "Setting ownership for runner user" chown -R runner:runner /opt/actions-runner diff --git a/install/glance-install.sh b/install/glance-install.sh index 2c1f97a34..2d6c8b233 100644 --- a/install/glance-install.sh +++ b/install/glance-install.sh @@ -13,7 +13,7 @@ setting_up_container network_check update_os -fetch_and_deploy_gh_release "glance" "glanceapp/glance" "prebuild" "latest" "/opt/glance" "glance-linux-amd64.tar.gz" +fetch_and_deploy_gh_release "glance" "glanceapp/glance" "prebuild" "latest" "/opt/glance" "glance-linux-$(arch_resolve).tar.gz" msg_info "Configuring Glance" mkdir -p /opt/glance_data diff --git a/install/go2rtc-install.sh b/install/go2rtc-install.sh index 82927161c..15db9c73b 100644 --- a/install/go2rtc-install.sh +++ b/install/go2rtc-install.sh @@ -18,7 +18,7 @@ msg_info "Installing Dependencies" $STD apt install -y ffmpeg msg_ok "Installed Dependencies" -USE_ORIGINAL_FILENAME="true" fetch_and_deploy_gh_release "go2rtc" "AlexxIT/go2rtc" "singlefile" "latest" "/opt/go2rtc" "go2rtc_linux_amd64" +USE_ORIGINAL_FILENAME="true" fetch_and_deploy_gh_release "go2rtc" "AlexxIT/go2rtc" "singlefile" "latest" "/opt/go2rtc" "go2rtc_linux_$(arch_resolve)" msg_info "Creating Service" cat </etc/systemd/system/go2rtc.service @@ -30,7 +30,7 @@ After=network.target Type=simple User=root WorkingDirectory=/opt/go2rtc -ExecStart=/opt/go2rtc/go2rtc_linux_amd64 +ExecStart=/opt/go2rtc/go2rtc_linux_$(arch_resolve) [Install] WantedBy=multi-user.target diff --git a/install/gogs-install.sh b/install/gogs-install.sh index e58e1d36c..63b168e23 100644 --- a/install/gogs-install.sh +++ b/install/gogs-install.sh @@ -17,7 +17,7 @@ msg_info "Installing Dependencies" $STD apt install -y git msg_ok "Installed Dependencies" -fetch_and_deploy_gh_release "gogs" "gogs/gogs" "prebuild" "latest" "/opt/gogs" "gogs_*_linux_amd64.tar.gz" +fetch_and_deploy_gh_release "gogs" "gogs/gogs" "prebuild" "latest" "/opt/gogs" "gogs_*_linux_$(arch_resolve).tar.gz" msg_info "Setting up Gogs" mkdir -p /opt/gogs/{custom/conf,data,log} diff --git a/install/gokapi-install.sh b/install/gokapi-install.sh index d45fa580b..3df5ddee1 100644 --- a/install/gokapi-install.sh +++ b/install/gokapi-install.sh @@ -13,7 +13,7 @@ setting_up_container network_check update_os -fetch_and_deploy_gh_release "gokapi" "Forceu/Gokapi" "prebuild" "latest" "/opt/gokapi" "*linux*amd64.zip" +fetch_and_deploy_gh_release "gokapi" "Forceu/Gokapi" "prebuild" "latest" "/opt/gokapi" "*linux*$(arch_resolve).zip" msg_info "Configuring Gokapi" mkdir -p /opt/gokapi/{data,config} diff --git a/install/gotify-install.sh b/install/gotify-install.sh index cab11a785..44444c74f 100644 --- a/install/gotify-install.sh +++ b/install/gotify-install.sh @@ -13,8 +13,8 @@ setting_up_container network_check update_os -fetch_and_deploy_gh_release "gotify" "gotify/server" "prebuild" "latest" "/opt/gotify" "gotify-linux-amd64.zip" -chmod +x /opt/gotify/gotify-linux-amd64 +fetch_and_deploy_gh_release "gotify" "gotify/server" "prebuild" "latest" "/opt/gotify" "gotify-linux-$(arch_resolve).zip" +chmod +x /opt/gotify/gotify-linux-$(arch_resolve) msg_info "Creating Service" cat </etc/systemd/system/gotify.service @@ -27,7 +27,7 @@ After=network.target Type=simple User=root WorkingDirectory=/opt/gotify -ExecStart=/opt/gotify/./gotify-linux-amd64 +ExecStart=/opt/gotify/./gotify-linux-$(arch_resolve) Restart=always RestartSec=3 diff --git a/install/hev-socks5-server-install.sh b/install/hev-socks5-server-install.sh index ee58634b5..02871583c 100644 --- a/install/hev-socks5-server-install.sh +++ b/install/hev-socks5-server-install.sh @@ -13,7 +13,7 @@ setting_up_container network_check update_os -fetch_and_deploy_gh_release "hev-socks5-server" "heiher/hev-socks5-server" "singlefile" "latest" "/opt" "hev-socks5-server-linux-x86_64" +fetch_and_deploy_gh_release "hev-socks5-server" "heiher/hev-socks5-server" "singlefile" "latest" "/opt" "hev-socks5-server-linux-$(arch_resolve "x86_64" "arm64")" msg_info "Setup hev-socks5-server" mkdir -p /etc/hev-socks5-server diff --git a/install/homarr-install.sh b/install/homarr-install.sh index f8e39c3a6..f46d09c5b 100644 --- a/install/homarr-install.sh +++ b/install/homarr-install.sh @@ -23,7 +23,7 @@ msg_ok "Installed Dependencies" NODE_VERSION=$(curl -s https://raw.githubusercontent.com/homarr-labs/homarr/dev/package.json | jq -r '.engines.node | split(">=")[1] | split(".")[0]') setup_nodejs -fetch_and_deploy_gh_release "homarr" "homarr-labs/homarr" "prebuild" "latest" "/opt/homarr" "build-debian-amd64.tar.gz" +fetch_and_deploy_gh_release "homarr" "homarr-labs/homarr" "prebuild" "latest" "/opt/homarr" "build-debian-$(arch_resolve).tar.gz" msg_info "Installing Homarr" mkdir -p /opt/homarr_db diff --git a/install/homeassistant-install.sh b/install/homeassistant-install.sh index 5af67d7c6..3534f2222 100644 --- a/install/homeassistant-install.sh +++ b/install/homeassistant-install.sh @@ -30,32 +30,9 @@ get_latest_release() { curl -fsSL https://api.github.com/repos/$1/releases/latest | grep '"tag_name":' | cut -d'"' -f4 } -DOCKER_LATEST_VERSION=$(get_latest_release "moby/moby") CORE_LATEST_VERSION=$(get_latest_release "home-assistant/core") -PORTAINER_LATEST_VERSION=$(get_latest_release "portainer/portainer") -msg_info "Installing Docker $DOCKER_LATEST_VERSION" -DOCKER_CONFIG_PATH='/etc/docker/daemon.json' -mkdir -p $(dirname $DOCKER_CONFIG_PATH) -echo -e '{\n "log-driver": "journald"\n}' >/etc/docker/daemon.json -$STD sh <(curl -fsSL https://get.docker.com) -msg_ok "Installed Docker $DOCKER_LATEST_VERSION" - -msg_info "Pulling Portainer $PORTAINER_LATEST_VERSION Image" -$STD docker pull portainer/portainer-ce:latest -msg_ok "Pulled Portainer $PORTAINER_LATEST_VERSION Image" - -msg_info "Installing Portainer $PORTAINER_LATEST_VERSION" -$STD docker volume create portainer_data -$STD docker run -d \ - -p 8000:8000 \ - -p 9443:9443 \ - --name=portainer \ - --restart=always \ - -v /var/run/docker.sock:/var/run/docker.sock \ - -v portainer_data:/data \ - portainer/portainer-ce:latest -msg_ok "Installed Portainer $PORTAINER_LATEST_VERSION" +DOCKER_PORTAINER="true" setup_docker msg_info "Pulling Home Assistant $CORE_LATEST_VERSION Image" $STD docker pull ghcr.io/home-assistant/home-assistant:stable diff --git a/install/homebox-install.sh b/install/homebox-install.sh index 065a16874..fce110b08 100644 --- a/install/homebox-install.sh +++ b/install/homebox-install.sh @@ -14,7 +14,7 @@ setting_up_container network_check update_os -fetch_and_deploy_gh_release "homebox" "sysadminsmedia/homebox" "prebuild" "latest" "/opt/homebox" "homebox_Linux_x86_64.tar.gz" +fetch_and_deploy_gh_release "homebox" "sysadminsmedia/homebox" "prebuild" "latest" "/opt/homebox" "homebox_Linux_$(arch_resolve "x86_64" "arm64").tar.gz" msg_info "Configuring Homebox" chmod +x /opt/homebox/homebox diff --git a/install/hoodik-install.sh b/install/hoodik-install.sh index d524c503e..5cbb863e0 100644 --- a/install/hoodik-install.sh +++ b/install/hoodik-install.sh @@ -13,7 +13,7 @@ setting_up_container network_check update_os -fetch_and_deploy_gh_release "hoodik" "hudikhq/hoodik" "prebuild" "latest" "/opt/hoodik" "*x86_64.tar.gz" +fetch_and_deploy_gh_release "hoodik" "hudikhq/hoodik" "prebuild" "latest" "/opt/hoodik" "*$(arch_resolve "x86_64" "arm64").tar.gz" msg_info "Configuring Hoodik" mkdir -p /opt/hoodik_data diff --git a/install/kasm-install.sh b/install/kasm-install.sh index f5dbd024f..ee0a9f0e1 100644 --- a/install/kasm-install.sh +++ b/install/kasm-install.sh @@ -13,9 +13,7 @@ setting_up_container network_check update_os -msg_info "Installing Docker" -$STD sh <(curl -fsSL https://get.docker.com/) -msg_ok "Installed Docker" +setup_docker msg_info "Detecting latest Kasm Workspaces release" KASM_URL=$(curl -s https://kasm.com/downloads \ diff --git a/install/pelican-wings-install.sh b/install/pelican-wings-install.sh index 7a7674f4d..167561ea4 100644 --- a/install/pelican-wings-install.sh +++ b/install/pelican-wings-install.sh @@ -13,13 +13,7 @@ setting_up_container network_check update_os -msg_info "Installing Docker" -DOCKER_CONFIG_PATH='/etc/docker/daemon.json' -mkdir -p "$(dirname $DOCKER_CONFIG_PATH)" -echo -e '{\n "log-driver": "journald"\n}' >"$DOCKER_CONFIG_PATH" -$STD sh <(curl -fsSL https://get.docker.com) -systemctl enable -q --now docker -msg_ok "Installed Docker" +setup_docker fetch_and_deploy_gh_release "wings" "pelican-dev/wings" "singlefile" "latest" "/usr/local/bin" "wings_linux_amd64" mkdir -p /etc/pelican /var/run/wings diff --git a/install/pterodactyl-wings-install.sh b/install/pterodactyl-wings-install.sh index 8655726cd..bbee94045 100644 --- a/install/pterodactyl-wings-install.sh +++ b/install/pterodactyl-wings-install.sh @@ -13,13 +13,7 @@ setting_up_container network_check update_os -msg_info "Installing Docker" -DOCKER_CONFIG_PATH='/etc/docker/daemon.json' -mkdir -p $(dirname $DOCKER_CONFIG_PATH) -echo -e '{\n "log-driver": "journald"\n}' >/etc/docker/daemon.json -$STD sh <(curl -fsSL https://get.docker.com) -systemctl enable -q --now docker -msg_ok "Installed Docker" +setup_docker fetch_and_deploy_gh_release "wings" "pterodactyl/wings" "singlefile" "latest" "/usr/local/bin" "wings_linux_amd64" mkdir -p /etc/pterodactyl