optimize: merge the packaging processes of namingserver and seata-ser…

…ver (#6819)
apache · Sep 9, 2024 · 5fa41c5 · 5fa41c5
1 parent e57fa54
commit 5fa41c5
Show file tree

Hide file tree

Showing 10 changed files with 124 additions and 151 deletions.
diff --git a/changes/en-us/2.x.md b/changes/en-us/2.x.md
@@ -84,8 +84,9 @@ Add changes here for all PR submitted to the 2.x branch.
 - [[#6794](https://github.com/apache/incubator-seata/pull/6794)] optimize NacosMockTest UT case
 - [[#6806](https://github.com/apache/incubator-seata/pull/6806)] optimize `tableMeta` cache scheduled refresh issue
 - [[#6808](https://github.com/apache/incubator-seata/pull/6808)] change version to 2.2.0-SNAPSHOT
+- [[#6819](https://github.com/apache/incubator-seata/pull/6819)] merge the packaging processes of namingserver and seata-server
 - [[#6827](https://github.com/apache/incubator-seata/pull/6827)] rename namingserver registry type
-  
+
 
 ### refactor:
 

diff --git a/changes/zh-cn/2.x.md b/changes/zh-cn/2.x.md
@@ -83,8 +83,10 @@
 - [[#6793](https://github.com/apache/incubator-seata/pull/6795)] 独立server的meta信息初始化逻辑
 - [[#6806](https://github.com/apache/incubator-seata/pull/6806)] 优化`tableMeta`缓存定时刷新问题
 - [[#6808](https://github.com/apache/incubator-seata/pull/6808)] 修改版本号为2.2.0-SNAPSHOT
+- [[#6819](https://github.com/apache/incubator-seata/pull/6819)] namingserver与server的合并打包
 - [[#6827](https://github.com/apache/incubator-seata/pull/6827)] 重命名namingserver注册类型改为seata
 
+
 ### refactor:
 
 

diff --git a/codecov.yml b/codecov.yml
@@ -1,3 +1,4 @@
+#
 # 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.

diff --git a/distribution/docker/namingserver/Dockerfile b/distribution/docker/namingserver/Dockerfile
@@ -0,0 +1,46 @@
+#
+# 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.
+#
+
+# the Dockerfile support x86 & arrch64
+# build：
+# 1. mvn -Prelease-seata -Dmaven.test.skip=true clean install -U
+# 2. cd distribution/target/apache-seata-x.x.x-SNAPSHOT-incubating-bin/seata-namingserver/
+# 3. docker build --no-cache --build-arg SEATA_VERSION=2.2.0-SNAPSHOT -t seata-namingserver:2.2.0-dev .
+#
+# run:
+# 1. docker run --name=seata-namingserver -d seata-namingserver:2.2.0-dev
+#
+# https://hub.docker.com/r/apache/seata-namingserver
+FROM openjdk:8u342
+
+# set label
+LABEL maintainer="Seata <seata.apache.org>"
+
+WORKDIR /$BASE_DIR
+
+# ADD FORM distribution
+ADD bin/ /seata-namingserver/bin
+ADD lib/ /seata-namingserver/lib
+ADD conf/ /seata-namingserver/conf
+ADD target /seata-namingserver/target
+ADD ../LICENSE ./LICENSE
+ADD ../NOTICE ./LICENSE
+
+# set extra environment
+ENV LOADER_PATH="/seata-namingserver/lib"
+ENV TZ="Asia/Shanghai"
+CMD ["bash","-c","/seata-namingserver/bin/seata-namingserver.sh && tail -f /dev/null"]
diff --git a/distribution/Dockerfile → distribution/docker/server/Dockerfile b/distribution/Dockerfile → distribution/docker/server/Dockerfile
@@ -18,13 +18,13 @@
 # the Dockerfile support x86 & arrch64
 # build：
 # 1. mvn -Prelease-seata -Dmaven.test.skip=true clean install -U
-# 2. cd distribution/target/seata-server-xxx/seata/
-# 3. docker build --no-cache --build-arg SEATA_VERSION=1.6.0-SNAPSHOT -t seata-server:1.6.0-dev .
+# 2. cd distribution/target/apache-seata-x.x.x-SNAPSHOT-incubating-bin/seata-server/
+# 3. docker build --no-cache --build-arg SEATA_VERSION=2.2.0-SNAPSHOT -t seata-server:2.2.0-dev .
 #
 # run:
-# 1. docker run --name=seata-server -d seata-server:1.6.0-dev
+# 1. docker run --name=seata-server -d seata-server:2.2.0-dev
 #
-# https://hub.docker.com/orgs/seataio
+# https://hub.docker.com/r/apache/seata-server
 FROM openjdk:8u342
 
 # set label
@@ -34,13 +34,12 @@ WORKDIR /$BASE_DIR
 
 # ADD FORM distribution
 ADD bin/ /seata-server/bin
-ADD conf/ /seata-server/conf
 ADD ext/ /seata-server/ext
 ADD lib/ /seata-server/lib
-ADD script/ /seata-server/script
-ADD target/ /seata-server/target
-ADD LICENSE /seata-server/LICENSE
-ADD NOTICE /seata-server/NOTICE
+ADD conf/ /seata-server/conf
+ADD target /seata-server/target
+ADD ../LICENSE ./LICENSE
+ADD ../NOTICE ./LICENSE
 
 # set extra environment
 ENV LOADER_PATH="/seata-server/lib"

diff --git a/distribution/pom.xml b/distribution/pom.xml
@@ -45,57 +45,25 @@
                 </dependency>
                 <dependency>
                     <groupId>org.apache.seata</groupId>
-                    <artifactId>apm-seata-skywalking-plugin</artifactId>
+                    <artifactId>seata-namingserver</artifactId>
                     <version>${project.version}</version>
                 </dependency>
-            </dependencies>
-            <build>
-                <finalName>apache-seata</finalName>
-                <plugins>
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-assembly-plugin</artifactId>
-                        <version>${maven-assembly-plugin.version}</version>
-                        <configuration>
-                            <descriptors>
-                                <descriptor>release-seata.xml</descriptor>
-                            </descriptors>
-                        </configuration>
-                        <executions>
-                            <execution>
-                                <id>make-assembly</id>
-                                <phase>install</phase>
-                                <goals>
-                                    <goal>single</goal>
-                                </goals>
-                            </execution>
-                        </executions>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
-        <profile>
-            <id>release-seata-namingserver</id>
-            <properties>
-                <maven.git-commit-id.skip>false</maven.git-commit-id.skip>
-            </properties>
-            <dependencies>
                 <dependency>
                     <groupId>org.apache.seata</groupId>
-                    <artifactId>seata-namingserver</artifactId>
+                    <artifactId>apm-seata-skywalking-plugin</artifactId>
                     <version>${project.version}</version>
                 </dependency>
             </dependencies>
             <build>
-                <finalName>apache-seata-namingserver</finalName>
+                <finalName>apache-seata</finalName>
                 <plugins>
                     <plugin>
                         <groupId>org.apache.maven.plugins</groupId>
                         <artifactId>maven-assembly-plugin</artifactId>
                         <version>${maven-assembly-plugin.version}</version>
                         <configuration>
                             <descriptors>
-                                <descriptor>release-seata-namingserver.xml</descriptor>
+                                <descriptor>release-seata.xml</descriptor>
                             </descriptors>
                         </configuration>
                         <executions>

diff --git a/distribution/release-seata-namingserver.xml b/distribution/release-seata-namingserver.xml