From ca7bd13d3bcd9adc2b4ac098b7df89507678a4df Mon Sep 17 00:00:00 2001
From: Chenyang Shen <34506289+Aaron3S@users.noreply.github.com>
Date: Mon, 18 Dec 2023 11:04:40 +0800
Subject: [PATCH] feat: Update docker-compose-magnus.yml

---
 compose/docker-compose-magnus-xpack.yml |  3 ++-
 compose/docker-compose-magnus.yml       |  3 ++-
 config-example.txt                      |  1 +
 scripts/7_upgrade.sh                    | 15 ++++++++++-----
 4 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/compose/docker-compose-magnus-xpack.yml b/compose/docker-compose-magnus-xpack.yml
index 89e8d58a..5cc46e7d 100644
--- a/compose/docker-compose-magnus-xpack.yml
+++ b/compose/docker-compose-magnus-xpack.yml
@@ -4,4 +4,5 @@ services:
   magnus:
     ports:
       - ${MAGNUS_POSTGRESQL_PORT:-54320}:54320
-      - ${MAGNUS_ORACLE_PORTS:-30000-30030}:${MAGNUS_ORACLE_PORTS:-30000-30030}
\ No newline at end of file
+      - ${MAGNUS_SQLSERVER_PORT:-14330}:14330
+      - ${MAGNUS_ORACLE_PORTS:-30000-30030}:${MAGNUS_ORACLE_PORTS:-30000-30030}
diff --git a/compose/docker-compose-magnus.yml b/compose/docker-compose-magnus.yml
index 36c2218a..8a45ec9a 100644
--- a/compose/docker-compose-magnus.yml
+++ b/compose/docker-compose-magnus.yml
@@ -15,6 +15,7 @@ services:
       - ${MAGNUS_MYSQL_PORT:-33061}:33061
       - ${MAGNUS_MARIADB_PORT:-33062}:33062
       - ${MAGNUS_REDIS_PORT:-63790}:63790
+      - ${MAGNUS_SQLSERVER_PORT:-14330}:14330
     volumes:
       - ${CONFIG_DIR}/certs:/opt/magnus/data/certs
       - ${VOLUME_DIR}/magnus/data:/opt/magnus/data
@@ -25,4 +26,4 @@ services:
       retries: 3
       start_period: 10s
     networks:
-      - net
\ No newline at end of file
+      - net
diff --git a/config-example.txt b/config-example.txt
index 20cf37bc..ed2c6793 100644
--- a/config-example.txt
+++ b/config-example.txt
@@ -89,6 +89,7 @@ MAGNUS_MYSQL_PORT=33061
 MAGNUS_MARIADB_PORT=33062
 MAGNUS_REDIS_PORT=63790
 MAGNUS_POSTGRESQL_PORT=54320
+MAGNUS_SQLSERVER_PORT=14330
 MAGNUS_ORACLE_PORTS=30000-30030
 
 ################################# HTTPS 配置 #################################
diff --git a/scripts/7_upgrade.sh b/scripts/7_upgrade.sh
index db2d2e77..ca5bcff8 100644
--- a/scripts/7_upgrade.sh
+++ b/scripts/7_upgrade.sh
@@ -101,21 +101,26 @@ function upgrade_config() {
       RDP_PORT=3389
       set_config RDP_PORT "${RDP_PORT}"
     fi
+    xrdp_port=$(get_config XRDP_PORT)
+    if [ -z "${xrdp_port}" ]; then
+      XRDP_PORT=3390
+      set_config XRDP_PORT "${XRDP_PORT}"
+    fi
     magnus_postgresql_port=$(get_config MAGNUS_POSTGRESQL_PORT)
     if [ -z "${magnus_postgresql_port}" ]; then
       MAGNUS_POSTGRESQL_PORT=54320
       set_config MAGNUS_POSTGRESQL_PORT "${MAGNUS_POSTGRESQL_PORT}"
     fi
+    magnus_sqlserver_port=$(get_config MAGNUS_SQLSERVER_PORT)
+    if [ -z "${magnus_sqlserver_port}" ]; then
+      MAGNUS_SQLSERVER_PORT=14330
+      set_config MAGNUS_SQLSERVER_PORT "${MAGNUS_SQLSERVER_PORT}"
+    fi
     magnus_oracle_ports=$(get_config MAGNUS_ORACLE_PORTS)
     if [ -z "${magnus_oracle_ports}" ]; then
       MAGNUS_ORACLE_PORTS=30000-30030
       set_config MAGNUS_ORACLE_PORTS "${MAGNUS_ORACLE_PORTS}"
     fi
-    xrdp_port=$(get_config XRDP_PORT)
-    if [ -z "${xrdp_port}" ]; then
-      XRDP_PORT=3390
-      set_config XRDP_PORT "${XRDP_PORT}"
-    fi
   fi
 }