From 834b5382d570161e97d8c39cee376e9811e7431a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?M=C4=83rcziem=20=E2=84=A2?= <118485377+spalencsar@users.noreply.github.com> Date: Fri, 3 Oct 2025 10:38:30 +0200 Subject: [PATCH] fix(run_installation): avoid ((current_step++)) under set -e by using explicit arithmetic increment --- lib/docker.sh | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/lib/docker.sh b/lib/docker.sh index db2519a..0a70c47 100644 --- a/lib/docker.sh +++ b/lib/docker.sh @@ -47,15 +47,15 @@ install_docker() { esac # Add user to the docker group - handle_error sudo usermod -aG docker "$NEW_USER" + handle_error $SUDO usermod -aG docker "$NEW_USER" - handle_error sudo systemctl enable docker - handle_error sudo systemctl start docker + handle_error $SUDO systemctl enable docker + handle_error $SUDO systemctl start docker # Configure Docker data directory and optimization if [[ "$DOCKER_DATA_DIR" != "$DEFAULT_DOCKER_DATA_DIR" ]]; then log_info "Configuring Docker data directory to $DOCKER_DATA_DIR..." - handle_error sudo mkdir -p "$DOCKER_DATA_DIR" + handle_error $SUDO mkdir -p "$DOCKER_DATA_DIR" fi # Create optimized Docker daemon configuration @@ -81,10 +81,10 @@ install_docker() { configure_docker_daemon() { log_info "Configuring optimized Docker daemon..." - sudo mkdir -p /etc/docker + $SUDO mkdir -p /etc/docker # Create optimized daemon.json - cat << EOF | sudo tee /etc/docker/daemon.json + cat << EOF | $SUDO tee /etc/docker/daemon.json { "storage-driver": "overlay2", "log-driver": "json-file", @@ -109,11 +109,11 @@ EOF # Add data-root if custom directory is specified if [[ "$DOCKER_DATA_DIR" != "$DEFAULT_DOCKER_DATA_DIR" ]]; then # Modify the daemon.json to include data-root - sudo sed -i "s|{|{\n \"data-root\": \"$DOCKER_DATA_DIR\",|" /etc/docker/daemon.json + $SUDO sed -i "s|{|{\n \"data-root\": \"$DOCKER_DATA_DIR\",|" /etc/docker/daemon.json fi # Restart Docker to apply configuration - handle_error sudo systemctl restart docker + handle_error $SUDO systemctl restart docker log_success "Docker daemon optimized" }