Skip to content

Commit

Permalink
rc4
Browse files Browse the repository at this point in the history
  • Loading branch information
qiaofeng1227 committed Dec 18, 2024
1 parent d279af6 commit 7fdf7ba
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 7 deletions.
2 changes: 1 addition & 1 deletion docker/apphub/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# This file can running at actions
# 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
Expand Down
3 changes: 2 additions & 1 deletion docker/apphub/script/migration.sh
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,8 @@ EOF

# special 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")
apphub setconfig --section nginx_proxy_manager --key listen_port --value "$listen_port"
}
Expand Down
8 changes: 4 additions & 4 deletions systemd/script/crontab.sh
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,6 @@ PATH=/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin:~/bin
cockpit_port="9000"
container_name="websoft9-apphub"
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
function get_volume_path() {
Expand All @@ -32,6 +28,10 @@ function get_volume_path() {
echo "Cannot get volume path"
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_fromconfig() {
Expand Down
2 changes: 1 addition & 1 deletion version.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"version": "2.1.18-rc3",
"version": "2.1.18-rc4",
"plugins": {
"portainer": "0.1.3",
"nginx": "0.1.0",
Expand Down

0 comments on commit 7fdf7ba

Please sign in to comment.