Proxmox/ProxmoxVE
1
0
Fork 1
mirror of https://github.com/community-scripts/ProxmoxVE.git synced 2026-07-15 18:35:07 +02:00
Code Issues Packages Projects Releases Wiki Activity

Default Docker setup to official repo

Browse Source 
Switch `setup_docker` to use the official Docker repository by default and update the usage/docs to match. The distro `docker.io` package now requires `USE_DOCKER_REPO=false`.
This commit is contained in:
MickLesk
2026-07-15 10:07:00 +02:00
parent 2afea1239c
commit 35eca66485
1 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
misc/tools.func
+7 -7
View File
@@ -4663,20 +4663,20 @@ setup_composer() {
# - Cleans up legacy repository files
#
# Usage:
# setup_docker # Uses distro package (recommended)
# USE_DOCKER_REPO=true setup_docker # Uses official Docker repo
# setup_docker # Uses official Docker repo (recommended)
# USE_DOCKER_REPO=false setup_docker # Uses distro docker.io package
# DOCKER_PORTAINER="true" setup_docker
# DOCKER_LOG_DRIVER="json-file" setup_docker
#
# Variables:
# USE_DOCKER_REPO - Set to "true" to use official Docker repository
# (default: false, uses distro docker.io package)
# USE_DOCKER_REPO - Set to "false" to use distro docker.io package
# (default: true, uses official Docker repository)
# DOCKER_PORTAINER - Install Portainer CE (optional, "true" to enable)
# DOCKER_LOG_DRIVER - Log driver (optional, default: "journald")
# DOCKER_SKIP_UPDATES - Skip container update check (optional, "true" to skip)
#
# Features:
# - Uses stable distro packages by default
# - Uses official Docker repository by default
# - Migrates from get.docker.com to repository-based installation
# - Updates Docker Engine if newer version available
# - Interactive per-container update prompt (Y/N, 60 s auto-no)
@@ -4692,7 +4692,7 @@ _docker_is_noninteractive() {
setup_docker() {
local docker_installed=false
local portainer_installed=false
local USE_DOCKER_REPO="${USE_DOCKER_REPO:-false}"
local USE_DOCKER_REPO="${USE_DOCKER_REPO:-true}"
# Check if Docker is already installed
if command -v docker &>/dev/null; then
@@ -4707,7 +4707,7 @@ setup_docker() {
msg_info "Portainer container detected"
fi
# Scenario 1: Use distro repository (default, most stable)
# Scenario 1: Use distro repository (opt-out via USE_DOCKER_REPO=false)
if [[ "$USE_DOCKER_REPO" != "true" && "$USE_DOCKER_REPO" != "TRUE" && "$USE_DOCKER_REPO" != "1" ]]; then
# Install or upgrade Docker from distro repo