Skip to content

Commit

Permalink
fix
Browse files Browse the repository at this point in the history
  • Loading branch information
chendelin1982 authored Oct 18, 2023
1 parent 4dbfa03 commit 1cbd60e
Show file tree
Hide file tree
Showing 4 changed files with 13 additions and 6 deletions.
5 changes: 2 additions & 3 deletions install/install.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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..."
Expand Down
4 changes: 3 additions & 1 deletion install/install_docker.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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() {
Expand Down
8 changes: 7 additions & 1 deletion systemd/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
```
```

## 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)
2 changes: 1 addition & 1 deletion version.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"version": "0.8.26-rc60",
"version": "0.8.26-rc61",
"plugins": {
"portainer": "0.0.7",
"nginx": "0.0.5",
Expand Down

0 comments on commit 1cbd60e

Please sign in to comment.