From 2bb9b7de53ff8c54fbe770449078e2440815498c Mon Sep 17 00:00:00 2001 From: zhengkunwang223 Date: Tue, 7 Feb 2023 15:21:24 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E5=A2=9E=E5=8A=A0halo2.2.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- halo/versions/1.6.0/README.md | 47 ++++++++++++- halo/versions/1.6.0/docker-compose.yml | 2 +- halo/versions/2.2.0/README.md | 66 +++++++++++++++++++ halo/versions/2.2.0/config.json | 61 +++++++++++++++++ halo/versions/2.2.0/docker-compose.yml | 26 ++++++++ .../docker-compose.yml | 2 +- mysql/versions/5.7.39/docker-compose.yml | 2 +- mysql/versions/8.0.30/docker-compose.yml | 7 +- nginx/versions/1.21.4/docker-compose.yml | 2 +- phpmyadmin/versions/5.2.0/docker-compose.yml | 2 +- redis/versions/6.0.16/docker-compose.yml | 2 +- redis/versions/7.0.5/docker-compose.yml | 2 +- wordpress/versions/6.0.1/README.md | 15 +---- wordpress/versions/6.0.1/docker-compose.yml | 2 +- wordpress/versions/6.0.2/README.md | 15 ----- wordpress/versions/6.0.2/docker-compose.yml | 2 +- 16 files changed, 212 insertions(+), 43 deletions(-) create mode 100644 halo/versions/2.2.0/README.md create mode 100644 halo/versions/2.2.0/config.json create mode 100644 halo/versions/2.2.0/docker-compose.yml diff --git a/halo/versions/1.6.0/README.md b/halo/versions/1.6.0/README.md index c339a9541..315432fec 100644 --- a/halo/versions/1.6.0/README.md +++ b/halo/versions/1.6.0/README.md @@ -4,19 +4,60 @@

-

Halo [ˈheɪloʊ]，一款现代化的开源建站 / CMS 系统。

+

Halo [ˈheɪloʊ]，一款现代化的开源博客/CMS系统，值得一试。

-GitHub release +GitHub release GitHub All Releases Docker pulls GitHub last commit GitHub Workflow Status
官网 -文档（2.0 Beta） +文档 社区 Gitee Telegram 频道

+------------------------------ + +## 快速开始 ## + +详细部署文档请查阅： + +## 在线体验 ## + +- 环境地址： +- 后台地址： +- 用户名：demo +- 密码：P@ssw0rd123.. +- 使用前请阅读： + +## 生态 ## + +| 项目 | 状态 | 描述 | +| ---------------------------------------------------------------------------- | -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | ---------------------------------------- | +| [halo-admin](https://github.com/halo-dev/halo-admin) | GitHub release | Web 管理端 UI，已内置在主应用 | +| [js-sdk](https://github.com/halo-dev/js-sdk) | npm release | JavaScript SDK | +| [halo-comment](https://github.com/halo-dev/halo-comment) | npm release | 独立评论组件，可以非常方便的集成到主题中 | +| [halo-comment-normal](https://github.com/halo-dev/halo-comment-normal) | npm release | 另外一款评论组件 | +| [halo-mobile-app](https://github.com/halo-dev/halo-mobile-app) | 已停止维护 | 移动端管理 APP | +| [tencent-cloudbase-halo](https://github.com/halo-dev/tencent-cloudbase-halo) | 无 | 腾讯云 CloudBase 一键部署配置 | +| [halo-theme-\*](https://github.com/topics/halo-theme) | 无 | GitHub 上开源的 Halo 主题集合 | + +## 许可证 ## + +[![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/halo/versions/1.6.0/docker-compose.yml b/halo/versions/1.6.0/docker-compose.yml index b9e398eb5..8dfd10c8c 100644 --- a/halo/versions/1.6.0/docker-compose.yml +++ b/halo/versions/1.6.0/docker-compose.yml @@ -1,6 +1,6 @@ version: "3" services: - 1panel_halo: + halo: image: halohub/halo:1.6.0 container_name: ${CONTAINER_NAME} restart: always diff --git a/halo/versions/2.2.0/README.md b/halo/versions/2.2.0/README.md new file mode 100644 index 000000000..4141c0a85 --- /dev/null +++ b/halo/versions/2.2.0/README.md @@ -0,0 +1,66 @@ +

