Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[improve] fix docker compose package script and update contributor doc #2552

Merged
merged 8 commits into from
Aug 18, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 27 additions & 0 deletions .all-contributorsrc
Original file line number Diff line number Diff line change
Expand Up @@ -2009,6 +2009,33 @@
"contributions": [
"code"
]
},
{
"login": "loong95",
"name": "Loong",
"avatar_url": "https://avatars.githubusercontent.com/u/16333958?v=4",
"profile": "https://github.com/loong95",
"contributions": [
"code"
]
},
{
"login": "ceekay47",
"name": "Chandrakant Vankayalapati",
"avatar_url": "https://avatars.githubusercontent.com/u/104664857?v=4",
"profile": "https://github.com/ceekay47",
"contributions": [
"code"
]
},
{
"login": "MRgenial",
"name": "b_mountain",
"avatar_url": "https://avatars.githubusercontent.com/u/49973336?v=4",
"profile": "https://github.com/MRgenial",
"contributions": [
"code"
]
}
],
"contributorsPerLine": 7,
Expand Down
3 changes: 3 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -469,6 +469,9 @@ Thanks to these wonderful people, welcome to join us:
<td align="center" valign="top" width="14.28%"><a href="https://github.com/QBH-insist"><img src="https://avatars.githubusercontent.com/u/39401478?v=4?s=100" width="100px;" alt="QBH-insist"/><br /><sub><b>QBH-insist</b></sub></a><br /><a href="https://github.com/apache/hertzbeat/commits?author=QBH-insist" title="Code">💻</a></td>
<td align="center" valign="top" width="14.28%"><a href="https://github.com/jiangsh-ui"><img src="https://avatars.githubusercontent.com/u/86990361?v=4?s=100" width="100px;" alt="jiangsh"/><br /><sub><b>jiangsh</b></sub></a><br /><a href="https://github.com/apache/hertzbeat/commits?author=jiangsh-ui" title="Code">💻</a></td>
<td align="center" valign="top" width="14.28%"><a href="https://github.com/keaifafafa"><img src="https://avatars.githubusercontent.com/u/83876361?v=4?s=100" width="100px;" alt="Keaifa"/><br /><sub><b>Keaifa</b></sub></a><br /><a href="https://github.com/apache/hertzbeat/commits?author=keaifafafa" title="Code">💻</a></td>
<td align="center" valign="top" width="14.28%"><a href="https://github.com/loong95"><img src="https://avatars.githubusercontent.com/u/16333958?v=4?s=100" width="100px;" alt="Loong"/><br /><sub><b>Loong</b></sub></a><br /><a href="https://github.com/apache/hertzbeat/commits?author=loong95" title="Code">💻</a></td>
<td align="center" valign="top" width="14.28%"><a href="https://github.com/ceekay47"><img src="https://avatars.githubusercontent.com/u/104664857?v=4?s=100" width="100px;" alt="Chandrakant Vankayalapati"/><br /><sub><b>Chandrakant Vankayalapati</b></sub></a><br /><a href="https://github.com/apache/hertzbeat/commits?author=ceekay47" title="Code">💻</a></td>
<td align="center" valign="top" width="14.28%"><a href="https://github.com/MRgenial"><img src="https://avatars.githubusercontent.com/u/49973336?v=4?s=100" width="100px;" alt="b_mountain"/><br /><sub><b>b_mountain</b></sub></a><br /><a href="https://github.com/apache/hertzbeat/commits?author=MRgenial" title="Code">💻</a></td>
</tr>
</tbody>
</table>
Expand Down
3 changes: 3 additions & 0 deletions README_CN.md
Original file line number Diff line number Diff line change
Expand Up @@ -468,6 +468,9 @@ Thanks these wonderful people, welcome to join us:
<td align="center" valign="top" width="14.28%"><a href="https://github.com/QBH-insist"><img src="https://avatars.githubusercontent.com/u/39401478?v=4?s=100" width="100px;" alt="QBH-insist"/><br /><sub><b>QBH-insist</b></sub></a><br /><a href="https://github.com/apache/hertzbeat/commits?author=QBH-insist" title="Code">💻</a></td>
<td align="center" valign="top" width="14.28%"><a href="https://github.com/jiangsh-ui"><img src="https://avatars.githubusercontent.com/u/86990361?v=4?s=100" width="100px;" alt="jiangsh"/><br /><sub><b>jiangsh</b></sub></a><br /><a href="https://github.com/apache/hertzbeat/commits?author=jiangsh-ui" title="Code">💻</a></td>
<td align="center" valign="top" width="14.28%"><a href="https://github.com/keaifafafa"><img src="https://avatars.githubusercontent.com/u/83876361?v=4?s=100" width="100px;" alt="Keaifa"/><br /><sub><b>Keaifa</b></sub></a><br /><a href="https://github.com/apache/hertzbeat/commits?author=keaifafafa" title="Code">💻</a></td>
<td align="center" valign="top" width="14.28%"><a href="https://github.com/loong95"><img src="https://avatars.githubusercontent.com/u/16333958?v=4?s=100" width="100px;" alt="Loong"/><br /><sub><b>Loong</b></sub></a><br /><a href="https://github.com/apache/hertzbeat/commits?author=loong95" title="Code">💻</a></td>
<td align="center" valign="top" width="14.28%"><a href="https://github.com/ceekay47"><img src="https://avatars.githubusercontent.com/u/104664857?v=4?s=100" width="100px;" alt="Chandrakant Vankayalapati"/><br /><sub><b>Chandrakant Vankayalapati</b></sub></a><br /><a href="https://github.com/apache/hertzbeat/commits?author=ceekay47" title="Code">💻</a></td>
<td align="center" valign="top" width="14.28%"><a href="https://github.com/MRgenial"><img src="https://avatars.githubusercontent.com/u/49973336?v=4?s=100" width="100px;" alt="b_mountain"/><br /><sub><b>b_mountain</b></sub></a><br /><a href="https://github.com/apache/hertzbeat/commits?author=MRgenial" title="Code">💻</a></td>
</tr>
</tbody>
</table>
Expand Down
12 changes: 12 additions & 0 deletions home/src/pages/team/index.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -1121,6 +1121,18 @@ export default function () {
src="https://avatars.githubusercontent.com/u/83876361?v=4?s=100" width="100px;"
alt="Keaifa"/><br/><sub><b>Keaifa</b></sub></a><br/><a
href="https://github.com/apache/hertzbeat/commits?author=keaifafafa" title="Code">💻</a></td>
<td align="center" valign="top" width="14.28%"><a href="https://github.com/loong95"><img
src="https://avatars.githubusercontent.com/u/16333958?v=4?s=100" width="100px;"
alt="Loong"/><br/><sub><b>Loong</b></sub></a><br/><a
href="https://github.com/apache/hertzbeat/commits?author=loong95" title="Code">💻</a></td>
<td align="center" valign="top" width="14.28%"><a href="https://github.com/ceekay47"><img
src="https://avatars.githubusercontent.com/u/104664857?v=4?s=100" width="100px;"
alt="Chandrakant Vankayalapati"/><br/><sub><b>Chandrakant Vankayalapati</b></sub></a><br/><a
href="https://github.com/apache/hertzbeat/commits?author=ceekay47" title="Code">💻</a></td>
<td align="center" valign="top" width="14.28%"><a href="https://github.com/MRgenial"><img
src="https://avatars.githubusercontent.com/u/49973336?v=4?s=100" width="100px;"
alt="b_mountain"/><br/><sub><b>b_mountain</b></sub></a><br/><a
href="https://github.com/apache/hertzbeat/commits?author=MRgenial" title="Code">💻</a></td>
</tr>
</tbody>
</table>
Expand Down
5 changes: 5 additions & 0 deletions home/src/pages/team/member.json
Original file line number Diff line number Diff line change
Expand Up @@ -108,6 +108,11 @@
"githubId": "131688897",
"gitUrl": "https://github.com/Calvin979",
"name": "Calvin"
},
{
"githubId": "77964041",
"gitUrl": "https://github.com/yuluo-yx",
"name": "Shown"
}
]
}
8 changes: 6 additions & 2 deletions script/assembly/server/assembly-docker-compose.xml
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@ http://maven.apache.org/ASSEMBLY/2.0.0 ">
<include>conf/**</include>
<include>*.yaml</include>
<include>*.md</include>
<include>ext-lib/README</include>
</includes>
<outputDirectory>hertzbeat-mysql-iotdb</outputDirectory>
</fileSet>
Expand All @@ -45,6 +46,7 @@ http://maven.apache.org/ASSEMBLY/2.0.0 ">
<include>conf/**</include>
<include>*.yaml</include>
<include>*.md</include>
<include>ext-lib/README</include>
</includes>
<outputDirectory>hertzbeat-mysql-tdengine</outputDirectory>
</fileSet>
Expand All @@ -55,18 +57,20 @@ http://maven.apache.org/ASSEMBLY/2.0.0 ">
<include>conf/**</include>
<include>*.yaml</include>
<include>*.md</include>
<include>ext-lib/README</include>
</includes>
<outputDirectory>hertzbeat-mysql-victoria-metrics</outputDirectory>
</fileSet>
<fileSet>
<directory>../script/docker-compose/hertzbeat-postgresql-iotdb</directory>
<directory>../script/docker-compose/hertzbeat-postgresql-victoria-metrics</directory>
<filtered>true</filtered>
<includes>
<include>conf/**</include>
<include>*.yaml</include>
<include>*.md</include>
<include>ext-lib/README</include>
</includes>
<outputDirectory>hertzbeat-postgresql-iotdb</outputDirectory>
<outputDirectory>hertzbeat-postgresql-victoria-metrics</outputDirectory>
</fileSet>
<fileSet>
<directory>../script/docker-compose</directory>
Expand Down
Loading