From bacbead1bde6b2f8aef2553a5dde05f79c72490f Mon Sep 17 00:00:00 2001 From: zhengkunwang223 Date: Wed, 1 Mar 2023 15:06:50 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E5=A2=9E=E5=8A=A0=20halo=20v2.3.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/halo/versions/2.3.0/README.md | 45 ++++++++++++++ apps/halo/versions/2.3.0/config.json | 69 +++++++++++++++++++++ apps/halo/versions/2.3.0/docker-compose.yml | 26 ++++++++ apps/list.json | 2 +- apps/openresty/versions/1.21.4/config.json | 8 +-- 5 files changed, 145 insertions(+), 5 deletions(-) create mode 100644 apps/halo/versions/2.3.0/README.md create mode 100644 apps/halo/versions/2.3.0/config.json create mode 100644 apps/halo/versions/2.3.0/docker-compose.yml diff --git a/apps/halo/versions/2.3.0/README.md b/apps/halo/versions/2.3.0/README.md new file mode 100644 index 000000000..f97627dce --- /dev/null +++ b/apps/halo/versions/2.3.0/README.md @@ -0,0 +1,45 @@ +------------------------------ + +## 快速开始 + +```bash +docker run \ + -it -d \ + --name halo \ + -p 8090:8090 \ + -v ~/.halo2:/root/.halo2 \ + halohub/halo:2.2 \ + --halo.external-url=http://localhost:8090/ \ + --halo.security.initializer.superadminusername=admin \ + --halo.security.initializer.superadminpassword=P@88w0rd +``` + +以上仅作为体验使用，详细部署文档请查阅： + +## 在线体验 + +- 环境地址： +- 后台地址： +- 用户名：`demo` +- 密码：`P@ssw0rd123..` + +## 生态 + +可访问 [awesome-halo](https://github.com/halo-sigs/awesome-halo) 查看已经适用于 Halo 2.0 的主题和插件，以及适用于 Halo +1.x 的相关仓库。 + +## 许可证 + +[![license](https://img.shields.io/github/license/halo-dev/halo.svg?style=flat-square)](https://github.com/halo-dev/halo/blob/master/LICENSE) + +Halo 使用 GPL-v3.0 协议开源，请遵守开源协议。 + +## 贡献 + +参考 [CONTRIBUTING](https://github.com/halo-dev/halo/blob/master/CONTRIBUTING.md)。 + + + +## 状态 + +![Repobeats analytics](https://repobeats.axiom.co/api/embed/ad008b2151c22e7cf734d2688befaa795d593b95.svg "Repobeats analytics image") diff --git a/apps/halo/versions/2.3.0/config.json b/apps/halo/versions/2.3.0/config.json new file mode 100644 index 000000000..e124def11 --- /dev/null +++ b/apps/halo/versions/2.3.0/config.json @@ -0,0 +1,69 @@ +{ + "formFields": [ + { + "type": "service", + "key": "mysql", + "labelZh": "数据库服务", + "labelEn": "Database Service", + "required": true, + "default": "", + "envKey": "PANEL_DB_HOST" + }, + { + "type": "text", + "labelZh": "数据库名", + "labelEn": "Database", + "required": true, + "default": "random", + "envKey": "PANEL_DB_NAME" + }, + { + "type": "text", + "labelZh": "数据库用户", + "labelEn": "User", + "required": true, + "default": "random", + "envKey": "PANEL_DB_USER" + }, + { + "type": "password", + "labelZh": "数据库用户密码", + "labelEn": "Password", + "required": true, + "default": "random", + "envKey": "PANEL_DB_USER_PASSWORD" + }, + { + "type": "text", + "labelZh": "超级管理员用户名", + "labelEn": "Admin Username", + "required": true, + "default": "admin", + "envKey": "HALO_ADMIN" + }, + { + "type": "password", + "labelZh": "超级管理员密码", + "labelEn": "Admin Password", + "required": true, + "default": "random", + "envKey": "HALO_ADMIN_PASSWORD" + }, + { + "type": "text", + "labelZh": "外部访问地址", + "labelEn": "External URL", + "required": true, + "default": "http://localhost:8080", + "envKey": "HALO_EXTERNAL_URL" + }, + { + "type": "number", + "labelZh": "端口", + "labelEn": "Port", + "required": true, + "default": 8080, + "envKey": "PANEL_APP_PORT_HTTP" + } + ] +} \ No newline at end of file diff --git a/apps/halo/versions/2.3.0/docker-compose.yml b/apps/halo/versions/2.3.0/docker-compose.yml new file mode 100644 index 000000000..fda65a3a7 --- /dev/null +++ b/apps/halo/versions/2.3.0/docker-compose.yml @@ -0,0 +1,26 @@ +version: "3" +services: + halo: + image: halohub/halo:2.3.0 + container_name: ${CONTAINER_NAME} + restart: always + networks: + - 1panel-network + volumes: + - ./data:/root/.halo + ports: + - ${PANEL_APP_PORT_HTTP}:8090 + command: + - --spring.r2dbc.url=r2dbc:pool:mysql://${PANEL_DB_HOST}:3306/${PANEL_DB_NAME} + - --spring.r2dbc.username=${PANEL_DB_USER} + - --spring.r2dbc.password=${PANEL_DB_USER_PASSWORD} + - --spring.sql.init.platform=mysql + - --halo.external-url=${HALO_EXTERNAL_URL} + - --halo.security.initializer.superadminusername=${HALO_ADMIN} + - --halo.security.initializer.superadminpassword=${HALO_ADMIN_PASSWORD} + labels: + createdBy: "Apps" + +networks: + 1panel-network: + external: true diff --git a/apps/list.json b/apps/list.json index 57d055a93..8b01def98 100644 --- a/apps/list.json +++ b/apps/list.json @@ -90,7 +90,7 @@ "key": "halo", "name": "Halo", "tags": ["WebSite"], - "versions": ["2.2.0"], + "versions": ["2.2.0","2.3.0"], "shortDescZh": "强大易用的开源建站工具", "shortDescEn": "Powerful and easy-to-use open source website builder", "type": "website", diff --git a/apps/openresty/versions/1.21.4/config.json b/apps/openresty/versions/1.21.4/config.json index 739165b20..995b9f692 100644 --- a/apps/openresty/versions/1.21.4/config.json +++ b/apps/openresty/versions/1.21.4/config.json @@ -2,8 +2,8 @@ "formFields": [ { "type": "number", - "labelZh": "Http 端口", - "labelEn": "Http Port", + "labelZh": "HTTP 端口", + "labelEn": "HTTP Port", "required": true, "default": 80, "envKey": "PANEL_APP_PORT_HTTP", @@ -11,8 +11,8 @@ }, { "type": "number", - "labelZh": "Https 端口", - "labelEn": "Https Port", + "labelZh": "HTTPS 端口", + "labelEn": "HTTPS Port", "required": true, "default": 443, "envKey": "PANEL_APP_PORT_HTTPS",