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 2

navagitor plugin change

Browse source
This commit is contained in:
qiaofeng1227 2023-08-10 16:51:07 +08:00
parent 4bbec74002
commit facb8a7adb
6 changed files with 34 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
CHANGELOG.md
View file

@ -1,3 +1,7 @@
## 0.8.12 release on 2023-08-10
1. navigator plugin install way change
## 0.8.11 release on 2023-08-03 ## 0.8.11 release on 2023-08-03
1. Optimize interface calls 1. Optimize interface calls

4
changelog_latest.md
View file

@ -1,3 +1 @@
1. Optimize interface calls 1. navigator plugin install way change
2. library artifacts directory: websoft9/plugin/library
3. add init apps: nocobase, affine

2
docker/w9appmanage/.env
View file

@ -1,4 +1,4 @@
APP_NAME=websoft9-appmanage APP_NAME=websoft9-appmanage
APP_VERSION=0.8.10 APP_VERSION=0.8.11
APP_HTTP_PORT=5000 APP_HTTP_PORT=5000
APP_NETWORK=websoft9 APP_NETWORK=websoft9

6
install/install.sh
View file

@ -362,10 +362,12 @@ unzip nginx-$nginx_version.zip
settings_version=$(cat /data/apps/websoft9/version.json | jq .PLUGINS |jq .SETTINGS | tr -d '"') settings_version=$(cat /data/apps/websoft9/version.json | jq .PLUGINS |jq .SETTINGS | tr -d '"')
wget $urls/plugin/settings/settings-$settings_version.zip wget $urls/plugin/settings/settings-$settings_version.zip
unzip settings-$settings_version.zip unzip settings-$settings_version.zip
rm -f *.zip
# install navigator # install navigator
cp -r /data/apps/websoft9/cockpit/navigator.zip /usr/share/cockpit && unzip navigator.zip && rm -f navigator.zip navigator_version=$(cat /data/apps/websoft9/version.json | jq .PLUGINS |jq .NAVIGATOR | tr -d '"')
wget $urls/plugin/navigator/navigator-$navigator_version.zip
unzip navigator-$navigator_version.zip
rm -f *.zip
# install library # install library
cd /data cd /data

23
install/update.sh
View file

@ -120,6 +120,14 @@ else
fi fi
new_nginx_version=$(cat /data/apps/websoft9/version.json | jq .PLUGINS |jq .NGINX | tr -d '"') new_nginx_version=$(cat /data/apps/websoft9/version.json | jq .PLUGINS |jq .NGINX | tr -d '"')
## update navigator
if [ -f "/usr/share/cockpit/navigator/navigator.json" ]; then
old_navigator_version=$(cat /usr/share/cockpit/navigator/navigator.json | jq .Version | tr -d '"')
else
old_navigator_version="0.0.0"
fi
new_navigator_version=$(cat /data/apps/websoft9/version.json | jq .PLUGINS |jq .NAVIGATOR | tr -d '"')
## update library ## update library
if [ -f "/data/library/library.json" ]; then if [ -f "/data/library/library.json" ]; then
old_library_version=$(cat /data/library/library.json | jq .Version | tr -d '"') old_library_version=$(cat /data/library/library.json | jq .Version | tr -d '"')
@ -143,6 +151,18 @@ else
echo "appstore is not need to update" echo "appstore is not need to update"
fi fi
compare_versions $old_navigator_version $new_navigator_version
if [[ $? -eq 0 ]]; then
echo "navigator plugin need to update"
cd /usr/share/cockpit
wget $urls/plugin/navigator/navigator-$new_navigator_version.zip
rm -rf navigator
unzip navigator-$navigator_version.zip
rm -f navigator-$navigator_version.zip
else
echo "navigator is not need to update"
fi
compare_versions $old_settings_version $new_settings_version compare_versions $old_settings_version $new_settings_version
if [[ $? -eq 0 ]]; then if [[ $? -eq 0 ]]; then
echo "settings plugin need to update" echo "settings plugin need to update"
@ -213,12 +233,9 @@ new_appmanage=$(cat /data/apps/websoft9/docker/w9appmanage/.env |grep APP_VERSIO
compare_versions $old_appmanage $new_appmanage compare_versions $old_appmanage $new_appmanage
if [[ $? -eq 0 ]]; then if [[ $? -eq 0 ]]; then
echo "start to update w9appmanage..." echo "start to update w9appmanage..."
rm -rf /tmp/database.sqlite && sudo docker cp websoft9-appmanage:/usr/src/app/database.sqlite /tmp
rm -f /data/apps/w9services/w9appmanage/.env && cp /data/apps/websoft9/docker/w9appmanage/.env /data/apps/w9services/w9appmanage/.env rm -f /data/apps/w9services/w9appmanage/.env && cp /data/apps/websoft9/docker/w9appmanage/.env /data/apps/w9services/w9appmanage/.env
rm -f /data/apps/w9services/w9appmanage/docker-compose.yml && cp /data/apps/websoft9/docker/w9appmanage/docker-compose.yml /data/apps/w9services/w9appmanage/docker-compose.yml rm -f /data/apps/w9services/w9appmanage/docker-compose.yml && cp /data/apps/websoft9/docker/w9appmanage/docker-compose.yml /data/apps/w9services/w9appmanage/docker-compose.yml
cd /data/apps/w9services/w9appmanage && sudo docker compose down && sudo docker compose pull && sudo docker compose up -d cd /data/apps/w9services/w9appmanage && sudo docker compose down && sudo docker compose pull && sudo docker compose up -d
sudo docker exec -it websoft9-appmanage rm -f /usr/src/app/database.sqlite && sudo docker cp /tmp/database.sqlite websoft9-appmanage:/usr/src/app
docker restart websoft9-appmanage
else else
echo "appmanage is not need to update" echo "appmanage is not need to update"
fi fi

7
version.json
View file

@ -2,15 +2,16 @@
"SERVICES": { "SERVICES": {
"PORTAINER": "2.18.3", "PORTAINER": "2.18.3",
"NGINX": "2.10.3", "NGINX": "2.10.3",
"APPMANAGE": "0.8.10", "APPMANAGE": "0.8.11",
"REDIS": "7.0.11" "REDIS": "7.0.11"
}, },
"PLUGINS": { "PLUGINS": {
"PORTAINER": "0.0.2", "PORTAINER": "0.0.3",
"NGINX": "0.0.2", "NGINX": "0.0.2",
"MYAPPS": "0.0.3", "MYAPPS": "0.0.3",
"APPSTORE": "0.0.4", "APPSTORE": "0.0.4",
"SETTINGS": "0.0.2", "SETTINGS": "0.0.2",
"NAVIGATOR": "0.5.10",
"LIBRARY": "0.5.3" "LIBRARY": "0.5.3"
}, },
"OS_SUPPORT": { "OS_SUPPORT": {
@ -42,5 +43,5 @@
"18.04" "18.04"
] ]
}, },
"VERSION": "0.8.11" "VERSION": "0.8.12"
} }