+ + Halo logo + +

+ +

Halo [ˈheɪloʊ]，好用又强大的开源建站工具。

+ +

+GitHub release +Docker pulls +GitHub last commit +GitHub Workflow Status +
+官网 +文档 +社区 +Gitee +Telegram 频道 +

+ +------------------------------ + +## 快速开始 + +```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.superadminuser=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/halo/versions/2.2.0/config.json b/halo/versions/2.2.0/config.json new file mode 100644 index 000000000..27f0d39ee --- /dev/null +++ b/halo/versions/2.2.0/config.json @@ -0,0 +1,61 @@ +{ + "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": "number", + "labelZh": "端口", + "labelEn": "Port", + "required": true, + "default": 8080, + "envKey": "PANEL_APP_PORT_HTTP" + } + ] +} \ No newline at end of file diff --git a/halo/versions/2.2.0/docker-compose.yml b/halo/versions/2.2.0/docker-compose.yml new file mode 100644 index 000000000..8d2f8c3e2 --- /dev/null +++ b/halo/versions/2.2.0/docker-compose.yml @@ -0,0 +1,26 @@ +version: "3" +services: + halo: + image: halohub/halo:2.2.0 + container_name: ${CONTAINER_NAME} + restart: always + networks: + - 1panel + 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=http://localhost:${PANEL_APP_PORT_HTTP}/ + - --halo.security.initializer.superadminusername=${HALO_ADMIN} + - --halo.security.initializer.superadminpassword=${HALO_ADMIN_PASSWORD} + labels: + createdBy: "Apps" + +networks: + 1panel: + external: true diff --git a/minio/versions/RELEASE.2022-08-13T21-54-44Z/docker-compose.yml b/minio/versions/RELEASE.2022-08-13T21-54-44Z/docker-compose.yml index e2c0194da..07cb46282 100644 --- a/minio/versions/RELEASE.2022-08-13T21-54-44Z/docker-compose.yml +++ b/minio/versions/RELEASE.2022-08-13T21-54-44Z/docker-compose.yml @@ -1,6 +1,6 @@ version: '3' services: - 1panel_minio: + minio: image: minio/minio:RELEASE.2022-08-13T21-54-44Z container_name: 1panel_minio ports: diff --git a/mysql/versions/5.7.39/docker-compose.yml b/mysql/versions/5.7.39/docker-compose.yml index 7716b9992..3cfca1f4e 100644 --- a/mysql/versions/5.7.39/docker-compose.yml +++ b/mysql/versions/5.7.39/docker-compose.yml @@ -1,7 +1,7 @@ version: '3' services: - mysql5.7: + mysql: image: mysql:5.7.39 container_name: ${CONTAINER_NAME} restart: always diff --git a/mysql/versions/8.0.30/docker-compose.yml b/mysql/versions/8.0.30/docker-compose.yml index 2729031dd..9ed6e9a31 100644 --- a/mysql/versions/8.0.30/docker-compose.yml +++ b/mysql/versions/8.0.30/docker-compose.yml @@ -1,7 +1,7 @@ version: '3' services: - mysql8.0: + mysql: image: mysql:8.0.30 container_name: ${CONTAINER_NAME} restart: always @@ -18,6 +18,9 @@ services: labels: createdBy: "Apps" + command: + - --default-authentication-plugin=mysql_native_password + networks: 1panel: - external: true \ No newline at end of file + external: true diff --git a/nginx/versions/1.21.4/docker-compose.yml b/nginx/versions/1.21.4/docker-compose.yml index 902bbe92d..bb6e4c1be 100644 --- a/nginx/versions/1.21.4/docker-compose.yml +++ b/nginx/versions/1.21.4/docker-compose.yml @@ -1,6 +1,6 @@ version: '3' services: - openresty1.21.4: + openresty: image: openresty/openresty:1.21.4.1-3-alpine restart: always network_mode: host diff --git a/phpmyadmin/versions/5.2.0/docker-compose.yml b/phpmyadmin/versions/5.2.0/docker-compose.yml index 7ca5e1509..be7b5e926 100644 --- a/phpmyadmin/versions/5.2.0/docker-compose.yml +++ b/phpmyadmin/versions/5.2.0/docker-compose.yml @@ -1,6 +1,6 @@ version: '3' services: - 1panel_phpmyadmin: + phpmyadmin: image: phpmyadmin/phpmyadmin:5.2.0 container_name: 1panel_phpmyadmin ports: diff --git a/redis/versions/6.0.16/docker-compose.yml b/redis/versions/6.0.16/docker-compose.yml index 2303fc43c..cba4def27 100644 --- a/redis/versions/6.0.16/docker-compose.yml +++ b/redis/versions/6.0.16/docker-compose.yml @@ -1,6 +1,6 @@ version: '3' services: - redis-6.0.16: + redis: image: redis:6.0.16 restart: always networks: diff --git a/redis/versions/7.0.5/docker-compose.yml b/redis/versions/7.0.5/docker-compose.yml index e67775969..e1ae9ec0a 100644 --- a/redis/versions/7.0.5/docker-compose.yml +++ b/redis/versions/7.0.5/docker-compose.yml @@ -1,6 +1,6 @@ version: '3' services: - redis-7.0.5: + redis: image: redis:7.0.5 restart: always networks: diff --git a/wordpress/versions/6.0.1/README.md b/wordpress/versions/6.0.1/README.md index 72bc2afe4..c62eb7090 100644 --- a/wordpress/versions/6.0.1/README.md +++ b/wordpress/versions/6.0.1/README.md @@ -1,15 +1,3 @@ - - - - - - WordPress › ReadMe - - - -

