feat:修正windows

apps/windows/3.12/.env.sample

@@ -1,11 +1,12 @@
 CONTAINER_NAME="windows"
-PANEL_APP_PORT_HTTP="8006"
-DATA_PATH="./data"
-RDP_PORT="3389"
+CPU_CORES=2
+DATA_PATH="./data/storage"
+DISK_SIZE="30GB"
 IMAGE_ISO_FILE=""
-MANUAL="N"
-DISK_SIZE="256G"
-RAM_SIZE="4G"
-CPU_CORES="2"
+MANUAL="Y"
+PANEL_APP_PORT_HTTP=40286
+PASSWORD="password"
+RAM_SIZE="4GB"
+RDP_PORT=3389
+RESTART_POLICY="always"
 USERNAME="docker"
-PASSWORD=""

apps/windows/3.12/data.yml

@@ -1,79 +1,93 @@
 additionalProperties:
-    formFields:
-        - default: 8006
-          edit: true
-          envKey: PANEL_APP_PORT_HTTP
-          labelEn: Port (determined by the listening port)
-          labelZh: 端口 (由监听端口决定)
-          required: true
-          rule: paramPort
-          type: number
-        - default: ./data
-          edit: true
-          envKey: DATA_PATH
-          labelEn: Data folder path
-          labelZh: 数据文件夹路径
-          required: true
-          type: text
-        - default: 3389
-          edit: true
-          envKey: RDP_PORT
-          labelEn: RDP Port
-          labelZh: 远程端口
-          required: true
-          rule: paramPort
-          type: number
-        - default: ""
-          edit: true
-          envKey: IMAGE_ISO_FILE
-          labelEn: iso file
-          labelZh: iso 文件路径
-          required: true
-          type: text
-        - default: "N"
-          edit: true
-          envKey: MANUAL
-          labelEn: Manual Install
-          labelZh: 手动安装
-          required: true
-          type: select
-          values:
-            - label: Yes
-              value: "Y"
-            - label: No
-              value: "N"
-        - default: "256G"
-          edit: true
-          envKey: DISK_SIZE
-          labelEn: Disk Size
-          labelZh: 磁盘大小
-          required: true
-          type: text
-        - default: "4G"
-          edit: true
-          envKey: RAM_SIZE
-          labelEn: Ram Size
-          labelZh: 内存大小
-          required: true
-          type: text
-        - default: 2
-          edit: true
-          envKey: CPU_CORES
-          labelEn: Cpu Core Size
-          labelZh: cpu 核心数
-          required: true
-          type: number
-        - default: "docker"
-          edit: true
-          envKey: USERNAME
-          labelEn: Login Username
-          labelZh: 登录用户名
-          required: true
-          type: text
-        - default: ""
-          edit: true
-          envKey: PASSWORD
-          labelEn: Login Password
-          labelZh: 登录密码
-          required: false
-          type: password
+  formFields:
+    - default: "40286"
+      edit: true
+      envKey: PANEL_APP_PORT_HTTP
+      labelEn: Port
+      labelZh: 端口
+      required: true
+      rule: paramPort
+      type: number
+    - default: "./data/storage"
+      edit: true
+      envKey: DATA_PATH
+      labelEn: Data Path
+      labelZh: 数据路径
+      required: true
+      type: text
+    - default: "3389"
+      edit: true
+      envKey: RDP_PORT
+      labelEn: RDP Port
+      labelZh: RDP 远程端口
+      required: true
+      rule: paramPort
+      type: number
+    - default: ""
+      edit: true
+      envKey: IMAGE_ISO_FILE
+      labelEn: Windows ISO File
+      labelZh: Windows ISO 文件路径
+      required: true
+      type: text
+    - default: "Y"
+      edit: true
+      envKey: MANUAL
+      labelEn: Manual Install
+      labelZh: 手动安装
+      required: true
+      type: select
+      values:
+        - label: "Yes"
+          value: "Y"
+        - label: "No"
+          value: "N"
+    - default: "30GB"
+      edit: true
+      envKey: DISK_SIZE
+      labelEn: Disk Size
+      labelZh: 磁盘大小
+      required: true
+      type: text
+    - default: "4GB"
+      edit: true
+      envKey: RAM_SIZE
+      labelEn: RAM Size
+      labelZh: 内存大小
+      required: true
+      type: text
+    - default: "2"
+      edit: true
+      envKey: CPU_CORES
+      labelEn: CPU Cores
+      labelZh: CPU 核心数
+      required: true
+      type: number
+    - default: "docker"
+      edit: true
+      envKey: USERNAME
+      labelEn: Login Username (This setting is not valid for non-matching system images)
+      labelZh: 登录用户名 (非匹配的系统镜像则此设置无效)
+      required: true
+      type: text
+    - default: "password"
+      edit: true
+      envKey: PASSWORD
+      labelEn: Login Password (This setting is not valid for non-matching system images)
+      labelZh: 登录密码 (非匹配的系统镜像则此设置无效)
+      required: true
+      type: password
+    - default: "always"
+      edit: true
+      envKey: RESTART_POLICY
+      labelEn: Restart Policy
+      labelZh: 重启策略
+      required: true
+      type: select
+      values:
+        - label: "Always"
+          value: "always"
+        - label: "Unless-stopped"
+          value: "unless-stopped"
+        - label: "No"
+          value: "no"

apps/windows/3.12/docker-compose.yml

@@ -1,7 +1,10 @@
 services:
   windows:
-    image: dockurr/windows:3.12
+    image: "dockurr/windows:3.12"
     container_name: ${CONTAINER_NAME}
+    restart: ${RESTART_POLICY}
+    networks:
+      - 1panel-network
     environment:
       MANUAL: ${MANUAL}
       DISK_SIZE: ${DISK_SIZE}
@@ -21,11 +24,9 @@ services:
       - ${RDP_PORT}:3389/tcp
       - ${RDP_PORT}:3389/udp
     stop_grace_period: 2m
-    networks:
-      - 1panel-network
-    labels:  
+    labels:
       createdBy: "Apps"
 
-networks:  
-  1panel-network:  
+networks:
+  1panel-network:
     external: true