beenull/websoft9
1
0
Fork 0
mirror of https://github.com/Websoft9/websoft9.git synced 2024-11-22 07:30:24 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

fix install

Browse source
This commit is contained in:
Darren 2023-10-17 18:16:52 +08:00 committed by GitHub
parent f95e84391d
commit 4dbfa03077
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
install/install.sh
View file

@ -103,7 +103,8 @@ export systemd_path="/opt/websoft9/systemd"
export source_zip="websoft9-$version.zip"
export source_unzip="websoft9"
export source_github_pages="https://websoft9.github.io/websoft9"
export tools_yum="git curl wget yum-utils jq bc unzip inotify-tools"
# inotify-tools is at epel-release
export tools_yum="git curl wget epel-release yum-utils jq bc unzip inotify-tools"
export tools_apt="git curl wget jq bc unzip inotify-tools"
export docker_network="websoft9"
export artifact_url="https://w9artifact.blob.core.windows.net/$channel/websoft9"
@ -140,9 +141,10 @@ install_tools(){
apt_status=$?
if [ $dnf_status -eq 0 ]; then
dnf install $tools_yum -y
elif [ $yum_status -eq 0 ]; then
yum install $tools_yum -y
yum install epel $tools_yum -y
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..."
@ -202,12 +204,13 @@ check_ports() {
for port in "${ports[@]}"; do
if netstat -tuln | grep ":$port " >/dev/null; then
if ss -tuln | grep ":$port " >/dev/null; then
echo "Port $port is in use, install failed"
exit
fi
done
echo "All ports are available"
}
@ -274,6 +277,7 @@ set_docker(){
sudo firewall-cmd --permanent --zone=docker --add-interface=docker0 2> /dev/null
sudo firewall-cmd --permanent --zone=docker --set-target=ACCEPT
sudo firewall-cmd --reload
sudo systemctl stop firewalld
fi
sudo systemctl restart docker
}

2
version.json
View file

@ -1,5 +1,5 @@
{
"version": "0.8.26-rc59",
"version": "0.8.26-rc60",
"plugins": {
"portainer": "0.0.7",
"nginx": "0.0.5",