From 78977d2d11f42d631293356f2c8d1cd95ef42242 Mon Sep 17 00:00:00 2001 From: MickLesk Date: Thu, 6 Aug 2026 17:16:35 +0200 Subject: [PATCH] Drop the docker change again It came back through the merge in 35735dae: the branch was pushed before the revert, so merging the remote copy restored it. Removing it forward rather than rewriting history that is already published. --- install/docker-install.sh | 29 +++++++---------------------- 1 file changed, 7 insertions(+), 22 deletions(-) diff --git a/install/docker-install.sh b/install/docker-install.sh index dff9eff83a..904a659384 100644 --- a/install/docker-install.sh +++ b/install/docker-install.sh @@ -17,24 +17,11 @@ PORTAINER_AGENT_LATEST_VERSION=$(get_latest_github_release "portainer/agent") setup_docker -# Every choice below can be supplied up front so the install runs unattended. -# Same convention as install/forgejo-runner-install.sh: read the variable, and -# only ask when it was not set. -if [[ -z "${var_portainer:-}" ]]; then - if prompt_confirm "${TAB3}Would you like to install Portainer (UI) via the community-scripts addon?" "n" 60; then - var_portainer="yes" - else - var_portainer="no" - fi -fi - -if [[ "${var_portainer:-}" =~ ^([yY]|[yY][eE][sS])$ ]]; then +if prompt_confirm "${TAB3}Would you like to install Portainer (UI) via the community-scripts addon?" "n" 60; then bash -c "$(curl -fsSL https://raw.githubusercontent.com/community-scripts/ProxmoxVE/main/tools/addon/portainer.sh)" <<<"y" else - if [[ -z "${var_portainer_agent:-}" ]]; then - read -r -p "${TAB3}Would you like to install the Portainer Agent (for remote management)? " var_portainer_agent - fi - if [[ "${var_portainer_agent:-}" =~ ^([yY]|[yY][eE][sS])$ ]]; then + 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" $STD docker run -d \ -p 9001:9001 \ @@ -47,14 +34,12 @@ else fi fi -if [[ -z "${var_docker_socket:-}" ]]; then - read -r -p "${TAB3}Expose Docker TCP socket (insecure) ? [n = No, l = Local only (127.0.0.1), a = All interfaces (0.0.0.0)] : " var_docker_socket -fi -case "${var_docker_socket:-}" in -l | L | local | Local) +read -r -p "${TAB3}Expose Docker TCP socket (insecure) ? [n = No, l = Local only (127.0.0.1), a = All interfaces (0.0.0.0)] : " socket_choice +case "${socket_choice,,}" in +l) socket="tcp://127.0.0.1:2375" ;; -a | A | all | All) +a) socket="tcp://0.0.0.0:2375" ;; *)