- WordPress -

Semantic Personal Publishing Platform

First Things First

@@ -93,5 +81,4 @@

License

WordPress is free software, and is released under the terms of the GPL (GNU General Public License) version 2 or (at your option) any later version. See license.txt.

- - + diff --git a/wordpress/versions/6.0.1/docker-compose.yml b/wordpress/versions/6.0.1/docker-compose.yml index e61dc4062..25a360306 100644 --- a/wordpress/versions/6.0.1/docker-compose.yml +++ b/wordpress/versions/6.0.1/docker-compose.yml @@ -1,6 +1,6 @@ version: '3' services: - 1panel_wordpress: + wordpress: image: wordpress:6.0.1 container_name: ${CONTAINER_NAME} ports: diff --git a/wordpress/versions/6.0.2/README.md b/wordpress/versions/6.0.2/README.md index 72bc2afe4..6fbd4427f 100644 --- a/wordpress/versions/6.0.2/README.md +++ b/wordpress/versions/6.0.2/README.md @@ -1,15 +1,3 @@ - - - - - - WordPress › ReadMe - - - -

- WordPress -

Semantic Personal Publishing Platform

First Things First

@@ -92,6 +80,3 @@

License

WordPress is free software, and is released under the terms of the GPL (GNU General Public License) version 2 or (at your option) any later version. See license.txt.

- - - diff --git a/wordpress/versions/6.0.2/docker-compose.yml b/wordpress/versions/6.0.2/docker-compose.yml index 40d10aba8..b5fe42395 100644 --- a/wordpress/versions/6.0.2/docker-compose.yml +++ b/wordpress/versions/6.0.2/docker-compose.yml @@ -1,6 +1,6 @@ version: '3' services: - 1panel_wordpress: + wordpress: image: wordpress:6.0.2 container_name: ${CONTAINER_NAME} ports: