From 64ccf9fa8a6e959366004b64575d115613fa5526 Mon Sep 17 00:00:00 2001
From: ChenYi <296215406@outlook.com>
Date: Mon, 13 Oct 2025 15:08:21 +0800
Subject: [PATCH] =?UTF-8?q?mssqlserver=202025=E8=BF=90=E8=A1=8C=E8=84=9A?=
 =?UTF-8?q?=E6=9C=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 DockerComposeShells/.env                      |  7 +-
 .../docker-compose-sqlserver.yml              | 75 +++----------------
 DockerComposeShells/sqlserver.env             |  4 +-
 3 files changed, 17 insertions(+), 69 deletions(-)

diff --git a/DockerComposeShells/.env b/DockerComposeShells/.env
index 2e1bfca..4345b27 100644
--- a/DockerComposeShells/.env
+++ b/DockerComposeShells/.env
@@ -21,8 +21,13 @@ ADMIN_API_PORT=28080
 # Admin Web配置
 ADMIN_WEB_PORT=30711
 
+#MSSQL Server配置
+SQLSERVER_EDITION=Developer
+SQLSERVER_PORT=11433
+
 # 认证信息
 PULSAR_ADMIN_USER=admin
 PULSAR_ADMIN_PASSWORD=0fd7afb8b0d04e6abc4fdfdac2190a79
 IOTDB_ROOT_PASSWORD=Lixiao@1980
-MYSQL_ROOT_PASSWORD='JiShe!aqG#5kGgh&0'
\ No newline at end of file
+MYSQL_ROOT_PASSWORD='JiShe!aqG#5kGgh&0'
+SQLSERVER_SA_PASSWORD=JiShe!aqG@5kGgh&0
\ No newline at end of file
diff --git a/DockerComposeShells/docker-compose-sqlserver.yml b/DockerComposeShells/docker-compose-sqlserver.yml
index ae18886..f2ac6bb 100644
--- a/DockerComposeShells/docker-compose-sqlserver.yml
+++ b/DockerComposeShells/docker-compose-sqlserver.yml
@@ -1,71 +1,28 @@
-version: '3.8'
-
 services:
   sqlserver:
-    image: mcr.microsoft.com/mssql/server:2022-latest
-    container_name: sqlserver-2022
-    hostname: sqlserver-2022
+    image: mcr.microsoft.com/mssql/server:2025-RC1-ubuntu-24.04 
+    container_name: sqlserver-2025RC1
+    hostname: sqlserver-2025RC1
     restart: unless-stopped
-    privileged: true
     ports:
       - "${SQLSERVER_PORT}:1433"
     environment:
       - ACCEPT_EULA=Y
-      - SA_PASSWORD=${SQLSERVER_SA_PASSWORD}
+      - MSSQL_SA_PASSWORD=${SQLSERVER_SA_PASSWORD}
       - MSSQL_PID=${SQLSERVER_EDITION}
       - TZ=Asia/Shanghai
     volumes:
-      - sqlserver-data:/var/opt/mssql
-      - sqlserver-logs:/var/opt/mssql/log
-      - ./sqlserver/init:/docker-entrypoint-initdb.d
-      - ./sqlserver/backup:/var/opt/mssql/backup
+      - ./mssqlserver/data:/var/opt/mssql
+      - ./mssqlserver/logs:/var/opt/mssql/log
     deploy:
       resources:
         limits:
-          cpus: "4.0"
-          memory: 8g
-        reservations:
-          cpus: "2.0"
-          memory: 4g
+          cpus: "8"
+          memory: 16g
     networks:
       - sqlserver-net
-    healthcheck:
-      test: ["CMD-SHELL", "/opt/mssql-tools/bin/sqlcmd -S localhost -U sa -P ${SQLSERVER_SA_PASSWORD} -Q 'SELECT 1' || exit 1"]
-      interval: 30s
-      timeout: 10s
-      retries: 5
-      start_period: 60s
     stdin_open: true
-    tty: true
-
-  # SQL Server Management Studio (可选，基于Web的管理界面)
-  sqlserver-web:
-    image: mcr.microsoft.com/mssql/server:2022-latest
-    container_name: sqlserver-web
-    hostname: sqlserver-web
-    restart: unless-stopped
-    ports:
-      - "${SQLSERVER_WEB_PORT}:8080"
-    environment:
-      - ACCEPT_EULA=Y
-      - SA_PASSWORD=${SQLSERVER_SA_PASSWORD}
-      - MSSQL_PID=${SQLSERVER_EDITION}
-      - TZ=Asia/Shanghai
-    volumes:
-      - ./sqlserver/web-config:/var/opt/mssql/web-config
-    depends_on:
-      sqlserver:
-        condition: service_healthy
-    networks:
-      - sqlserver-net
-    command: >
-      /bin/bash -c "
-      # 安装SQL Server Web管理工具
-      apt-get update && apt-get install -y curl wget &&
-      # 这里可以添加Web管理界面的安装脚本
-      echo 'SQL Server Web management interface ready' &&
-      tail -f /dev/null
-      "
+    tty: true 
 
 networks:
   sqlserver-net:
@@ -75,17 +32,3 @@ networks:
       config:
         - subnet: 172.24.0.0/16
           gateway: 172.24.0.1
-
-volumes:
-  sqlserver-data:
-    driver: local
-    driver_opts:
-      type: none
-      o: bind
-      device: ./sqlserver/data
-  sqlserver-logs:
-    driver: local
-    driver_opts:
-      type: none
-      o: bind
-      device: ./sqlserver/logs
diff --git a/DockerComposeShells/sqlserver.env b/DockerComposeShells/sqlserver.env
index 095ce8a..bea737f 100644
--- a/DockerComposeShells/sqlserver.env
+++ b/DockerComposeShells/sqlserver.env
@@ -2,12 +2,12 @@
 
 # SQL Server 配置
 # 端口配置
-SQLSERVER_PORT=1433
+SQLSERVER_PORT=11433
 SQLSERVER_WEB_PORT=8080
 
 # 认证配置
 # SA用户密码（请修改为强密码）
-SQLSERVER_SA_PASSWORD=YourStrong@Password123!
+SQLSERVER_SA_PASSWORD=JiShe!aqG#5kGgh&0
 
 # SQL Server 版本配置
 # 可选值: Developer, Express, Standard, Enterprise, EnterpriseCore