From 85798e25ea59372cdfdf36be06f87fc814aa7941 Mon Sep 17 00:00:00 2001 From: Sam Heinz <54530346+asylumexp@users.noreply.github.com> Date: Fri, 19 Jun 2026 22:58:57 +1000 Subject: [PATCH] revert added tags, remove apparmor unconfined, move to setup_docker --- ct/discopanel.sh | 2 +- ct/kasm.sh | 2 +- ct/npmplus.sh | 2 +- ct/pelican-wings.sh | 2 +- ct/pterodactyl-wings.sh | 2 +- ct/runtipi.sh | 2 +- install/docker-install.sh | 22 ++-------------------- install/homeassistant-install.sh | 25 +------------------------ install/kasm-install.sh | 4 +--- install/pelican-wings-install.sh | 8 +------- install/pterodactyl-wings-install.sh | 8 +------- misc/build.func | 5 ----- 12 files changed, 12 insertions(+), 72 deletions(-) diff --git a/ct/discopanel.sh b/ct/discopanel.sh index 0f54ed188..25a497d11 100644 --- a/ct/discopanel.sh +++ b/ct/discopanel.sh @@ -6,7 +6,7 @@ source <(curl -fsSL https://raw.githubusercontent.com/community-scripts/ProxmoxV # Source: https://discopanel.app/ | Github: https://github.com/nickheyer/discopanel APP="DiscoPanel" -var_tags="${var_tags:-gaming;docker}" +var_tags="${var_tags:-gaming}" var_cpu="${var_cpu:-4}" var_ram="${var_ram:-4096}" var_disk="${var_disk:-15}" diff --git a/ct/kasm.sh b/ct/kasm.sh index cb1c50ba9..930e0748f 100644 --- a/ct/kasm.sh +++ b/ct/kasm.sh @@ -6,7 +6,7 @@ source <(curl -fsSL https://raw.githubusercontent.com/community-scripts/ProxmoxV # Source: https://www.kasmweb.com/docs/latest/index.html APP="Kasm" -var_tags="${var_tags:-os;docker}" +var_tags="${var_tags:-os}" var_cpu="${var_cpu:-2}" var_ram="${var_ram:-8192}" var_disk="${var_disk:-30}" diff --git a/ct/npmplus.sh b/ct/npmplus.sh index da7629636..abc5168ac 100644 --- a/ct/npmplus.sh +++ b/ct/npmplus.sh @@ -6,7 +6,7 @@ source <(curl -fsSL https://raw.githubusercontent.com/community-scripts/ProxmoxV # Source: https://github.com/ZoeyVid/NPMplus APP="NPMplus" -var_tags="${var_tags:-proxy;nginx;docker}" +var_tags="${var_tags:-proxy;nginx}" var_cpu="${var_cpu:-1}" var_ram="${var_ram:-512}" var_disk="${var_disk:-3}" diff --git a/ct/pelican-wings.sh b/ct/pelican-wings.sh index 9ae7636e2..f97d21cae 100644 --- a/ct/pelican-wings.sh +++ b/ct/pelican-wings.sh @@ -6,7 +6,7 @@ source <(curl -fsSL https://raw.githubusercontent.com/community-scripts/ProxmoxV # Source: https://github.com/pelican-dev/wings APP="Pelican-Wings" -var_tags="${var_tags:-Gaming;docker}" +var_tags="${var_tags:-Gaming}" var_cpu="${var_cpu:-2}" var_ram="${var_ram:-4096}" var_disk="${var_disk:-8}" diff --git a/ct/pterodactyl-wings.sh b/ct/pterodactyl-wings.sh index 46cb8adcf..c9ee0dadc 100644 --- a/ct/pterodactyl-wings.sh +++ b/ct/pterodactyl-wings.sh @@ -6,7 +6,7 @@ source <(curl -fsSL https://raw.githubusercontent.com/community-scripts/ProxmoxV # Source: https://github.com/pterodactyl/wings APP="Pterodactyl-Wings" -var_tags="${var_tags:-gaming;docker}" +var_tags="${var_tags:-gaming}" var_cpu="${var_cpu:-2}" var_ram="${var_ram:-4096}" var_disk="${var_disk:-8}" diff --git a/ct/runtipi.sh b/ct/runtipi.sh index 3ee40a0df..16f6c3fb3 100644 --- a/ct/runtipi.sh +++ b/ct/runtipi.sh @@ -6,7 +6,7 @@ source <(curl -fsSL https://raw.githubusercontent.com/community-scripts/ProxmoxV # Source: https://runtipi.io/ APP="Runtipi" -var_tags="${var_tags:-os;docker}" +var_tags="${var_tags:-os}" var_cpu="${var_cpu:-2}" var_ram="${var_ram:-2048}" var_disk="${var_disk:-8}" 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/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/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 diff --git a/misc/build.func b/misc/build.func index 7f05999cc..b90c89901 100644 --- a/misc/build.func +++ b/misc/build.func @@ -4246,11 +4246,6 @@ EOF configure_gpu_passthrough configure_additional_devices - # Docker-in-LXC on arm64 needs apparmor=unconfined to work. - if [[ ";${var_tags:-};" == *";docker;"* ]] && [[ "$(arch_resolve)" == "arm64" ]]; then - echo "lxc.apparmor.profile: unconfined" >>"$LXC_CONFIG" - fi - # Increase disk size for AMD ROCm runtime (~4GB extra needed) if [[ "${GPU_TYPE:-}" == "AMD" ]]; then local rocm_extra=4