github_mirrors/websoft9
1
0
Fork 0
mirror of https://github.com/Websoft9/websoft9.git synced 2025-02-02 17:08:38 +08:00
Code Issues Packages Projects Releases Wiki Activity

rc4

Browse Source
This commit is contained in:
qiaofeng1227 2024-12-18 17:02:39 +08:00
parent d279af60c4
commit 7fdf7ba3f1
4 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
docker/apphub/Dockerfile
View File

@ -1,6 +1,6 @@
# This file can running at actions # This file can running at actions
# MEDIA_VERSION and LIBRARY_VERSION will trigger its release # MEDIA_VERSION and LIBRARY_VERSION will trigger its release
# modify time: 202412181615, you can modify here to trigger Docker Build action # modify time: 202412181705, you can modify here to trigger Docker Build action
FROM python:3.10-slim-bullseye FROM python:3.10-slim-bullseye

3
docker/apphub/script/migration.sh
View File

@ -43,7 +43,8 @@ EOF
# special migration # special migration
post_migration(){ post_migration(){
config_file="/websoft9/apphub/src/config/config.ini" echo "$(date '+%Y-%m-%d %H:%M:%S') - INFO - Set listen_port to nginx_proxy_manager"
config_file="/websoft9/config/config.ini"
listen_port=$(grep -Po '^\s*listen_port\s*=\s*\K[0-9]+' "$config_file") listen_port=$(grep -Po '^\s*listen_port\s*=\s*\K[0-9]+' "$config_file")
apphub setconfig --section nginx_proxy_manager --key listen_port --value "$listen_port" apphub setconfig --section nginx_proxy_manager --key listen_port --value "$listen_port"
} }

8
systemd/script/crontab.sh
View File

@ -4,10 +4,6 @@ PATH=/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin:~/bin
cockpit_port="9000" cockpit_port="9000"
container_name="websoft9-apphub" container_name="websoft9-apphub"
volume_name="websoft9_apphub_config" volume_name="websoft9_apphub_config"
volume_path=$(get_volume_path "$container_name" "$volume_name")
config_path="$volume_path/config.ini"
cockpit_service_path="/lib/systemd/system/cockpit.socket"
FILES="$cockpit_service_path $config_path"
# get volume from container # get volume from container
function get_volume_path() { function get_volume_path() {
@ -32,6 +28,10 @@ function get_volume_path() {
echo "Cannot get volume path" echo "Cannot get volume path"
exit 1 exit 1
} }
volume_path=$(get_volume_path "$container_name" "$volume_name")
config_path="$volume_path/config.ini"
cockpit_service_path="/lib/systemd/system/cockpit.socket"
FILES="$cockpit_service_path $config_path"
# sync cockpit port from config.ini # sync cockpit port from config.ini
sync_cockpit_port_fromconfig() { sync_cockpit_port_fromconfig() {

2
version.json
View File

@ -1,5 +1,5 @@
{ {
"version": "2.1.18-rc3", "version": "2.1.18-rc4",
"plugins": { "plugins": {
"portainer": "0.1.3", "portainer": "0.1.3",
"nginx": "0.1.0", "nginx": "0.1.0",