This is an automated email from the ASF dual-hosted git repository. gongchao pushed a commit to branch doc-graduate in repository https://gitbox.apache.org/repos/asf/hertzbeat.git
commit 25749d6fa3e8520ce417a9a81a084d3f8c68d663 Author: tomsun28 <tomsu...@outlook.com> AuthorDate: Thu Aug 21 23:25:02 2025 +0800 [docs] remove incubating Signed-off-by: tomsun28 <tomsu...@outlook.com> --- hertzbeat-manager/pom.xml | 15 ++++ script/assembly/server/assembly-docker.xml | 126 +++++++++++++++++++++++++++++ script/docker/server/Dockerfile | 4 +- 3 files changed, 142 insertions(+), 3 deletions(-) diff --git a/hertzbeat-manager/pom.xml b/hertzbeat-manager/pom.xml index 6d69f8381..f2290d4c8 100644 --- a/hertzbeat-manager/pom.xml +++ b/hertzbeat-manager/pom.xml @@ -293,6 +293,21 @@ </descriptors> </configuration> </execution> + <execution> + <id>make-docker-zip</id> + <!--Bound maven operation--> + <phase>package</phase> + <!--Run once--> + <goals> + <goal>single</goal> + </goals> + <configuration> + <outputDirectory>../dist</outputDirectory> + <descriptors> + <descriptor>../script/assembly/server/assembly-docker.xml</descriptor> + </descriptors> + </configuration> + </execution> <execution> <id>make-docker-compose-script</id> <!--Bound maven operation--> diff --git a/script/assembly/server/assembly-docker.xml b/script/assembly/server/assembly-docker.xml new file mode 100644 index 000000000..e7f94355e --- /dev/null +++ b/script/assembly/server/assembly-docker.xml @@ -0,0 +1,126 @@ +<!-- + ~ Licensed to the Apache Software Foundation (ASF) under one or more + ~ contributor license agreements. See the NOTICE file distributed with + ~ this work for additional information regarding copyright ownership. + ~ The ASF licenses this file to You under the Apache License, Version 2.0 + ~ (the "License"); you may not use this file except in compliance with + ~ the License. You may obtain a copy of the License at + ~ + ~ http://www.apache.org/licenses/LICENSE-2.0 + ~ + ~ Unless required by applicable law or agreed to in writing, software + ~ distributed under the License is distributed on an "AS IS" BASIS, + ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + ~ See the License for the specific language governing permissions and + ~ limitations under the License. + --> +<assembly xmlns="http://maven.apache.org/ASSEMBLY/2.0.0" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/ASSEMBLY/2.0.0 http://maven.apache.org/xsd/assembly-2.0.0.xsd +http://maven.apache.org/ASSEMBLY/2.0.0 "> + <!--Required, will be appended to the end of the packaged file name--> + <id>docker-bin</id> + <includeBaseDirectory>true</includeBaseDirectory> + <baseDirectory>hertzbeat</baseDirectory> + <!--Packaging type, multiple types can be set, different types will be packaged when packaging--> + <formats> + <format>tar.gz</format> + </formats> + <!--Third-party dependency settings--> + <dependencySets> + <dependencySet> + <!--Use artifacts in the project, third-party packages packaged into the lib directory of the tar.gz file--> + <useProjectArtifact>true</useProjectArtifact> + <outputDirectory>lib</outputDirectory> + </dependencySet> + </dependencySets> + + <!--File-related settings--> + <fileSets> + <!--All script files under the bin directory are output to the bin directory after packaging--> + <fileSet> + <directory>../script/assembly/server/bin</directory> + <!-- Whether to perform property replacement, that is, use ${project.artifactId} --> + <filtered>true</filtered> + <outputDirectory>bin</outputDirectory> + <fileMode>0755</fileMode> + </fileSet> + + <!-- Configuration files under the src/main/resources directory are packaged to the config directory--> + <fileSet> + <directory>src/main/resources</directory> + <includes> + <include>application.yml</include> + <include>logback-spring.xml</include> + <include>sureness.yml</include> + </includes> + <filtered>true</filtered> + <outputDirectory>${file.separator}config</outputDirectory> + </fileSet> + + <!-- Configuration files under the src/main/resources/define directory are packaged to the define directory --> + <fileSet> + <directory>src/main/resources</directory> + <includes> + <include>define/**</include> + </includes> + <filtered>true</filtered> + <outputDirectory>${file.separator}</outputDirectory> + </fileSet> + + <!-- Pack the startup jar in the target directory to the directory--> + <fileSet> + <directory>target</directory> + <outputDirectory>/</outputDirectory> + <includes> + <include>*.jar</include> + </includes> + </fileSet> + + <!-- Pack the static resources of the web app into the dist directory--> + <fileSet> + <directory>../web-app/dist</directory> + <outputDirectory>dist</outputDirectory> + </fileSet> + + <!-- external lib --> + <fileSet> + <directory>../script/ext-lib</directory> + <includes> + <include>**/*</include> + </includes> + <outputDirectory>ext-lib</outputDirectory> + </fileSet> + + <!-- license --> + <fileSet> + <directory>../</directory> + <outputDirectory>/</outputDirectory> + <includes> + <include>README.md</include> + </includes> + </fileSet> + <fileSet> + <directory>../material/licenses</directory> + <outputDirectory>/</outputDirectory> + <includes> + <include>LICENSE</include> + <include>NOTICE</include> + </includes> + </fileSet> + <fileSet> + <directory>../material/licenses/backend</directory> + <outputDirectory>licenses</outputDirectory> + <includes> + <include>LICENSE-*</include> + </includes> + </fileSet> + <fileSet> + <directory>../material/licenses/frontend</directory> + <outputDirectory>licenses</outputDirectory> + <includes> + <include>LICENSE-*</include> + </includes> + </fileSet> + </fileSets> +</assembly> diff --git a/script/docker/server/Dockerfile b/script/docker/server/Dockerfile index fdbada5f5..26a1154d7 100644 --- a/script/docker/server/Dockerfile +++ b/script/docker/server/Dockerfile @@ -29,9 +29,7 @@ RUN localedef -c -f UTF-8 -i en_US en_US.UTF-8 ENV TZ=Asia/Shanghai ENV LANG=en_US.UTF-8 -ADD apache-hertzbeat-1.*-bin.tar.gz /opt/ - -RUN mv /opt/apache-hertzbeat-*-bin /opt/hertzbeat +ADD apache-hertzbeat-1.*-docker-bin.tar.gz /opt/ EXPOSE 1157 1158 22 --------------------------------------------------------------------- To unsubscribe, e-mail: notifications-unsubscr...@hertzbeat.apache.org For additional commands, e-mail: notifications-h...@hertzbeat.apache.org