diff --git a/.github/README.md b/.github/README.md index 4722a50c..269236e3 100644 --- a/.github/README.md +++ b/.github/README.md @@ -165,7 +165,8 @@ | 🟢 | | Uptime Kuma | https://uptime.kuma.pet/ | 自托管监控工具 | | | 🟢 | | Umami | https://umami.is/ | 为速度和效率而构建的网站分析 | | | 🟢 | | 路由设备监控 | https://github.com/aceberg/WatchYourLAN/ | 轻量级网络 IP 扫描器 | | -| 🟢 | | Windows 系统 | https://www.microsoft.com/ | Docker 容器内的 Windows | | +| 🟢 | | Windows 系统 | https://www.microsoft.com/ | Docker 容器内的 Windows | OS | +| 🟢 | | Mac OS | https://www.apple.com/ | Docker 容器内的 Mac OS | OS | | 🟢 | | WiseFlow | https://github.com/TeamWiseFlow/wiseflow/ | Wiseflow 首席情报官 | | | 🟢 | | 悟空IM | https://githubim.com/ | 让信息传递更简单 | | | 🟢 | | 迅雷 NAS版 | https://github.com/cnk3x/xunlei/ | 迅雷远程下载服务 NAS移植版 | | diff --git a/README.md b/README.md index b924d828..85ecb4b0 100644 --- a/README.md +++ b/README.md @@ -148,7 +148,8 @@ | 🟢 | | Uptime Kuma | https://uptime.kuma.pet/ | 自托管监控工具 | | | 🟢 | | Umami | https://umami.is/ | 为速度和效率而构建的网站分析 | | | 🟢 | | 路由设备监控 | https://github.com/aceberg/WatchYourLAN/ | 轻量级网络 IP 扫描器 | | -| 🟢 | | Windows 系统 | https://www.microsoft.com/ | Docker 容器内的 Windows | | +| 🟢 | | Windows 系统 | https://www.microsoft.com/ | Docker 容器内的 Windows | OS | +| 🟢 | | Mac OS | https://www.apple.com/ | Docker 容器内的 Mac OS | OS | | 🟢 | | WiseFlow | https://github.com/TeamWiseFlow/wiseflow/ | Wiseflow 首席情报官 | | | 🟢 | | 悟空IM | https://githubim.com/ | 让信息传递更简单 | | | 🟢 | | 迅雷 NAS版 | https://github.com/cnk3x/xunlei/ | 迅雷远程下载服务 NAS移植版 | | diff --git a/apps/macos/1.14/data.yml b/apps/macos/1.14/data.yml new file mode 100644 index 00000000..3ef308e4 --- /dev/null +++ b/apps/macos/1.14/data.yml @@ -0,0 +1,64 @@ +additionalProperties: + formFields: + - default: "/home/macos" + edit: true + envKey: MACOS_STORAGE_ROOT_PATH + labelZh: MacOS 存储目录 + labelEn: MacOS Storage Path + required: true + type: text + - default: 8006 + edit: true + envKey: PANEL_APP_PORT_HTTP + labelZh: WebUI 端口 + labelEn: WebUI port + required: true + rule: paramPort + type: number + - default: 5900 + edit: true + envKey: PANEL_APP_PORT_REMOTE + labelZh: Mac 远程桌面 端口 + labelEn: Mac Remote Desktop Port + required: true + rule: paramPort + type: number + - default: "15" + edit: true + envKey: VERSION + labelZh: MacOS 版本 + labelEn: MacOS Version + required: true + type: select + values: + - label: macOS 15 (Sequoia) + value: "15" + - label: macOS 14 (Sonoma) + value: "14" + - label: macOS 13 (Ventura) + value: "13" + - label: macOS 12 (Monterey) + value: "12" + - label: macOS 11 (Big Sur) + value: "11" + - default: "8G" + edit: true + envKey: RAM_SIZE + labelZh: 内存大小 + labelEn: RAM Size + required: true + type: text + - default: "64G" + edit: true + envKey: DISK_SIZE + labelZh: 硬盘大小 + labelEn: Disk Size + required: true + type: text + - default: 4 + edit: true + envKey: CPU_CORES + labelZh: CPU 核心数 + labelEn: CPU Cores + required: true + type: number diff --git a/apps/macos/1.14/docker-compose.yml b/apps/macos/1.14/docker-compose.yml new file mode 100644 index 00000000..d9b5a635 --- /dev/null +++ b/apps/macos/1.14/docker-compose.yml @@ -0,0 +1,37 @@ +networks: + 1panel-network: + external: true + +services: + windows: + image: dockurr/macos:1.14 + container_name: ${CONTAINER_NAME} + labels: + createdBy: "Apps" + restart: always + stop_grace_period: 2m + networks: + - 1panel-network + ports: + - ${PANEL_APP_PORT_HTTP}:8006 + - ${PANEL_APP_PORT_REMOTE}:5900/tcp + - ${PANEL_APP_PORT_REMOTE}:5900/udp + cap_add: + - NET_ADMIN + devices: + - /dev/kvm:/dev/kvm + - /dev/dri:/dev/dri + # - /dev/nvidia0:/dev/nvidia0 + # - /dev/nvidiactl:/dev/nvidiactl + # - /dev/nvidia-modeset:/dev/nvidia-modeset + # - /dev/nvidia-nvswitchctl:/dev/nvidia-nvswitchctl + # - /dev/nvidia-uvm:/dev/nvidia-uvm + # - /dev/nvidia-uvm-tools:/dev/nvidia-uvm-tools + # - /dev/video11:/dev/video11 + env_file: + - /etc/1panel/envs/global.env + - ${ENV_FILE:-/etc/1panel/envs/default.env} + volumes: + - ${MACOS_STORAGE_ROOT_PATH}/storage:/storage + environment: + - VERSION=${VERSION} diff --git a/apps/macos/1.14/scripts/init.sh b/apps/macos/1.14/scripts/init.sh new file mode 100644 index 00000000..77b84912 --- /dev/null +++ b/apps/macos/1.14/scripts/init.sh @@ -0,0 +1,15 @@ +#!/bin/bash + +if [ -f .env ]; then + source .env + + # setup-1 add default values + CURRENT_DIR=$(pwd) + sed -i '/^ENV_FILE=/d' .env + echo "ENV_FILE=${CURRENT_DIR}/.env" >> .env + + echo "Check Finish." + +else + echo "Error: .env file not found." +fi diff --git a/apps/macos/1.14/scripts/uninstall.sh b/apps/macos/1.14/scripts/uninstall.sh new file mode 100644 index 00000000..c86c4fbc --- /dev/null +++ b/apps/macos/1.14/scripts/uninstall.sh @@ -0,0 +1,10 @@ +#!/bin/bash + +if [ -f .env ]; then + source .env + + echo "Check Finish." + +else + echo "Error: .env file not found." +fi diff --git a/apps/macos/1.14/scripts/upgrade.sh b/apps/macos/1.14/scripts/upgrade.sh new file mode 100644 index 00000000..77b84912 --- /dev/null +++ b/apps/macos/1.14/scripts/upgrade.sh @@ -0,0 +1,15 @@ +#!/bin/bash + +if [ -f .env ]; then + source .env + + # setup-1 add default values + CURRENT_DIR=$(pwd) + sed -i '/^ENV_FILE=/d' .env + echo "ENV_FILE=${CURRENT_DIR}/.env" >> .env + + echo "Check Finish." + +else + echo "Error: .env file not found." +fi diff --git a/apps/macos/README.md b/apps/macos/README.md new file mode 100644 index 00000000..81cde7f2 --- /dev/null +++ b/apps/macos/README.md @@ -0,0 +1,66 @@ +# Mac OS + +Docker 容器内的 Mac OS + +![Mac OS](https://file.lifebus.top/imgs/macos_cover.jpg) + +![](https://img.shields.io/badge/%E6%96%B0%E7%96%86%E8%90%8C%E6%A3%AE%E8%BD%AF%E4%BB%B6%E5%BC%80%E5%8F%91%E5%B7%A5%E4%BD%9C%E5%AE%A4-%E6%8F%90%E4%BE%9B%E6%8A%80%E6%9C%AF%E6%94%AF%E6%8C%81-blue) + +## 简介 + +macOS是苹果公司推出的使用图形用户界面的操作系统,为麦金塔系列电脑的主操作系统。 + +## 特性 + ++ 国际标准下载器 ++ KVM 加速 ++ 网络浏览器 + +## 安装说明 + +
+
+ ⚠️ +
+ 警告
+ 该应用申请使用 `网络特权模式`, 将允许应用在容器内部执行网络管理相关特权操作。 +
+
+
+ +由于需要下载系统镜像,安装过程的快慢取决于您的网络,请耐心等待。 + +### 安装步骤 + +启动容器,并使用您的网页浏览器连接到端口 8006。 + +选择 Disk Utility ,然后选择最大的 Apple Inc. VirtIO Block Media 磁盘。 + +点击 Erase 按钮进行磁盘格式化,并给它起一个您喜欢的易于识别的名字。 + +关闭当前窗口,然后通过点击 Reinstall macOS 继续安装。 + +当系统提示您选择安装位置时,请选择您之前创建的磁盘。 + +所有文件复制完成后,请选择您的区域、语言和账户设置。 + +## 常见问题 + +### kvm 模块加载失败 + +请检查是否开启了虚拟化功能,或者在 BIOS 中开启虚拟化功能。 + +### 如何通过 USB 设备进行数据传输 + +请修改 docker-compose.yml 参数配置 + +```yml +environment: + ARGUMENTS: "-device usb-host,vendorid=0x1234,productid=0x1234" +devices: + - /dev/bus/usb +``` + +--- + +![Ms Studio](https://file.lifebus.top/imgs/ms_blank_001.png) diff --git a/apps/macos/data.yml b/apps/macos/data.yml new file mode 100644 index 00000000..058449a6 --- /dev/null +++ b/apps/macos/data.yml @@ -0,0 +1,14 @@ +additionalProperties: + key: macos + name: Mac OS + tags: + - WebSite + - Local + shortDescZh: Docker 容器内的 Mac OS + shortDescEn: Mac OS in Docker container + type: website + crossVersionUpdate: true + limit: 0 + website: https://www.apple.com/ + github: https://github.com/dockur/macos/ + document: https://www.apple.com/ diff --git a/apps/macos/logo.png b/apps/macos/logo.png new file mode 100644 index 00000000..97c28583 Binary files /dev/null and b/apps/macos/logo.png differ