Skip to content

优化V4升级安装docker和docker compose。 #538

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
xiao2man wants to merge 2 commits into
base: dev
Choose a base branch
from
Open

优化V4升级安装docker和docker compose。 #538

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b78c6dc
fix: update install script for docker
Nov 24, 2025
4d8428c
fix: update install script for docker
Nov 24, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
46 changes: 24 additions & 22 deletions scripts/2_install_docker.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,23 +20,23 @@ function copy_docker() {
}

function install_docker() {
if [[ ! -f ${BASE_DIR}/docker/docker.tar.gz ]]; then
prepare_docker_bin
fi
if [[ ! -f ${BASE_DIR}/docker/docker.tar.gz ]]; then
echo_red "Error: $(gettext 'Docker program does not exist')"
exit 1
fi
if [[ ! -f "/usr/local/bin/dockerd" ]]; then
if [ ! "$(docker version --format '{{.Server.Version}}' 2>/dev/null)" = "${DOCKER_VERSION}" ]; then
if [[ ! -f ${BASE_DIR}/docker/docker.tar.gz ]]; then
prepare_docker_bin
fi
if [[ ! -f ${BASE_DIR}/docker/docker.tar.gz ]]; then
echo_red "Error: $(gettext 'Docker program does not exist')"
exit 1
fi
copy_docker
fi
}

function install_compose() {
if [[ ! -f ${BASE_DIR}/docker/docker-compose ]]; then
prepare_compose_bin
fi
if [[ ! -f "/usr/local/libexec/docker/cli-plugins/docker-compose" ]]; then
if [ ! "$(docker compose version --short 2>/dev/null)" = "${DOCKER_COMPOSE_VERSION}" ]; then
if [[ ! -f ${BASE_DIR}/docker/docker-compose ]]; then
prepare_compose_bin
fi
if [[ ! -d "/usr/local/libexec/docker/cli-plugins" ]]; then
mkdir -p /usr/local/libexec/docker/cli-plugins
fi
Expand All @@ -45,10 +45,10 @@ function install_compose() {
}

function install_compose_home() {
if [[ ! -f ${BASE_DIR}/docker/docker-compose ]]; then
prepare_compose_bin
fi
if [[ ! -f "$HOME/.docker/cli-plugins/docker-compose" ]]; then
if [ ! "$(docker compose version --short 2>/dev/null)" = "${DOCKER_COMPOSE_VERSION}" ]; then
if [[ ! -f ${BASE_DIR}/docker/docker-compose ]]; then
prepare_compose_bin
fi
if [[ ! -d "$HOME/.docker/cli-plugins" ]]; then
mkdir -p $HOME/.docker/cli-plugins
fi
Expand All @@ -57,24 +57,26 @@ function install_compose_home() {
}

function check_docker_install() {
docker version &>/dev/null || {
if ! docker version &>/dev/null &&
! /usr/local/bin/docker version &>/dev/null &&
! /usr/bin/docker version &>/dev/null; then
if check_root; then
install_docker
else
log_warn "$(gettext 'Permission denied. pass...')"
fi
}
echo_done
fi
}

function check_compose_install() {
docker compose version &>/dev/null || {
if ! docker compose version &>/dev/null; then
if check_root; then
install_compose
else
install_compose_home
fi
}
echo_done
fi
}

function set_docker_config() {
Expand Down Expand Up @@ -198,4 +200,4 @@ function main() {

if [[ "$0" == "${BASH_SOURCE[0]}" ]]; then
main
fi
fi
5 changes: 5 additions & 0 deletions scripts/7_upgrade.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -264,6 +264,11 @@ function upgrade_compose() {
if [[ "${confirm}" == "y" ]]; then
echo
cd "${BASE_DIR}" || exit 1
if check_root; then
install_compose
else
install_compose_home
fi
check_compose_install
check_docker_compose
fi
Expand Down