From 1cbd60e546b99dee9d3a980bbf53b31f910df6f3 Mon Sep 17 00:00:00 2001 From: Darren <27513732@qq.com> Date: Wed, 18 Oct 2023 13:03:06 +0800 Subject: [PATCH] fix --- install/install.sh | 5 ++--- install/install_docker.sh | 4 +++- systemd/README.md | 8 +++++++- version.json | 2 +- 4 files changed, 13 insertions(+), 6 deletions(-) diff --git a/install/install.sh b/install/install.sh index 04509b9e..e02e7195 100644 --- a/install/install.sh +++ b/install/install.sh @@ -141,10 +141,9 @@ install_tools(){ apt_status=$? if [ $dnf_status -eq 0 ]; then - - dnf install $tools_yum -y + for package in $tools_yum; do sudo dnf install -y $package > /dev/null; done elif [ $yum_status -eq 0 ]; then - yum install epel $tools_yum -y + for package in $tools_yum; do sudo yum install -y $package > /dev/null; done elif [ $apt_status -eq 0 ]; then while fuser /var/lib/dpkg/lock >/dev/null 2>&1 ; do echo "Waiting for other software managers to finish..." diff --git a/install/install_docker.sh b/install/install_docker.sh index 43acaa7d..d3d4f77b 100644 --- a/install/install_docker.sh +++ b/install/install_docker.sh @@ -24,7 +24,9 @@ export PATH # # $ sudo sh install_docker.sh -docker_packages="docker-ce docker-ce-cli containerd.io docker-buildx-plugin docker-compose-plugin" + +# it must export, otherwise Rocky Linux cannot used at yum command +export docker_packages="docker-ce docker-ce-cli containerd.io docker-buildx-plugin docker-compose-plugin" echo_prefix_docker=$'\n[Docker] - ' docker_exist() { diff --git a/systemd/README.md b/systemd/README.md index 3c8b23e4..bef5cdda 100644 --- a/systemd/README.md +++ b/systemd/README.md @@ -13,4 +13,10 @@ sudo cp -f "$install_path/systemd/websoft9.service" /lib/systemd/system/ sudo systemctl daemon-reload sudo systemctl enable websoft9.service sudo systemctl start websoft9 -``` \ No newline at end of file +``` + +## Develop it + +* [systemd.exec — Execution environment configuration](https://www.freedesktop.org/software/systemd/man/systemd.exec.html) +* [systemd.unit — Unit configuration](https://www.freedesktop.org/software/systemd/man/systemd.unit.html) +* [systemd.service — Service unit configuration](https://www.freedesktop.org/software/systemd/man/systemd.service.html) \ No newline at end of file diff --git a/version.json b/version.json index fd799b34..1faf7733 100644 --- a/version.json +++ b/version.json @@ -1,5 +1,5 @@ { - "version": "0.8.26-rc60", + "version": "0.8.26-rc61", "plugins": { "portainer": "0.0.7", "nginx": "0.0.5",