From 7fdf7ba3f17f19f3bf492f1932dd8530a4fb3d91 Mon Sep 17 00:00:00 2001
From: qiaofeng1227 <76487013@qq.com>
Date: Wed, 18 Dec 2024 17:02:39 +0800
Subject: [PATCH] rc4

---
 docker/apphub/Dockerfile          | 2 +-
 docker/apphub/script/migration.sh | 3 ++-
 systemd/script/crontab.sh         | 8 ++++----
 version.json                      | 2 +-
 4 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/docker/apphub/Dockerfile b/docker/apphub/Dockerfile
index b9583f4e..46524796 100644
--- a/docker/apphub/Dockerfile
+++ b/docker/apphub/Dockerfile
@@ -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
diff --git a/docker/apphub/script/migration.sh b/docker/apphub/script/migration.sh
index 70cac72d..6a000ed9 100644
--- a/docker/apphub/script/migration.sh
+++ b/docker/apphub/script/migration.sh
@@ -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"
 }
diff --git a/systemd/script/crontab.sh b/systemd/script/crontab.sh
index f9a9a8a6..ad411916 100644
--- a/systemd/script/crontab.sh
+++ b/systemd/script/crontab.sh
@@ -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() {
@@ -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() {
diff --git a/version.json b/version.json
index 7056741a..c4fdadd3 100644
--- a/version.json
+++ b/version.json
@@ -1,5 +1,5 @@
 {
-  "version": "2.1.18-rc3",
+  "version": "2.1.18-rc4",
   "plugins": {
     "portainer": "0.1.3",
     "nginx": "0.1.0",